maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

stash

Browse source
This commit is contained in:
王文璐 2018-04-18 17:34:30 +08:00
parent 32be0c7099
commit bd9a8b5c0c
7 changed files with 72 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/services/codefixes/convertFunctionToEs6Class.ts
View file

@ -202,22 +202,6 @@ namespace ts.codefix {
}
}
function copyComments(sourceNode: Node, targetNode: Node, sourceFile: SourceFile) {
forEachLeadingCommentRange(sourceFile.text, sourceNode.pos, (pos, end, kind, htnl) => {
if (kind === SyntaxKind.MultiLineCommentTrivia) {
// Remove leading /*
pos += 2;
// Remove trailing */
end -= 2;
}
else {
// Remove leading //
pos += 2;
}
addSyntheticLeadingComment(targetNode, kind, sourceFile.text.slice(pos, end), htnl);
});
}
function getModifierKindFromSource(source: Node, kind: SyntaxKind): ReadonlyArray<Modifier> | undefined {
return filter(source.modifiers, modifier => modifier.kind === kind);
}

55
src/services/refactors/addOrRemoveBracesToArrowFunction.ts
View file

@ -9,7 +9,7 @@ namespace ts.refactor.addOrRemoveBracesToArrowFunction {
registerRefactor(refactorName, { getEditsForAction, getAvailableActions });
interface Info {
container: ArrowFunction;
func: ArrowFunction;
expression: Expression;
addBraces: boolean;
}
@ -35,24 +35,31 @@ namespace ts.refactor.addOrRemoveBracesToArrowFunction {
}];
}
function getEditsForAction(context: RefactorContext, _actionName: string): RefactorEditInfo | undefined {
function getEditsForAction(context: RefactorContext, actionName: string): RefactorEditInfo | undefined {
const { file, startPosition } = context;
const info = getConvertibleArrowFunctionAtPosition(file, startPosition);
if (!info) return undefined;
const { expression, container } = info;
const { expression, func } = info;
const changeTracker = textChanges.ChangeTracker.fromContext(context);
if (_actionName === addBracesActionName) {
addBraces(changeTracker, file, container, expression);
let body: ConciseBody;
if (actionName === addBracesActionName) {
const returnStatement = createReturn(expression);
body = createBlock([returnStatement]);
copyComments(expression, returnStatement, file, SyntaxKind.SingleLineCommentTrivia, true);
}
else if (_actionName === removeBracesActionName) {
removeBraces(changeTracker, file, container, expression);
else if (actionName === removeBracesActionName) {
const returnStatement = <ReturnStatement>expression.parent;
body = needsParentheses(expression) ? createParen(expression) : expression;
copyComments(returnStatement, body, file, SyntaxKind.MultiLineCommentTrivia, false);
}
else {
Debug.fail("invalid action");
Debug.fail('invalid action');
}
updateBody(changeTracker, file, func, body);
return {
renameFilename: undefined,
renameLocation: undefined,
@ -60,18 +67,13 @@ namespace ts.refactor.addOrRemoveBracesToArrowFunction {
};
}
function addBraces(changeTracker: textChanges.ChangeTracker, file: SourceFile, container: ArrowFunction, expression: Expression) {
updateBraces(changeTracker, file, container, createBlock([createReturn(expression)]));
function needsParentheses(expression: Expression) {
if (isBinaryExpression(expression) && expression.operatorToken.kind === SyntaxKind.CommaToken) return true;
if (isObjectLiteralExpression(expression)) return true;
return false;
}
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) {
function updateBody(changeTracker: textChanges.ChangeTracker, file: SourceFile, container: ArrowFunction, body: ConciseBody) {
const arrowFunction = updateArrowFunction(
container,
container.modifiers,
@ -84,21 +86,22 @@ namespace ts.refactor.addOrRemoveBracesToArrowFunction {
function getConvertibleArrowFunctionAtPosition(file: SourceFile, startPosition: number): Info | undefined {
const node = getTokenAtPosition(file, startPosition, /*includeJsDocComment*/ false);
const container = getContainingFunction(node);
if (!container || !isArrowFunction(container)) return undefined;
const func = getContainingFunction(node);
if (!func || !isArrowFunction(func)) return undefined;
if (isExpression(container.body)) {
if (isExpression(func.body)) {
return {
container,
func,
addBraces: true,
expression: container.body
expression: func.body
};
}
else if (container.body.statements.length === 1) {
const firstStatement = first(container.body.statements);
else if (func.body.statements.length === 1) {
const firstStatement = first(func.body.statements);
if (isReturnStatement(firstStatement)) {
return {
container,
func,
addBraces: false,
expression: firstStatement.expression
};

16
src/services/utilities.ts
View file

@ -1642,4 +1642,20 @@ namespace ts {
Debug.assert(lastPos >= 0);
return lastPos;
}
export function copyComments(sourceNode: Node, targetNode: Node, sourceFile: SourceFile, explicitKind?: CommentKind, explicitHtnl?: boolean) {
forEachLeadingCommentRange(sourceFile.text, sourceNode.pos, (pos, end, kind, htnl) => {
if (kind === SyntaxKind.MultiLineCommentTrivia) {
// Remove leading /*
pos += 2;
// Remove trailing */
end -= 2;
}
else {
// Remove leading //
pos += 2;
}
addSyntheticLeadingComment(targetNode, explicitKind || kind, sourceFile.text.slice(pos, end), explicitHtnl !== undefined ? explicitHtnl : htnl);
});
}
}

2
tests/cases/fourslash/refactorAddOrRemoveBracesToArrowFunction15.ts
View file

@ -7,5 +7,5 @@ edit.applyRefactor({
refactorName: "Add or remove braces in an arrow function",
actionName: "Remove braces from arrow function",
actionDescription: "Remove braces from arrow function",
newContent: `const foo = a => (void 0);`,
newContent: `const foo = a => void 0;`,
});

14
tests/cases/fourslash/refactorAddOrRemoveBracesToArrowFunction20.ts Normal file
View file

@ -0,0 +1,14 @@
/// <reference path='fourslash.ts' />
//// const foo = /*a*/a/*b*/ => {
//// // return comment
//// return a;
//// };
goTo.select("a", "b");
edit.applyRefactor({
refactorName: "Add or remove braces in an arrow function",
actionName: "Remove braces from arrow function",
actionDescription: "Remove braces from arrow function",
newContent: `const foo = a => /* return comment */ a;`,
});

11
tests/cases/fourslash/refactorAddOrRemoveBracesToArrowFunction21.ts Normal file
View file

@ -0,0 +1,11 @@
/// <reference path='fourslash.ts' />
//// const foo = /*a*/a/*b*/ => /* expression comment */ a + 1
goTo.select("a", "b");
edit.applyRefactor({
refactorName: "Add or remove braces in an arrow function",
actionName: "Remove braces from arrow function",
actionDescription: "Remove braces from arrow function",
newContent: `const foo = a => { /* expression comment */ return a + 1; }`,
});

2
tests/cases/fourslash/refactorAddOrRemoveBracesToArrowFunction4.ts
View file

@ -7,5 +7,5 @@ edit.applyRefactor({
refactorName: "Add or remove braces in an arrow function",
actionName: "Remove braces from arrow function",
actionDescription: "Remove braces from arrow function",
newContent: `const foo = a => (a + 1);`,
newContent: `const foo = a => a + 1;`,
});