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

fix refactor to find super references

Browse Source
This commit is contained in:
Gabriela Britto
2019-02-01 16:43:44 -08:00
parent bf25ba4650
commit bde97d1226
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/services/refactors/convertToNamedParameters.ts
View File

@@ -40,7 +40,7 @@ namespace ts.refactor.convertToNamedParameters {
const nameNodes = getFunctionDeclarationNames(functionDeclaration);
const functionRefs = flatMap(nameNodes, name => FindAllReferences.getReferenceEntriesForNode(-1, name, program, program.getSourceFiles(), cancellationToken));
const functionCalls = getDirectFunctionCalls(functionRefs);
const functionCalls = deduplicate(getDirectFunctionCalls(functionRefs), (a, b) => a === b);
forEach(functionCalls, call => {
if (call.arguments && call.arguments.length) {
@@ -223,13 +223,19 @@ namespace ts.refactor.convertToNamedParameters {
case SyntaxKind.MethodDeclaration:
return [functionDeclaration.name];
case SyntaxKind.Constructor:
const ctrKeyword = findChildOfKind(functionDeclaration, SyntaxKind.ConstructorKeyword, functionDeclaration.getSourceFile());
let name: Node;
switch (functionDeclaration.parent.kind) {
case SyntaxKind.ClassDeclaration:
return [functionDeclaration, functionDeclaration.parent.name];
name = functionDeclaration.parent.name;
break;
case SyntaxKind.ClassExpression:
return [functionDeclaration.parent.parent.name];
name = functionDeclaration.parent.parent.name;
break;
default: return Debug.assertNever(functionDeclaration.parent);
}
if (ctrKeyword) return [ctrKeyword, name];
return [name];
case SyntaxKind.ArrowFunction:
case SyntaxKind.FunctionExpression:
return [functionDeclaration.parent.name];