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

extract creation of funcDeclaration

Browse source
This commit is contained in:
BigAru 2018-10-19 12:43:12 +02:00
parent a9cb623795
commit 6bd26cd2e5
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/services/refactors/convertArrowFunctionOrFunctionExpression.ts
View file

@ -82,29 +82,24 @@ namespace ts.refactor.convertArrowFunctionOrFunctionExpression {
const variableDeclaration = func.parent;
if (!isVariableDeclaration(variableDeclaration) || !isVariableDeclarationInVariableStatement(variableDeclaration) || !isIdentifier(variableDeclaration.name)) return undefined;
const varDeclList = findAncestor(variableDeclaration, n => n.kind === SyntaxKind.VariableDeclarationList)!;
const varDeclList = findAncestor(variableDeclaration, n => isVariableDeclarationList(n))!;
if (!isVariableDeclarationList(varDeclList)) return undefined;
const statement = findAncestor(variableDeclaration, n => n.kind === SyntaxKind.VariableStatement)!;
const statement = findAncestor(variableDeclaration, n => isVariableStatement(n))!;
if (!isVariableStatement(statement)) return undefined;
if (varDeclList.declarations.length === 0) return undefined;
if (varDeclList.declarations.length === 1) {
newNode = makeFuncDecl(func, statement, variableDeclaration.name, body);
const newNode = createFunctionDeclaration(func.decorators, statement.modifiers, func.asteriskToken, variableDeclaration.name, func.typeParameters, func.parameters, func.type, body);
const edits = textChanges.ChangeTracker.with(context, t => t.replaceNode(file, statement, newNode));
return { renameFilename: undefined, renameLocation: undefined, edits };
if (varDeclList.declarations.length === 1) {
edits = textChanges.ChangeTracker.with(context, t => t.replaceNode(file, statement, newNode));
}
else {
const newNode = createFunctionDeclaration(func.decorators, statement.modifiers, func.asteriskToken, variableDeclaration.name, func.typeParameters, func.parameters, func.type, body);
const edits = textChanges.ChangeTracker.with(context, t => {
edits = textChanges.ChangeTracker.with(context, t => {
t.delete(file, variableDeclaration);
t.insertNodeAfter(file, statement, newNode);
});
return { renameFilename: undefined, renameLocation: undefined, edits };
}
break;
case toArrowFunctionActionName:
@ -132,8 +127,6 @@ namespace ts.refactor.convertArrowFunctionOrFunctionExpression {
}
return { renameFilename: undefined, renameLocation: undefined, edits };
}
function getInfo(file: SourceFile, startPosition: number): Info | undefined {
@ -167,4 +160,16 @@ namespace ts.refactor.convertArrowFunctionOrFunctionExpression {
return func.body;
}
}
function makeFuncDecl(func: FunctionExpression | ArrowFunction, statement: VariableStatement, name: Identifier, body: Block) {
return createFunctionDeclaration(
func.decorators,
statement.modifiers,
func.asteriskToken,
name,
func.typeParameters,
func.parameters,
func.type,
body);
}
}