microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-17 00:34:47 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

add toString visibility from expression and from middle part

Browse Source
This commit is contained in:
BigAru
2018-12-07 04:24:01 +01:00
parent 576271ef55
commit 3b284886b1
4 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
const toStringConcatenationDescription = getLocaleSpecificMessage(Diagnostics.Convert_to_string_concatenation);
// TODO let a = 45 + 45 + " ee" + 33;
// TODO let a = 45 - 45 + " ee" - 33;
// TODO let a = tag `aaa`;
registerRefactor(refactorName, { getEditsForAction, getAvailableActions });
@@ -19,22 +20,17 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
const maybeBinary = getParentBinaryExpression(node); containsString(maybeBinary);
const actions: RefactorActionInfo[] = [];
if (!isTemplateLike(node) && (isBinaryExpression(maybeBinary) || isStringLiteral(maybeBinary)) && containsString(maybeBinary)) {
if ((isBinaryExpression(maybeBinary) || isStringLiteral(maybeBinary)) && containsString(maybeBinary)) {
actions.push({ name: toTemplateLiteralActionName, description: toTemplateLiteralDescription });
}
if (isTemplateLike(node)) {
if (isNoSubstitutionTemplateLiteral(node) || isTemplateHead(node) || isTemplateSpan(node.parent)) {
actions.push({ name: toStringConcatenationActionName, description: toStringConcatenationDescription });
}
return [{ name: refactorName, description: refactorDescription, actions }];
}
function isTemplateLike(node: Node): boolean {
return isNoSubstitutionTemplateLiteral(node) || isTemplateHead(node) || isTemplateMiddleOrTemplateTail(node);
}
function getEditsForAction(context: RefactorContext, actionName: string): RefactorEditInfo | undefined {
const { file, startPosition } = context;
const node = getTokenAtPosition(file, startPosition);
@@ -55,8 +51,8 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
return { edits: textChanges.ChangeTracker.with(context, t => t.replaceNode(file, node, stringLiteral)) };
}
if (isTemplateExpression(node.parent)) {
const templateLiteralExpression = node.parent;
if (isTemplateExpression(node.parent) || isTemplateSpan(node.parent)) {
const templateLiteralExpression = isTemplateSpan(node.parent) ? node.parent.parent : node.parent;
const nodesArray: Expression[] = [];
if (templateLiteralExpression.head.text.length !== 0) nodesArray.push(createStringLiteral(templateLiteralExpression.head.text));

2
tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailability.ts
View File

@@ -21,7 +21,7 @@ verify.refactorAvailable("Convert string concatenation or template literal", "Co
verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to template literal");
goTo.select("r", "q");
verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to string concatenation");
verify.refactorAvailable("Convert string concatenation or template literal", "Convert to string concatenation");
verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to template literal");
goTo.select("p", "o");

14
tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromExpr.ts Normal file
View File

@@ -0,0 +1,14 @@
/// <reference path='fourslash.ts' />
//// const age = 42
//// const foo = `foobar is ${ /*x*/a/*y*/ge } years old`
goTo.select("x", "y");
edit.applyRefactor({
refactorName: "Convert string concatenation or template literal",
actionName: "Convert to string concatenation",
actionDescription: "Convert to string concatenation",
newContent:
`const age = 42
const foo = "foobar is " + age + " years old"`,
});

14
tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromMiddle.ts Normal file
View File

@@ -0,0 +1,14 @@
/// <reference path='fourslash.ts' />
//// const age = 42
//// const foo = `foobar is ${ age } /*x*/y/*y*/ears old ${ false }`
goTo.select("x", "y");
edit.applyRefactor({
refactorName: "Convert string concatenation or template literal",
actionName: "Convert to string concatenation",
actionDescription: "Convert to string concatenation",
newContent:
`const age = 42
const foo = "foobar is " + age + " years old " + false`,
});