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

add tests and fix

Browse Source
This commit is contained in:
王文璐
2018-04-17 10:33:21 +08:00
parent 5a69d9c255
commit 32be0c7099
25 changed files with 178 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/diagnosticMessages.json
View File

@@ -4281,7 +4281,7 @@
"category": "Message",
"code": 95054
},
"Convert arrow function": {
"Add or remove braces in an arrow function": {
"category": "Message",
"code": 95055
},

2
src/harness/tsconfig.json
View File

@@ -121,7 +121,7 @@
"../services/refactors/extractSymbol.ts",
"../services/refactors/generateGetAccessorAndSetAccessor.ts",
"../services/refactors/moveToNewFile.ts",
"../services/refactors/convertArrowFunction.ts",
"../services/refactors/addOrRemoveBracesToArrowFunction.ts",
"../services/sourcemaps.ts",
"../services/services.ts",
"../services/breakpoints.ts",

2
src/server/tsconfig.json
View File

@@ -117,7 +117,7 @@
"../services/refactors/extractSymbol.ts",
"../services/refactors/generateGetAccessorAndSetAccessor.ts",
"../services/refactors/moveToNewFile.ts",
"../services/refactors/convertArrowFunction.ts",
"../services/refactors/addOrRemoveBracesToArrowFunction.ts",
"../services/sourcemaps.ts",
"../services/services.ts",
"../services/breakpoints.ts",

2
src/server/tsconfig.library.json
View File

@@ -123,7 +123,7 @@
"../services/refactors/extractSymbol.ts",
"../services/refactors/generateGetAccessorAndSetAccessor.ts",
"../services/refactors/moveToNewFile.ts",
"../services/refactors/convertArrowFunction.ts",
"../services/refactors/addOrRemoveBracesToArrowFunction.ts",
"../services/sourcemaps.ts",
"../services/services.ts",
"../services/breakpoints.ts",

69
src/services/refactors/convertArrowFunction.ts → src/services/refactors/addOrRemoveBracesToArrowFunction.ts
View File

@@ -1,7 +1,7 @@
/* @internal */
namespace ts.refactor.convertArrowFunction {
const refactorName = "Convert arrow function";
const refactorDescription = Diagnostics.Convert_arrow_function.message;
namespace ts.refactor.addOrRemoveBracesToArrowFunction {
const refactorName = "Add or remove braces in an arrow function";
const refactorDescription = Diagnostics.Add_or_remove_braces_in_an_arrow_function.message;
const addBracesActionName = "Add braces to arrow function";
const removeBracesActionName = "Remove braces from arrow function";
const addBracesActionDescription = Diagnostics.Add_braces_to_arrow_function.message;
@@ -19,21 +19,19 @@ namespace ts.refactor.convertArrowFunction {
const info = getConvertibleArrowFunctionAtPosition(file, startPosition);
if (!info) return undefined;
const actions: RefactorActionInfo[] = [
info.addBraces ?
{
name: addBracesActionName,
description: addBracesActionDescription
} : {
name: removeBracesActionName,
description: removeBracesActionDescription
}
];
return [{
name: refactorName,
description: refactorDescription,
actions
actions: [
info.addBraces ?
{
name: addBracesActionName,
description: addBracesActionDescription
} : {
name: removeBracesActionName,
description: removeBracesActionDescription
}
]
}];
}
@@ -42,9 +40,18 @@ namespace ts.refactor.convertArrowFunction {
const info = getConvertibleArrowFunctionAtPosition(file, startPosition);
if (!info) return undefined;
const { addBraces, expression, container } = info;
const { expression, container } = info;
const changeTracker = textChanges.ChangeTracker.fromContext(context);
updateBraces(changeTracker, file, container, expression, addBraces);
if (_actionName === addBracesActionName) {
addBraces(changeTracker, file, container, expression);
}
else if (_actionName === removeBracesActionName) {
removeBraces(changeTracker, file, container, expression);
}
else {
Debug.fail("invalid action");
}
return {
renameFilename: undefined,
@@ -53,9 +60,18 @@ namespace ts.refactor.convertArrowFunction {
};
}
function updateBraces(changeTracker: textChanges.ChangeTracker, file: SourceFile, container: ArrowFunction, expression: Expression, addBraces: boolean) {
const body = addBraces ? createBlock([createReturn(expression)]) : expression;
function addBraces(changeTracker: textChanges.ChangeTracker, file: SourceFile, container: ArrowFunction, expression: Expression) {
updateBraces(changeTracker, file, container, createBlock([createReturn(expression)]));
}
function removeBraces(changeTracker: textChanges.ChangeTracker, file: SourceFile, container: ArrowFunction, expression: Expression) {
if (!isLiteralExpression(expression) && !isIdentifier(expression) && !isParenthesizedExpression(expression) && expression.kind !== SyntaxKind.NullKeyword) {
expression = createParen(expression);
}
updateBraces(changeTracker, file, container, expression);
}
function updateBraces(changeTracker: textChanges.ChangeTracker, file: SourceFile, container: ArrowFunction, body: ConciseBody) {
const arrowFunction = updateArrowFunction(
container,
container.modifiers,
@@ -78,12 +94,15 @@ namespace ts.refactor.convertArrowFunction {
expression: container.body
};
}
else if (container.body.statements.length === 1 && isReturnStatement(first(container.body.statements))) {
return {
container,
addBraces: false,
expression: (<ReturnStatement>first(container.body.statements)).expression
};
else if (container.body.statements.length === 1) {
const firstStatement = first(container.body.statements);
if (isReturnStatement(firstStatement)) {
return {
container,
addBraces: false,
expression: firstStatement.expression
};
}
}
return undefined;
}

2
src/services/tsconfig.json
View File

@@ -114,7 +114,7 @@
"refactors/extractSymbol.ts",
"refactors/generateGetAccessorAndSetAccessor.ts",
"refactors/moveToNewFile.ts",
"refactors/convertArrowFunction.ts",
"refactors/addOrRemoveBracesToArrowFunction.ts",
"sourcemaps.ts",
"services.ts",
"breakpoints.ts",