Fixing #145072 by reporting tokenization as incomplete when tokenizat…

…ion state store is not defined.
microsoft · Mar 18, 2022 · db25f1e · db25f1e
1 parent 44e8d34
commit db25f1e
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/vs/editor/common/model/textModelTokens.ts b/src/vs/editor/common/model/textModelTokens.ts
@@ -294,13 +294,13 @@ export class TextModelTokenization extends Disposable {
 			}
 		} while (this._hasLinesToTokenize());
 
-		this._textModel.setTokens(builder.finalize(), !this._hasLinesToTokenize());
+		this._textModel.setTokens(builder.finalize(), this._isTokenizationComplete());
 	}
 
 	public tokenizeViewport(startLineNumber: number, endLineNumber: number): void {
 		const builder = new ContiguousMultilineTokensBuilder();
 		this._tokenizeViewport(builder, startLineNumber, endLineNumber);
-		this._textModel.setTokens(builder.finalize(), !this._hasLinesToTokenize());
+		this._textModel.setTokens(builder.finalize(), this._isTokenizationComplete());
 	}
 
 	public reset(): void {
@@ -311,7 +311,7 @@ export class TextModelTokenization extends Disposable {
 	public forceTokenization(lineNumber: number): void {
 		const builder = new ContiguousMultilineTokensBuilder();
 		this._updateTokensUntilLine(builder, lineNumber);
-		this._textModel.setTokens(builder.finalize(), !this._hasLinesToTokenize());
+		this._textModel.setTokens(builder.finalize(), this._isTokenizationComplete());
 	}
 
 	public getTokenTypeIfInsertingCharacter(position: Position, character: string): StandardTokenType {
@@ -405,6 +405,13 @@ export class TextModelTokenization extends Disposable {
 		return (this._tokenizationStateStore.invalidLineStartIndex < this._textModel.getLineCount());
 	}
 
+	private _isTokenizationComplete(): boolean {
+		if (!this._tokenizationStateStore) {
+			return false;
+		}
+		return (this._tokenizationStateStore.invalidLineStartIndex >= this._textModel.getLineCount());
+	}
+
 	private _tokenizeOneInvalidLine(builder: ContiguousMultilineTokensBuilder): number {
 		if (!this._tokenizationStateStore || !this._hasLinesToTokenize()) {
 			return this._textModel.getLineCount() + 1;