Skip to content

Commit 2c1eef2

Browse files
committed
De-kludge deduplication of EOF processing
1 parent 9bd7d54 commit 2c1eef2

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

src/services/formatting/formatting.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ namespace ts.formatting {
652652
consumeTokenAndAdvanceScanner(tokenInfo, node, nodeDynamicIndentation, node);
653653
}
654654

655-
if (formattingScanner.isOnEOF()) {
655+
if (!node.parent && formattingScanner.isOnEOF()) {
656656
const token = formattingScanner.readEOFTokenRange();
657657
if (token.end <= node.end && previousRange) {
658658
processPair(
@@ -1148,11 +1148,7 @@ namespace ts.formatting {
11481148

11491149
function recordDelete(start: number, len: number) {
11501150
if (len) {
1151-
const newEdit = createTextChangeFromStartLength(start, len, "");
1152-
const lastEdit = lastOrUndefined(edits);
1153-
if (!lastEdit || !textSpansEqual(lastEdit.span, newEdit.span) || lastEdit.newText !== newEdit.newText) {
1154-
edits.push(newEdit);
1155-
}
1151+
edits.push(createTextChangeFromStartLength(start, len, ""));
11561152
}
11571153
}
11581154

@@ -1164,11 +1160,7 @@ namespace ts.formatting {
11641160

11651161
function recordInsert(start: number, text: string) {
11661162
if (text) {
1167-
const newEdit = createTextChangeFromStartLength(start, 0, text);
1168-
const lastEdit = lastOrUndefined(edits);
1169-
if (!lastEdit || !textSpansEqual(lastEdit.span, newEdit.span) || lastEdit.newText !== newEdit.newText) {
1170-
edits.push(newEdit);
1171-
}
1163+
edits.push(createTextChangeFromStartLength(start, 0, text));
11721164
}
11731165
}
11741166

0 commit comments

Comments
 (0)