From 15561c41399e5da051f8bde8107d29a9dc909b9c Mon Sep 17 00:00:00 2001 From: Raymond Zhao Date: Tue, 29 Dec 2020 16:33:41 -0800 Subject: [PATCH] Emmet polish --- extensions/emmet/src/evaluateMathExpression.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/extensions/emmet/src/evaluateMathExpression.ts b/extensions/emmet/src/evaluateMathExpression.ts index 588d4dce9ba..cdbcfda1d3f 100644 --- a/extensions/emmet/src/evaluateMathExpression.ts +++ b/extensions/emmet/src/evaluateMathExpression.ts @@ -7,7 +7,6 @@ import * as vscode from 'vscode'; import evaluate, { extract } from '@emmetio/math-expression'; -import { DocumentStreamReader } from './bufferStream'; export function evaluateMathExpression(): Thenable { if (!vscode.window.activeTextEditor) { @@ -15,13 +14,12 @@ export function evaluateMathExpression(): Thenable { return Promise.resolve(false); } const editor = vscode.window.activeTextEditor; - const stream = new DocumentStreamReader(editor.document); return editor.edit(editBuilder => { editor.selections.forEach(selection => { // startpos always comes before endpos const startpos = selection.isReversed ? selection.active : selection.anchor; const endpos = selection.isReversed ? selection.anchor : selection.active; - const selectionText = stream.substring(startpos, endpos); + const selectionText = editor.document.getText(new vscode.Range(startpos, endpos)); try { if (selectionText) { @@ -30,7 +28,7 @@ export function evaluateMathExpression(): Thenable { editBuilder.replace(new vscode.Range(startpos, endpos), result); } else { // no selection made, extract expression from line - const lineToSelectionEnd = stream.substring(new vscode.Position(selection.end.line, 0), endpos); + const lineToSelectionEnd = editor.document.getText(new vscode.Range(new vscode.Position(selection.end.line, 0), endpos)); const extractedIndices = extract(lineToSelectionEnd); if (!extractedIndices) { throw new Error('Invalid extracted indices');