development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-05 01:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208319 from microsoft/local-quail

Browse Source 
Indent on enter from within [], {}, ()
This commit is contained in:
Aiday Marlen Kyzy 2024-03-22 11:07:23 +01:00 committed by GitHub
commit b0725d3bf2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/typescript-basics/language-configuration.json
View File

@ -218,6 +218,33 @@
"action": {
"indent": "outdent"
}
}
},
// Indent when pressing enter from inside ()
{
"beforeText": "^.*\\([^\\)]*$",
"afterText": "^\\s*\\).*$",
"action": {
"indent": "indentOutdent",
"appendText": "\t",
}
},
// Indent when pressing enter from inside {}
{
"beforeText": "^.*\\{[^\\}]*$",
"afterText": "^\\s*\\}.*$",
"action": {
"indent": "indentOutdent",
"appendText": "\t",
}
},
// Indent when pressing enter from inside []
{
"beforeText": "^.*\\[[^\\]]*$",
"afterText": "^\\s*\\].*$",
"action": {
"indent": "indentOutdent",
"appendText": "\t",
}
},
]
}

2
src/vs/editor/contrib/indentation/test/browser/indentation.test.ts
View File

@ -874,7 +874,7 @@ suite('`Full` Auto Indent On Type - TypeScript/JavaScript', () => {
});
});
test.skip('issue #43244: indent when lambda arrow function is detected, outdent when end is reached', () => {
test('issue #43244: indent when lambda arrow function is detected, outdent when end is reached', () => {
// https://github.com/microsoft/vscode/issues/43244

18
src/vs/editor/test/common/modes/supports/javascriptOnEnterRules.ts
View File

@ -40,4 +40,22 @@ export const javascriptOnEnterRules = [
beforeText: /^\s+([^{i\s]|i(?!f\b))/,
action: { indentAction: IndentAction.Outdent }
},
// Indent when pressing enter from inside ()
{
beforeText: /^.*\([^\)]*$/,
afterText: /^\s*\).*$/,
action: { indentAction: IndentAction.IndentOutdent, appendText: '\t' }
},
// Indent when pressing enter from inside {}
{
beforeText: /^.*\{[^\}]*$/,
afterText: /^\s*\}.*$/,
action: { indentAction: IndentAction.IndentOutdent, appendText: '\t' }
},
// Indent when pressing enter from inside []
{
beforeText: /^.*\[[^\]]*$/,
afterText: /^\s*\].*$/,
action: { indentAction: IndentAction.IndentOutdent, appendText: '\t' }
},
];