microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-06 11:54:44 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(47853): Convert to template string issue (#47976)

Browse Source
This commit is contained in:
Zzzen 2022-03-01 02:40:48 +08:00 committed by GitHub
parent 0043abe982
commit 41b981c998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/refactors/convertStringOrTemplateLiteral.ts
View File

@ -215,7 +215,7 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
const isLastSpan = index === currentNode.templateSpans.length - 1;
const text = span.literal.text + (isLastSpan ? subsequentText : "");
const rawText = getRawTextOfTemplate(span.literal) + (isLastSpan ? rawSubsequentText : "");
return factory.createTemplateSpan(span.expression, isLast
return factory.createTemplateSpan(span.expression, isLast && isLastSpan
? factory.createTemplateTail(text, rawText)
: factory.createTemplateMiddle(text, rawText));
});

11
tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_TemplateString13.ts Normal file
View File

@ -0,0 +1,11 @@
/// <reference path='fourslash.ts' />
////fetch(/*start*/process.env.API_URL + `/foo/bar?id=${id}&token=${token}`/*end*/);
goTo.select("start", "end");
edit.applyRefactor({
refactorName: "Convert to template string",
actionName: "Convert to template string",
actionDescription: ts.Diagnostics.Convert_to_template_string.message,
newContent: "fetch(`${process.env.API_URL}/foo/bar?id=${id}&token=${token}`);",
});