Merge pull request microsoft#208303 from microsoft/sensitive-falcon

Adding a test in the auto-indentation test suite

Author: aiday-mar

src/vs/editor/contrib/indentation/test/browser/indentation.test.ts

@@ -732,6 +732,8 @@ suite('`Full` Auto Indent On Type - TypeScript/JavaScript', () => {
 		// issue: Should indent after an equal sign is detected followed by whitespace characters.
 		// This should be outdented when a semi-colon is detected indicating the end of the assignment.
 
+		// TODO: requires exploring indent/outdent pairs instead
+
 		const model = createTextModel([
 			'const array ='
 		].join('\n'), languageId, {});
@@ -753,6 +755,8 @@ suite('`Full` Auto Indent On Type - TypeScript/JavaScript', () => {
 		// https://github.com/microsoft/vscode/issues/43244
 		// issue: When a dot is written, we should detect that this is a method call and indent accordingly
 
+		// TODO: requires exploring indent/outdent pairs instead
+
 		const model = createTextModel([
 			'const array = [1, 2, 3];',
 			'array.'
@@ -776,6 +780,8 @@ suite('`Full` Auto Indent On Type - TypeScript/JavaScript', () => {
 		// https://github.com/microsoft/vscode/issues/43244
 		// issue: When a dot is written, we should detect that this is a method call and indent accordingly
 
+		// TODO: requires exploring indent/outdent pairs instead
+
 		const model = createTextModel([
 			'const array = [1, 2, 3]',
 		].join('\n'), languageId, {});
@@ -798,6 +804,8 @@ suite('`Full` Auto Indent On Type - TypeScript/JavaScript', () => {
 		// https://github.com/microsoft/vscode/issues/43244
 		// Currently passes, but should pass with all the tests above too
 
+		// TODO: requires exploring indent/outdent pairs instead
+
 		const model = createTextModel([
 			'const array = [1, 2, 3]',
 			'    .filter(() => true)'
@@ -816,10 +824,38 @@ suite('`Full` Auto Indent On Type - TypeScript/JavaScript', () => {
 		});
 	});
 
+	test.skip('issue #43244: keep indentation when chained methods called on object/array', () => {
+
+		// https://github.com/microsoft/vscode/issues/43244
+		// When the call chain is not finished yet, and we type a dot, we do not want to change the indentation
+
+		// TODO: requires exploring indent/outdent pairs instead
+
+		const model = createTextModel([
+			'const array = [1, 2, 3]',
+			'    .filter(() => true)',
+			'    '
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
+			registerLanguage(instantiationService, languageId, Language.TypeScript, disposables);
+			editor.setSelection(new Selection(3, 5, 3, 5));
+			viewModel.type(".");
+			assert.strictEqual(model.getValue(), [
+				'const array = [1, 2, 3]',
+				'    .filter(() => true)',
+				'    .' // here we don't want to increase the indentation because we have chained methods
+			].join('\n'));
+		});
+	});
+
 	test.skip('issue #43244: outdent when a semi-color is detected indicating the end of the assignment', () => {
 
 		// https://github.com/microsoft/vscode/issues/43244
 
+		// TODO: requires exploring indent/outdent pairs instead
+
 		const model = createTextModel([
 			'const array = [1, 2, 3]',
 			'    .filter(() => true);'
@@ -844,17 +880,17 @@ suite('`Full` Auto Indent On Type - TypeScript/JavaScript', () => {
 
 		const model = createTextModel([
 			'const array = [1, 2, 3, 4, 5];',
-			'array.map(v =>)'
+			'array.map(_)'
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
 		withTestCodeEditor(model, { autoIndent: "full" }, (editor, viewModel, instantiationService) => {
 			registerLanguage(instantiationService, languageId, Language.TypeScript, disposables);
-			editor.setSelection(new Selection(2, 15, 2, 15));
+			editor.setSelection(new Selection(2, 12, 2, 12));
 			viewModel.type("\n", 'keyboard');
 			assert.strictEqual(model.getValue(), [
 				'const array = [1, 2, 3, 4, 5];',
-				'array.map(v =>',
+				'array.map(_',
 				'    ',
 				')'
 			].join('\n'));

src/vs/workbench/contrib/codeEditor/test/node/autoindent.test.ts

@@ -190,7 +190,7 @@ suite('Auto-Reindentation - TypeScript/JavaScript', () => {
 		// explanation: if (, [, {, is followed by a forward slash then assume we are in a regex pattern, and do not indent
 
 		// increaseIndentPattern: /^((?!\/\/).)*(\{([^}"'`]*|(\t|[ ])*\/\/.*)|\([^)"'`]*|\[[^\]"'`]*)$/ -> /^((?!\/\/).)*(\{([^}"'`/]*|(\t|[ ])*\/\/.*)|\([^)"'`/]*|\[[^\]"'`/]*)$/
-		// -> Final current increase indent pattern
+		// -> Final current increase indent pattern at of writing
 
 		const fileContents = [
 			'const r = /{/;',
@@ -214,7 +214,7 @@ suite('Auto-Reindentation - TypeScript/JavaScript', () => {
 		// fix: https://github.com/microsoft/vscode/commit/7910b3d7bab8a721aae98dc05af0b5e1ea9d9782
 
 		// decreaseIndentPattern: /^(.*\*\/)?\s*[\}\]\)].*$/ -> /^((?!.*?\/\*).*\*\/)?\s*[\}\]\)].*$/
-		// -> Final current decrease indent pattern
+		// -> Final current decrease indent pattern at the time of writing
 
 		// explanation: Positive lookahead: (?= «pattern») matches if pattern matches what comes after the current location in the input string.
 		// Negative lookahead: (?! «pattern») matches if pattern does not match what comes after the current location in the input string
@@ -282,10 +282,8 @@ suite('Auto-Reindentation - TypeScript/JavaScript', () => {
 		// related: https://github.com/microsoft/vscode/issues/43244
 		// explanation: When you have an arrow function, you don't have { or }, but you would expect indentation to still be done in that way
 
-		/*
-		Notes: Currently the reindent edit operations does not call the onEnter rules
-		The reindent should also call the onEnter rules to get the correct indentation
-		*/
+		// TODO: requires exploring indent/outdent pairs instead
+
 		const fileContents = [
 			'const add1 = (n) =>',
 			'	n + 1;',