Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix multi decl bug

Browse Source
This commit is contained in:
BigAru
2018-10-18 08:45:19 +02:00
parent 4c80de9078
commit 367f47e755
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/refactors/convertArrowFunctionOrFunction.ts
+22 -4
View File
@@ -102,11 +102,29 @@ namespace ts.refactor.convertArrowFunctionOrFunction {
const variableDeclaration = func.parent;
if (isVariableDeclaration(variableDeclaration) && isVariableDeclarationInVariableStatement(variableDeclaration) && isIdentifier(variableDeclaration.name)) {
const statement = findAncestor(variableDeclaration, n => n.kind === SyntaxKind.VariableStatement);
const newNode1 = createFunctionDeclaration(func.decorators, func.modifiers, func.asteriskToken, variableDeclaration.name, func.typeParameters, func.parameters, func.type, body2);
const edits1 = textChanges.ChangeTracker.with(context, t => t.replaceNode(file, statement!, newNode1));
return { renameFilename: undefined, renameLocation: undefined, edits: edits1 };
const varDeclList = findAncestor(variableDeclaration, n => n.kind === SyntaxKind.VariableDeclarationList)!;
if (!isVariableDeclarationList(varDeclList)) return undefined;
if (varDeclList.declarations.length === 0) return undefined;
if (varDeclList.declarations.length === 1) {
const statement = findAncestor(variableDeclaration, n => n.kind === SyntaxKind.VariableStatement);
const newNode1 = createFunctionDeclaration(func.decorators, func.modifiers, func.asteriskToken, variableDeclaration.name, func.typeParameters, func.parameters, func.type, body2);
const edits1 = textChanges.ChangeTracker.with(context, t => t.replaceNode(file, statement!, newNode1));
return { renameFilename: undefined, renameLocation: undefined, edits: edits1 };
}
else {
const statement = findAncestor(variableDeclaration, n => n.kind === SyntaxKind.VariableStatement);
const newNode1 = createFunctionDeclaration(func.decorators, func.modifiers, func.asteriskToken, variableDeclaration.name, func.typeParameters, func.parameters, func.type, body2);
const edits1 = textChanges.ChangeTracker.with(context, t => {
t.delete(file, variableDeclaration);
t.insertNodeAfter(file, statement!, newNode1);
});
return { renameFilename: undefined, renameLocation: undefined, edits: edits1 };
}
}
return undefined;