Use outer loop to goDown in special case

alexdima · alexdima · commit 2bee07a13638 · 2020-02-06T15:29:29.000+01:00
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
@@ -2675,19 +2675,13 @@ export class TextModel extends Disposable implements model.ITextModel {
 				if (distance === 0) {
 					// This is the initial line number
 					if (currentIndent >= 0 && this._computeIndentLevel(upLineNumber) > currentIndent) {
-						// This is a new scope, we have special handling here, since we want the
-						// child scope's indent to be active, not the parent scope's
+						// This is the beginning of a scope, we have special handling here, since we want the
+						// child scope indent to be active, not the parent scope
+						goUp = false;
 						startLineNumber = upLineNumber + 1;
 						endLineNumber = maxLineNumber;
-						for (let offsetDown = startLineNumber; offsetDown < maxLineNumber; offsetDown++) {
-							if (this._computeIndentLevel(offsetDown) === currentIndent) {
-								endLineNumber = offsetDown;
-								break;
-							}
-						}
-						return { startLineNumber, endLineNumber, indent: upLineIndentLevel + 1 };
-					}
-					if (currentIndent >= 0 && this._computeIndentLevel(upLineNumber - 2) > currentIndent) {
+						indent = upLineIndentLevel + 1;
+					} else if (currentIndent >= 0 && this._computeIndentLevel(upLineNumber - 2) > currentIndent) {
 						// This is the end of a scope. Like above, but we walk backwards to find the parent scope start
 						endLineNumber = upLineNumber - 1;
 						startLineNumber = minLineNumber;
@@ -2698,10 +2692,12 @@ export class TextModel extends Disposable implements model.ITextModel {
 							}
 						}
 						return { startLineNumber, endLineNumber, indent: upLineIndentLevel + 1 };
+					} else {
+						startLineNumber = upLineNumber;
+						endLineNumber = downLineNumber;
+						indent = upLineIndentLevel;
 					}
-					startLineNumber = upLineNumber;
-					endLineNumber = downLineNumber;
-					indent = upLineIndentLevel;
+
 					if (indent === 0) {
 						// No need to continue
 						return { startLineNumber, endLineNumber, indent };
diff --git a/src/vs/editor/test/common/model/textModelWithTokens.test.ts b/src/vs/editor/test/common/model/textModelWithTokens.test.ts
@@ -612,8 +612,8 @@ suite('TextModel.getLineIndentGuide', () => {
 	test('getLineIndentGuide three levels', () => {
 		assertIndentGuides([
 			[0, 2, 4, 1, 'A'],
-			[1, 3, 5, 2, '  A'], // TODO 5 => 4
-			[2, 4, 5, 3, '    A'], // TODO 5 => 4
+			[1, 3, 4, 2, '  A'],
+			[2, 4, 4, 3, '    A'],
 			[3, 4, 4, 3, '      A'],
 			[0, 2, 4, 1, 'A'], // TODO => too big of a difference with the line above?
 		], 2);
@@ -717,9 +717,9 @@ suite('TextModel.getLineIndentGuide', () => {
 	test('issue #8952 - Indentation guide lines going through text on .yml file', () => {
 		assertIndentGuides([
 			[0, 2, 5, 1, 'properties:'],
-			[1, 3, 6, 2, '    emailAddress:'], // TODO 6 => 5
+			[1, 3, 5, 2, '    emailAddress:'],
 			[2, 3, 5, 2, '        - bla'],
-			[2, 5, 6, 3, '        - length:'], // TODO 6 => 5
+			[2, 5, 5, 3, '        - length:'],
 			[3, 5, 5, 3, '            max: 255'],
 			[0, 2, 5, 1, 'getters:']
 		], 4);
@@ -731,7 +731,7 @@ suite('TextModel.getLineIndentGuide', () => {
 			[1, 3, 6, 2, '\tswitch (base) {'],
 			[2, 4, 4, 3, '\t\tcase 1:'],
 			[3, 4, 4, 3, '\t\t\treturn 1;'],
-			[2, 6, 8, 3, '\t\tcase 2:'], // TODO 8 => 6 or 7
+			[2, 6, 6, 3, '\t\tcase 2:'],
 			[3, 6, 6, 3, '\t\t\treturn 2;'],
 			[1, 3, 6, 2, '\t}'],
 			[0, 2, 7, 1, '}']
@@ -740,7 +740,7 @@ suite('TextModel.getLineIndentGuide', () => {
 
 	test('issue #12398 - Problem in indent guidelines', () => {
 		assertIndentGuides([
-			[2, 2, 3, 3, '\t\t.bla'],
+			[2, 2, 2, 3, '\t\t.bla'],
 			[3, 2, 2, 3, '\t\t\tlabel(for)'],
 			[0, 1, 2, 1, 'include script']
 		], 4);
