microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-18 07:29:16 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Remove refactoring from template expression to string concatenation.

Browse Source
This commit is contained in:
Daniel Rosenwasser
2020-01-02 16:12:44 -08:00
parent 88795e2a2e
commit ad0f0064ce
25 changed files with 1 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/diagnosticMessages.json
View File

@@ -5349,10 +5349,6 @@
"category": "Message",
"code": 95097
},
"Convert to string concatenation": {
"category": "Message",
"code": 95098
},
"No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.": {
"category": "Error",

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

@@ -2,11 +2,9 @@
namespace ts.refactor.convertStringOrTemplateLiteral {
const refactorName = "Convert string concatenation or template literal";
const toTemplateLiteralActionName = "Convert to template literal";
const toStringConcatenationActionName = "Convert to string concatenation";
const refactorDescription = getLocaleSpecificMessage(Diagnostics.Convert_string_concatenation_or_template_literal);
const toTemplateLiteralDescription = getLocaleSpecificMessage(Diagnostics.Convert_to_template_literal);
const toStringConcatenationDescription = getLocaleSpecificMessage(Diagnostics.Convert_to_string_concatenation);
registerRefactor(refactorName, { getEditsForAction, getAvailableActions });
@@ -20,14 +18,6 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
refactorInfo.actions.push({ name: toTemplateLiteralActionName, description: toTemplateLiteralDescription });
return [refactorInfo];
}
const templateLiteral = findAncestor(node, n => isTemplateLiteral(n));
if (templateLiteral && !isTaggedTemplateExpression(templateLiteral.parent)) {
refactorInfo.actions.push({ name: toStringConcatenationActionName, description: toStringConcatenationDescription });
return [refactorInfo];
}
return emptyArray;
}
@@ -46,17 +36,13 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
return node;
}
function getEditsForAction(context: RefactorContext, actionName: string): RefactorEditInfo | undefined {
function getEditsForAction(context: RefactorContext, actionName: typeof toTemplateLiteralActionName): RefactorEditInfo | undefined {
const { file, startPosition } = context;
const node = getNodeOrParentOfParentheses(file, startPosition);
switch (actionName) {
case toTemplateLiteralActionName:
return { edits: getEditsForToTemplateLiteral(context, node) };
case toStringConcatenationActionName:
return { edits: getEditsForToStringConcatenation(context, node) };
default:
return Debug.fail("invalid action");
}
@@ -85,33 +71,6 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
}
}
const templateSpanToExpressions = (file: SourceFile) => (templateSpan: TemplateSpan): Expression[] => {
const { expression, literal } = templateSpan;
const text = literal.text;
copyTrailingAsLeadingComments(templateSpan, expression, file, SyntaxKind.MultiLineCommentTrivia, /* hasTrailingNewLine */ false);
return text.length === 0 ? [expression] : [expression, createStringLiteral(text)];
};
function getEditsForToStringConcatenation(context: RefactorContext, node: Node) {
const templateLiteral = findAncestor(node, n => isTemplateLiteral(n))! as TemplateLiteral;
if (isTemplateExpression(templateLiteral)) {
const { head, templateSpans } = templateLiteral;
const spanToExpressionWithComment = templateSpanToExpressions(context.file);
const arrayOfNodes = templateSpans.map(spanToExpressionWithComment)
.reduce((accumulator, nextArray) => accumulator.concat(nextArray));
if (head.text.length !== 0) arrayOfNodes.unshift(createStringLiteral(head.text));
const singleExpressionOrBinary = makeSingleExpressionOrBinary(arrayOfNodes);
return textChanges.ChangeTracker.with(context, t => t.replaceNode(context.file, templateLiteral, singleExpressionOrBinary));
}
else {
const stringLiteral = createStringLiteral(templateLiteral.text);
return textChanges.ChangeTracker.with(context, t => t.replaceNode(context.file, node, stringLiteral));
}
}
function isNotEqualsOperator(node: BinaryExpression) {
return node.operatorToken.kind !== SyntaxKind.EqualsToken;
}
@@ -123,26 +82,6 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
return expr;
}
function makeSingleExpressionOrBinary(nodes: readonly Expression[]): Expression {
if (nodes.length > 1) {
const left = nodes[0];
const right = nodes[1];
const binary = createBinary(left, SyntaxKind.PlusToken, right);
return arrayToTree(nodes, 2, binary);
}
return nodes[0];
}
function arrayToTree(nodes: readonly Expression[], index: number, accumulator: BinaryExpression): Expression {
if (nodes.length === index) return accumulator;
const right = nodes[index];
const binary = createBinary(accumulator, SyntaxKind.PlusToken, right);
return arrayToTree(nodes, index + 1, binary);
}
function isStringConcatenationValid(node: Node): boolean {
const { containsString, areOperatorsValid } = treeToArray(node);
return containsString && areOperatorsValid;