Fixes microsoft#86410: Fix issue with embedded modes where the entire line text should be looked at to decide if electric characters should run

alexdima · alexdima · commit af9e425939c5 · 2020-01-23T11:03:38.000+01:00
diff --git a/src/vs/editor/common/modes/supports.ts b/src/vs/editor/common/modes/supports.ts
@@ -62,6 +62,11 @@ export class ScopedLineTokens {
 		return actualLineContent.substring(this.firstCharOffset, this._lastCharOffset);
 	}
 
+	public getActualLineContentBefore(offset: number): string {
+		const actualLineContent = this._actual.getLineContent();
+		return actualLineContent.substring(0, this.firstCharOffset + offset);
+	}
+
 	public getTokenCount(): number {
 		return this._lastTokenIndex - this._firstTokenIndex;
 	}
diff --git a/src/vs/editor/common/modes/supports/electricCharacter.ts b/src/vs/editor/common/modes/supports/electricCharacter.ts
@@ -49,28 +49,27 @@ export class BracketElectricCharacterSupport {
 			return null;
 		}
 
-		let tokenIndex = context.findTokenIndexAtOffset(column - 1);
+		const tokenIndex = context.findTokenIndexAtOffset(column - 1);
 		if (ignoreBracketsInToken(context.getStandardTokenType(tokenIndex))) {
 			return null;
 		}
 
-		let reversedBracketRegex = this._richEditBrackets.reversedRegex;
-		let text = context.getLineContent().substring(0, column - 1) + character;
+		const reversedBracketRegex = this._richEditBrackets.reversedRegex;
+		const text = context.getLineContent().substring(0, column - 1) + character;
 
-		let r = BracketsUtils.findPrevBracketInRange(reversedBracketRegex, 1, text, 0, text.length);
+		const r = BracketsUtils.findPrevBracketInRange(reversedBracketRegex, 1, text, 0, text.length);
 		if (!r) {
 			return null;
 		}
 
-		let bracketText = text.substring(r.startColumn - 1, r.endColumn - 1);
-		bracketText = bracketText.toLowerCase();
+		const bracketText = text.substring(r.startColumn - 1, r.endColumn - 1).toLowerCase();
 
-		let isOpen = this._richEditBrackets.textIsOpenBracket[bracketText];
+		const isOpen = this._richEditBrackets.textIsOpenBracket[bracketText];
 		if (isOpen) {
 			return null;
 		}
 
-		let textBeforeBracket = text.substring(0, r.startColumn - 1);
+		const textBeforeBracket = context.getActualLineContentBefore(r.startColumn - 1);
 		if (!/^\s*$/.test(textBeforeBracket)) {
 			// There is other text on the line before the bracket
 			return null;

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,11 @@ export class ScopedLineTokens {`
`62`	`62`	`return actualLineContent.substring(this.firstCharOffset, this._lastCharOffset);`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ public getActualLineContentBefore(offset: number): string {`
	`66`	`+ const actualLineContent = this._actual.getLineContent();`
	`67`	`+ return actualLineContent.substring(0, this.firstCharOffset + offset);`
	`68`	`+ }`
	`69`	`+`
`65`	`70`	`public getTokenCount(): number {`
`66`	`71`	`return this._lastTokenIndex - this._firstTokenIndex;`
`67`	`72`	`}`