Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

De-kludge deduplication of EOF processing

Browse Source
This commit is contained in:
Andrew Branch
2019-09-13 12:14:33 -07:00
parent 9bd7d54ba9
commit 2c1eef235a
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/formatting/formatting.ts
+3 -11
View File
@@ -652,7 +652,7 @@ namespace ts.formatting {
consumeTokenAndAdvanceScanner(tokenInfo, node, nodeDynamicIndentation, node);
}
if (formattingScanner.isOnEOF()) {
if (!node.parent && formattingScanner.isOnEOF()) {
const token = formattingScanner.readEOFTokenRange();
if (token.end <= node.end && previousRange) {
processPair(
@@ -1148,11 +1148,7 @@ namespace ts.formatting {
function recordDelete(start: number, len: number) {
if (len) {
const newEdit = createTextChangeFromStartLength(start, len, "");
const lastEdit = lastOrUndefined(edits);
if (!lastEdit || !textSpansEqual(lastEdit.span, newEdit.span) || lastEdit.newText !== newEdit.newText) {
edits.push(newEdit);
}
edits.push(createTextChangeFromStartLength(start, len, ""));
}
}
@@ -1164,11 +1160,7 @@ namespace ts.formatting {
function recordInsert(start: number, text: string) {
if (text) {
const newEdit = createTextChangeFromStartLength(start, 0, text);
const lastEdit = lastOrUndefined(edits);
if (!lastEdit || !textSpansEqual(lastEdit.span, newEdit.span) || lastEdit.newText !== newEdit.newText) {
edits.push(newEdit);
}
edits.push(createTextChangeFromStartLength(start, 0, text));
}
}