From 2c1eef235ad853d8a69b476fa10a1bbcb8215e50 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Fri, 13 Sep 2019 12:14:33 -0700 Subject: [PATCH] De-kludge deduplication of EOF processing --- src/services/formatting/formatting.ts | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index 0ade89420ca..7cb4eb7948a 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -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)); } }