maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow single line comment after { for auto indent

Browse source 
Fixes #86176
This commit is contained in:
Matt Bierner 2021-02-26 20:30:02 -08:00
parent 5766526b0b
commit d89e2e17a5
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
View file

@ -15,7 +15,7 @@ import * as languageModeIds from '../utils/languageModeIds';
const jsTsLanguageConfiguration: vscode.LanguageConfiguration = {
indentationRules: {
decreaseIndentPattern: /^((?!.*?\/\*).*\*\/)?\s*[\}\]].*$/,
increaseIndentPattern: /^((?!\/\/).)*(\{[^}"'`]*|\([^)"'`]*|\[[^\]"'`]*)$/,
increaseIndentPattern: /^((?!\/\/).)*(\{([^}"'`]*|(\t|[ ])*\/\/.*)|\([^)"'`]*|\[[^\]"'`]*)$/,
// e.g. * ...| or */| or *-----*/|
unIndentedLinePattern: /^(\t|[ ])*[ ]\*[^/]*\*\/\s*$|^(\t|[ ])*[ ]\*\/\s*$|^(\t|[ ])*[ ]\*([ ]([^\*]|\*(?!\/))*)?$/
},

11
extensions/typescript-language-features/src/test/unit/onEnter.test.ts
View file

@ -110,4 +110,15 @@ suite.skip('OnEnter', () => {
` * x`));
});
});
test('should indent after if block followed by comment with quote', () => {
return withRandomFileEditor(`if (true) { // '${CURSOR}`, 'js', async (_editor, document) => {
await type(document, '\nx');
assert.strictEqual(
document.getText(),
joinLines(
`if (true) { // '`,
` x`));
});
});
});