development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 09:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208287 from microsoft/aiday/indentNextLineWhenArrowFunctionUsed

Browse source 
Indent next line when arrow function arrow followed by whitespace
This commit is contained in:
Aiday Marlen Kyzy 2024-03-21 17:01:15 +01:00 committed by GitHub
parent 507f0c54bf 8c3873c8d8
commit d15b18783b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extensions/typescript-basics/language-configuration.json
View file

@ -137,6 +137,9 @@
// e.g. * ...| or */| or *-----*/|
"unIndentedLinePattern": {
"pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$|^(\\t|[ ])*[ ]\\*/\\s*$|^(\\t|[ ])*\\*([ ]([^\\*]|\\*(?!/))*)?$"
},
"indentNextLinePattern": {
"pattern": "^.*=>\\s*$"
}
},
"onEnterRules": [

33
src/vs/editor/contrib/indentation/test/browser/indentation.test.ts
View file

@ -538,25 +538,17 @@ suite('`Full` Auto Indent On Type - TypeScript/JavaScript', () => {
ensureNoDisposablesAreLeakedInTestSuite();
// Test added so there is at least one non-ignored test in this suite
test('temporary test', () => {
assert.ok(true);
});
// Failing tests from issues...
test.skip('issue #208215: indent after arrow function', () => {
test('issue #208215: indent after arrow function', () => {
// https://github.com/microsoft/vscode/issues/208215
// consider the regex: /^\s*(var|const|let)\s+\w+\s*=\s*\(.*\)\s*=>\s*$/
const model = createTextModel("", languageId, {});
disposables.add(model);
withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
registerLanguage(instantiationService, languageId, Language.TypeScript, disposables);
viewModel.type('const add1 = (n) =>');
viewModel.type("\n", 'keyboard');
assert.strictEqual(model.getValue(), [
@ -566,32 +558,31 @@ suite('`Full` Auto Indent On Type - TypeScript/JavaScript', () => {
});
});
test.skip('issue #208215: outdented after semicolon detected after arrow function', () => {
test('issue #208215: indent after arrow function 2', () => {
// Notes: we want to outdent after having detected a semi-colon which marks the end of the line, but only when we have detected an arrow function
// We could use one outdent pattern corresponding per indent pattern, and not a generic outdent and indent pattern
// https://github.com/microsoft/vscode/issues/208215
const model = createTextModel([
'const add1 = (n) =>',
' console.log("hi");',
'const array = [1, 2, 3, 4, 5];',
'array.map(',
' v =>',
].join('\n'), languageId, {});
disposables.add(model);
withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
registerLanguage(instantiationService, languageId, Language.TypeScript, disposables);
editor.setSelection(new Selection(2, 24, 2, 24));
editor.setSelection(new Selection(3, 9, 3, 9));
viewModel.type("\n", 'keyboard');
assert.strictEqual(model.getValue(), [
'const add1 = (n) =>',
' console.log("hi");',
'',
'const array = [1, 2, 3, 4, 5];',
'array.map(',
' v =>',
' '
].join('\n'));
});
});
test.skip('issue #116843: indent after arrow function', () => {
test('issue #116843: indent after arrow function', () => {
// https://github.com/microsoft/vscode/issues/116843

3
src/vs/editor/test/common/modes/supports/javascriptIndentationRules.ts
View file

@ -7,5 +7,6 @@ export const javascriptIndentationRules = {
decreaseIndentPattern: /^((?!.*?\/\*).*\*\/)?\s*[\}\]\)].*$/,
increaseIndentPattern: /^((?!\/\/).)*(\{([^}"'`]*|(\t|[ ])*\/\/.*)|\([^)"'`]*|\[[^\]"'`]*)$/,
// e.g. * ...| or */| or *-----*/|
unIndentedLinePattern: /^(\t|[ ])*[ ]\*[^/]*\*\/\s*$|^(\t|[ ])*[ ]\*\/\s*$|^(\t|[ ])*[ ]\*([ ]([^\*]|\*(?!\/))*)?$/
unIndentedLinePattern: /^(\t|[ ])*[ ]\*[^/]*\*\/\s*$|^(\t|[ ])*[ ]\*\/\s*$|^(\t|[ ])*[ ]\*([ ]([^\*]|\*(?!\/))*)?$/,
indentNextLinePattern: /^.*=>\s*$/,
};