Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes 114236: Add a multi-line comment regex to unIndentedLinePattern #114478

Merged
merged 3 commits into from Feb 10, 2021
Merged

Fixes 114236: Add a multi-line comment regex to unIndentedLinePattern #114478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c1a096
Add a multi-line comment regex to unIndentedLinePattern
shskwmt Jan 17, 2021
630b78b
Add multi-line comment block indentation tests
shskwmt Jan 28, 2021
9a22d42
Fix a multi-line comment block indentation test
shskwmt Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
View file
Open in desktop
Expand Up @@ -15,7 +15,9 @@ import * as languageModeIds from '../utils/languageModeIds';
const jsTsLanguageConfiguration: vscode.LanguageConfiguration = {
indentationRules: {
decreaseIndentPattern: /^((?!.*?\/\*).*\*\/)?\s*[\}\]].*$/,
increaseIndentPattern: /^((?!\/\/).)*(\{[^}"'`]*|\([^)"'`]*|\[[^\]"'`]*)$/
increaseIndentPattern: /^((?!\/\/).)*(\{[^}"'`]*|\([^)"'`]*|\[[^\]"'`]*)$/,
// e.g. * ...| or */| or *-----*/|
unIndentedLinePattern: /^(\t|[ ])*[ ]\*[^/]*\*\/\s*$|^(\t|[ ])*[ ]\*\/\s*$|^(\t|[ ])*[ ]\*([ ]([^\*]|\*(?!\/))*)?$/
},
wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
onEnterRules: [
Expand Down
43 changes: 43 additions & 0 deletions extensions/typescript-language-features/src/test/unit/onEnter.test.ts
View file
Open in desktop
Expand Up @@ -67,4 +67,47 @@ suite.skip('OnEnter', () => {
` x`));
});
});

test('should not indent after a multi-line comment block 1', () => {
return withRandomFileEditor(`/*-----\n * line 1\n * line 2\n *-----*/\n${CURSOR}`, 'js', async (_editor, document) => {
await type(document, '\nx');
assert.strictEqual(
document.getText(),
joinLines(
`/*-----`,
` * line 1`,
` * line 2`,
` *-----*/`,
``,
`x`));
});
});

test('should not indent after a multi-line comment block 2', () => {
return withRandomFileEditor(`/*-----\n * line 1\n * line 2\n */\n${CURSOR}`, 'js', async (_editor, document) => {
await type(document, '\nx');
assert.strictEqual(
document.getText(),
joinLines(
`/*-----`,
` * line 1`,
` * line 2`,
` */`,
``,
`x`));
});
});

test('should indent within a multi-line comment block', () => {
return withRandomFileEditor(`/*-----\n * line 1\n * line 2${CURSOR}`, 'js', async (_editor, document) => {
await type(document, '\nx');
assert.strictEqual(
document.getText(),
joinLines(
`/*-----`,
` * line 1`,
` * line 2`,
` * x`));
});
});
});