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

optimize templateLiteral check

Browse Source
This commit is contained in:
BigAru
2018-12-09 00:04:50 +01:00
parent 2b08bd3faf
commit 16109dfd00
5 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
function getAvailableActions(context: RefactorContext): ReadonlyArray<ApplicableRefactorInfo> {
const { file, startPosition } = context;
const node = getNodeOrParentOfBraces(file, startPosition);
const node = getNodeOrParentOfParentheses(file, startPosition);
const maybeBinary = getParentBinaryExpression(node);
const actions: RefactorActionInfo[] = [];
@@ -20,33 +20,24 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
actions.push({ name: toTemplateLiteralActionName, description: toTemplateLiteralDescription });
}
if (isTemplateLike(node)) {
const templateLiteral = findAncestor(node, n => isTemplateLiteral(n));
if (templateLiteral && !isTaggedTemplateExpression(templateLiteral.parent)) {
actions.push({ name: toStringConcatenationActionName, description: toStringConcatenationDescription });
}
return [{ name: refactorName, description: refactorDescription, actions }];
}
function getNodeOrParentOfBraces(file: SourceFile, startPosition: number) {
function getNodeOrParentOfParentheses(file: SourceFile, startPosition: number) {
const node = getTokenAtPosition(file, startPosition);
if (isParenthesizedExpression(node.parent) && isBinaryExpression(node.parent.parent)) return node.parent.parent;
return node;
}
function isTemplateLike(node: Node) {
const isTemplateWithoutSubstitution = isNoSubstitutionTemplateLiteral(node) && isNotTagged(node);
const isTemplate = (isTemplateHead(node) || isTemplateMiddleOrTemplateTail(node)) && isNotTagged(node.parent);
const isTemplateFromExpression = isTemplateSpan(node.parent) && isNotTagged(node.parent.parent);
return isTemplateWithoutSubstitution || isTemplate || isTemplateFromExpression;
}
function isNotTagged(templateExpression: Node) {
return !isTaggedTemplateExpression(templateExpression.parent);
}
function getEditsForAction(context: RefactorContext, actionName: string): RefactorEditInfo | undefined {
const { file, startPosition } = context;
const node = getNodeOrParentOfBraces(file, startPosition);
const node = getNodeOrParentOfParentheses(file, startPosition);
switch (actionName) {
case toTemplateLiteralActionName:
@@ -65,20 +56,20 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
}
function getEditsForToStringConcatenation(context: RefactorContext, node: Node) {
if (isTemplateExpression(node.parent) || isTemplateSpan(node.parent)) {
const templateLiteralExpression = isTemplateSpan(node.parent) ? node.parent.parent : node.parent;
const { head, templateSpans } = templateLiteralExpression;
const templateLiteral = findAncestor(node, n => isTemplateLiteral(n))! as TemplateLiteral;
if (isTemplateExpression(templateLiteral)) {
const { head, templateSpans } = templateLiteral;
const arrayOfNodes = templateSpans.map(templateSpanToExpressions)
.reduce((accumulator, nextArray) => accumulator.concat(nextArray));
if (head.text.length !== 0) arrayOfNodes.unshift(createStringLiteral(head.text));
const binaryExpression = arrayToTree(arrayOfNodes);
return textChanges.ChangeTracker.with(context, t => t.replaceNode(context.file, templateLiteralExpression, binaryExpression));
return textChanges.ChangeTracker.with(context, t => t.replaceNode(context.file, templateLiteral, binaryExpression));
}
else {
const templateWithoutSubstitution = node as NoSubstitutionTemplateLiteral;
const stringLiteral = createStringLiteral(templateWithoutSubstitution.text);
const stringLiteral = createStringLiteral(templateLiteral.text);
return textChanges.ChangeTracker.with(context, t => t.replaceNode(context.file, node, stringLiteral));
}
}

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

@@ -25,5 +25,5 @@ verify.refactorAvailable("Convert string concatenation or template literal", "Co
verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to template literal");
goTo.select("p", "o");
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");

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

@@ -0,0 +1,14 @@
/// <reference path='fourslash.ts' />
//// const age = 42
//// const foo = `foobar is a ${ age < 18 ? 'child' : /*x*/`/*y*/grown-up ${ age > 40 ? 'who needs probaply assistance' : ''}` }`
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 a \${ age < 18 ? 'child' : "grown-up " + (age > 40 ? 'who needs probaply assistance' : '') }\``,
});

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

@@ -0,0 +1,14 @@
/// <reference path='fourslash.ts' />
//// const age = 42
//// const foo = `foobar is a ${ `/*x*/3/*y*/4` }`
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 a \${ "34" }\``,
});

2
tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNested.ts → tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedOuter.ts
View File

@@ -1,7 +1,7 @@
/// <reference path='fourslash.ts' />
//// const age = 42
//// const foo = `/*x*/f/*y*/oobar is a ${ age < 18 ? 'child' : `grown-up ${ age > 40 ? 'who needs probaply assistance': ''}` }`
//// const foo = `foobar is a ${ /*x*/a/*y*/ge < 18 ? 'child' : `grown-up ${ age > 40 ? 'who needs probaply assistance': ''}` }`
goTo.select("x", "y");
edit.applyRefactor({