Fixes microsoft#84312: Add a time limit to bracket matching

alexdima · alexdima · commit 40b5b5dde1dc · 2019-12-06T00:29:55.000+01:00
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
@@ -898,7 +898,7 @@ export interface ITextModel {
 	 * @param position The position at which to start the search.
 	 * @internal
 	 */
-	findEnclosingBrackets(position: IPosition): [Range, Range] | null;
+	findEnclosingBrackets(position: IPosition, maxDuration?: number): [Range, Range] | null;
 
 	/**
 	 * Given a `position`, if the position is on top or near a bracket,
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
@@ -34,6 +34,7 @@ import { withUndefinedAsNull } from 'vs/base/common/types';
 import { VSBufferReadableStream, VSBuffer } from 'vs/base/common/buffer';
 import { TokensStore, MultilineTokens, countEOL, MultilineTokens2, TokensStore2 } from 'vs/editor/common/model/tokensStore';
 import { Color } from 'vs/base/common/color';
+import { Constants } from 'vs/base/common/uint';
 
 function createTextBufferBuilder() {
 	return new PieceTreeTextBufferBuilder();
@@ -2341,7 +2342,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 		return null;
 	}
 
-	public findEnclosingBrackets(_position: IPosition): [Range, Range] | null {
+	public findEnclosingBrackets(_position: IPosition, maxDuration = Constants.MAX_SAFE_SMALL_INTEGER): [Range, Range] | null {
 		const position = this.validatePosition(_position);
 		const lineCount = this.getLineCount();
 		const savedCounts = new Map<number, number[]>();
@@ -2385,7 +2386,12 @@ export class TextModel extends Disposable implements model.ITextModel {
 
 		let languageId: LanguageId = -1;
 		let modeBrackets: RichEditBrackets | null = null;
+		const startTime = Date.now();
 		for (let lineNumber = position.lineNumber; lineNumber <= lineCount; lineNumber++) {
+			const elapsedTime = Date.now() - startTime;
+			if (elapsedTime > maxDuration) {
+				return null;
+			}
 			const lineTokens = this._getLineTokens(lineNumber);
 			const tokenCount = lineTokens.getCount();
 			const lineText = this._buffer.getLineContent(lineNumber);
diff --git a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts
@@ -334,7 +334,7 @@ export class BracketMatchingController extends Disposable implements editorCommo
 				let brackets = model.matchBracket(position);
 				let options = BracketMatchingController._DECORATION_OPTIONS_WITH_OVERVIEW_RULER;
 				if (!brackets && this._matchBrackets === 'always') {
-					brackets = model.findEnclosingBrackets(position);
+					brackets = model.findEnclosingBrackets(position, 20 /* give at most 20ms to compute */);
 					options = BracketMatchingController._DECORATION_OPTIONS_WITHOUT_OVERVIEW_RULER;
 				}
 				newData[newDataLen++] = new BracketsData(position, brackets, options);

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ export class BracketMatchingController extends Disposable implements editorCommo`
`334`	`334`	`let brackets = model.matchBracket(position);`
`335`	`335`	`let options = BracketMatchingController._DECORATION_OPTIONS_WITH_OVERVIEW_RULER;`
`336`	`336`	`if (!brackets && this._matchBrackets === 'always') {`
`337`		`- brackets = model.findEnclosingBrackets(position);`
	`337`	`+ brackets = model.findEnclosingBrackets(position, 20 /* give at most 20ms to compute */);`
`338`	`338`	`options = BracketMatchingController._DECORATION_OPTIONS_WITHOUT_OVERVIEW_RULER;`
`339`	`339`	`}`
`340`	`340`	`newData[newDataLen++] = new BracketsData(position, brackets, options);`