From 3ce216849a3ab42f6bce0c94fbdde3d557366cbf Mon Sep 17 00:00:00 2001 From: BigAru Date: Sun, 9 Dec 2018 01:07:05 +0100 Subject: [PATCH] extract getEdits for template literal --- .../refactors/convertStringOrTemplateLiteral.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/services/refactors/convertStringOrTemplateLiteral.ts b/src/services/refactors/convertStringOrTemplateLiteral.ts index c63a4f48f1e..5246054363e 100644 --- a/src/services/refactors/convertStringOrTemplateLiteral.ts +++ b/src/services/refactors/convertStringOrTemplateLiteral.ts @@ -41,11 +41,7 @@ namespace ts.refactor.convertStringOrTemplateLiteral { switch (actionName) { case toTemplateLiteralActionName: - const maybeBinary = getParentBinaryExpression(node); - const arrayOfNodes = transformTreeToArray(maybeBinary); - const templateLiteral = nodesToTemplate(arrayOfNodes); - const edits = textChanges.ChangeTracker.with(context, t => t.replaceNode(file, maybeBinary, templateLiteral)); - return { edits }; + return { edits: getEditsForToTemplateLiteral(context, node) }; case toStringConcatenationActionName: return { edits: getEditsForToStringConcatenation(context, node) }; @@ -55,6 +51,13 @@ namespace ts.refactor.convertStringOrTemplateLiteral { } } + function getEditsForToTemplateLiteral(context: RefactorContext, node: Node) { + const maybeBinary = getParentBinaryExpression(node); + const arrayOfNodes = transformTreeToArray(maybeBinary); + const templateLiteral = nodesToTemplate(arrayOfNodes); + return textChanges.ChangeTracker.with(context, t => t.replaceNode(context.file, maybeBinary, templateLiteral)); + } + function getEditsForToStringConcatenation(context: RefactorContext, node: Node) { const templateLiteral = findAncestor(node, n => isTemplateLiteral(n))! as TemplateLiteral;