Exposes and adopts IViewLineTokens.getLineContent

microsoft · Nov 3, 2021 · 7a6414a · 7a6414a
1 parent 0e72666
commit 7a6414a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/vs/editor/common/core/lineTokens.ts b/src/vs/editor/common/core/lineTokens.ts
@@ -13,6 +13,7 @@ export interface IViewLineTokens {
 	getClassName(tokenIndex: number): string;
 	getInlineStyle(tokenIndex: number, colorMap: string[]): string;
 	findTokenIndexAtOffset(offset: number): number;
+	getLineContent(): string;
 }
 
 export class LineTokens implements IViewLineTokens {
@@ -246,6 +247,10 @@ export class SlicedLineTokens implements IViewLineTokens {
 		}
 	}
 
+	public getLineContent(): string {
+		return this._source.getLineContent().substring(this._startOffset, this._endOffset);
+	}
+
 	public equals(other: IViewLineTokens): boolean {
 		if (other instanceof SlicedLineTokens) {
 			return (

diff --git a/src/vs/editor/common/viewModel/modelLineProjection.ts b/src/vs/editor/common/viewModel/modelLineProjection.ts
@@ -147,7 +147,6 @@ export class ModelLineProjection implements IModelLineProjection {
 		const injectionOffsets = lineBreakData.injectionOffsets;
 		const injectionOptions = lineBreakData.injectionOptions;
 
-		let lineContent: string;
 		let tokens: IViewLineTokens;
 		let inlineDecorations: null | SingleLineInlineDecoration[];
 		if (injectionOffsets) {
@@ -160,7 +159,6 @@ export class ModelLineProjection implements IModelLineProjection {
 			const lineStartOffsetInInputWithInjections = outputLineIndex > 0 ? lineBreakData.breakOffsets[outputLineIndex - 1] : 0;
 			const lineEndOffsetInInputWithInjections = lineBreakData.breakOffsets[outputLineIndex];
 
-			lineContent = lineTokens.getLineContent().substring(lineStartOffsetInInputWithInjections, lineEndOffsetInInputWithInjections);
 			tokens = lineTokens.sliceAndInflate(lineStartOffsetInInputWithInjections, lineEndOffsetInInputWithInjections, deltaStartIndex);
 			inlineDecorations = new Array<SingleLineInlineDecoration>();
 
@@ -194,16 +192,11 @@ export class ModelLineProjection implements IModelLineProjection {
 			const startOffset = this.getInputStartOffsetOfOutputLineIndex(outputLineIndex);
 			const endOffset = this.getInputEndOffsetOfOutputLineIndex(outputLineIndex);
 			const lineTokens = model.getLineTokens(modelLineNumber);
-			lineContent = model.getValueInRange({
-				startLineNumber: modelLineNumber,
-				startColumn: startOffset + 1,
-				endLineNumber: modelLineNumber,
-				endColumn: endOffset + 1
-			});
 			tokens = lineTokens.sliceAndInflate(startOffset, endOffset, deltaStartIndex);
 			inlineDecorations = null;
 		}
 
+		let lineContent = tokens.getLineContent();
 		if (outputLineIndex > 0) {
 			lineContent = spaces(lineBreakData.wrappedTextIndentLength) + lineContent;
 		}