Synthetic signature uses existing parameter names

Arthur Ozga · Arthur Ozga · commit 469745b1819c · 2016-12-11T21:50:46.000-08:00
diff --git a/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts b/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts
@@ -20,7 +20,7 @@ namespace ts.codefix {
 
                 const insertion = getMissingMembersInsertion(classDecl, abstractAndNonPrivateExtendsSymbols, checker, context.newLineCharacter);
 
-                if (insertion) {
+                if (insertion.length) {
                     return [{
                         description: getLocaleSpecificMessage(Diagnostics.Implement_inherited_abstract_class),
                         changes: [{
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
@@ -93,6 +93,7 @@ namespace ts.codefix {
         newSignatureDeclaration.name = signatures[0].getDeclaration().name;
 
         let maxNonRestArgs = -1;
+        let maxArgsIndex = 0;
         let minArgumentCount = signatures[0].minArgumentCount;
         let hasRestParameter = false;
         for (let i = 0; i < signatures.length; i++) {
@@ -102,8 +103,10 @@ namespace ts.codefix {
             const nonRestLength = sig.parameters.length - (sig.hasRestParameter ? 1 : 0);
             if (nonRestLength > maxNonRestArgs) {
                 maxNonRestArgs = nonRestLength;
+                maxArgsIndex = i;
             }
         }
+        const maxArgsParameterSymbolNames = signatures[maxArgsIndex].getParameters().map(symbol => symbol.getName());
 
         const anyTypeNode: TypeNode = createNode(SyntaxKind.AnyKeyword) as TypeNode;
         const optionalToken = createToken(SyntaxKind.QuestionToken);
@@ -130,7 +133,7 @@ namespace ts.codefix {
 
         function createParameterDeclaration(index: number, minArgCount: number, typeNode: TypeNode, enclosingSignatureDeclaration: SignatureDeclaration): ParameterDeclaration {
             const newParameter = createNode(SyntaxKind.Parameter) as ParameterDeclaration;
-            newParameter.symbol = checker.createSymbol(SymbolFlags.FunctionScopedVariable, "arg" + index);
+            newParameter.symbol = checker.createSymbol(SymbolFlags.FunctionScopedVariable, maxArgsParameterSymbolNames[index] || "rest");
             newParameter.symbol.valueDeclaration = newParameter;
             newParameter.symbol.declarations = [newParameter];
             newParameter.type = typeNode;
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractMethod.ts b/tests/cases/fourslash/codeFixClassExtendsAbstractMethod.ts
@@ -12,7 +12,7 @@ verify.rangeAfterCodeFix(`
     f(a: number, b: string): boolean;
     f(a: string, b: number): Function;
     f(a: string): Function;
-    f(arg0: any, arg1?: any) {
+    f(a: any, b?: any) {
         throw new Error('Method not implemented.');
     }
 `);
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceComputedPropertyNameWellKnownSymbols.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceComputedPropertyNameWellKnownSymbols.ts
@@ -44,7 +44,7 @@ verify.rangeAfterCodeFix(`
     [Symbol.toPrimitive](hint: "number"): number;
     [Symbol.toPrimitive](hint: "default"): number;
     [Symbol.toPrimitive](hint: "string"): string;
-    [Symbol.toPrimitive](arg0: any) {
+    [Symbol.toPrimitive](hint: any) {
         throw new Error('Method not implemented.');
     }
     [Symbol.toStringTag]: string;
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignatures.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignatures.ts
@@ -12,7 +12,7 @@ verify.rangeAfterCodeFix(`
     method(a: number, b: string): boolean;
     method(a: string, b: number): Function;
     method(a: string): Function;
-    method(arg0: any, arg1?: any) {
+    method(a: any, b?: any) {
         throw new Error('Method not implemented.');
     }
 `);
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignaturesRest1.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignaturesRest1.ts
@@ -12,7 +12,7 @@ verify.rangeAfterCodeFix(`
     method(a: number, ...b: string[]): boolean;
     method(a: string, ...b: number[]): Function;
     method(a: string): Function;
-    method(arg0: any, ...arg1?: any[]) {
+    method(a: any, ...b?: any[]) {
         throw new Error('Method not implemented.');
     }
 `);
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignaturesRest2.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMultipleSignaturesRest2.ts
@@ -12,7 +12,7 @@ verify.rangeAfterCodeFix(`
     method(a: number, ...b: string[]): boolean;
     method(a: string, b: number): Function;
     method(a: string): Function;
-    method(arg0: any, arg1?: any, ...arg2?: any[]) {
+    method(a: any, b?: any, ...rest?: any[]) {
         throw new Error('Method not implemented.');
     }
 `);

Original file line number	Diff line number	Diff line change
@@ -12,7 +12,7 @@ verify.rangeAfterCodeFix(`
`12`	`12`	`f(a: number, b: string): boolean;`
`13`	`13`	`f(a: string, b: number): Function;`
`14`	`14`	`f(a: string): Function;`
`15`		`- f(arg0: any, arg1?: any) {`
	`15`	`+ f(a: any, b?: any) {`
`16`	`16`	`throw new Error('Method not implemented.');`
`17`	`17`	`}`
`18`	`18`	`);
Original file line number	Diff line number	Diff line change
@@ -44,7 +44,7 @@ verify.rangeAfterCodeFix(`
`44`	`44`	`[Symbol.toPrimitive](hint: "number"): number;`
`45`	`45`	`[Symbol.toPrimitive](hint: "default"): number;`
`46`	`46`	`[Symbol.toPrimitive](hint: "string"): string;`
`47`		`- [Symbol.toPrimitive](arg0: any) {`
	`47`	`+ [Symbol.toPrimitive](hint: any) {`
`48`	`48`	`throw new Error('Method not implemented.');`
`49`	`49`	`}`
`50`	`50`	`[Symbol.toStringTag]: string;`