Merge pull request #30062 from jwunderl/quick-fix-any-annotation

DanielRosenwasser · web-flow · commit c37254e509d5 · 2019-02-24T23:18:06.000-08:00
Remove any annotation from declare method quickfix
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
@@ -156,7 +156,7 @@ namespace ts.codefix {
             isIdentifier(arg) ? arg.text :
                 isPropertyAccessExpression(arg) ? arg.name.text : undefined);
         const contextualType = checker.getContextualType(call);
-        const returnType = inJs ? undefined : contextualType && checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker) || createKeywordTypeNode(SyntaxKind.AnyKeyword);
+        const returnType = (inJs || !contextualType) ? undefined : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
         return createMethod(
             /*decorators*/ undefined,
             /*modifiers*/ makeStatic ? [createToken(SyntaxKind.StaticKeyword)] : undefined,
diff --git a/tests/cases/fourslash/codeFixAddMissingMember9.ts b/tests/cases/fourslash/codeFixAddMissingMember9.ts
@@ -18,7 +18,7 @@ verify.codeFixAll({
         const x = 0;
         this.y(x, "a", this.z);
     }
-    y(x: number, arg1: string, z: boolean): any {
+    y(x: number, arg1: string, z: boolean) {
         throw new Error("Method not implemented.");
     }
 }`,
diff --git a/tests/cases/fourslash/codeFixAddMissingMember_all.ts b/tests/cases/fourslash/codeFixAddMissingMember_all.ts
@@ -36,7 +36,7 @@ verify.codeFixAll({
         this.y();
         this.x = "";
     }
-    y(): any {
+    y() {
         throw new Error("Method not implemented.");
     }
 }
diff --git a/tests/cases/fourslash/codeFixAddMissingMember_generator_function.ts b/tests/cases/fourslash/codeFixAddMissingMember_generator_function.ts
@@ -14,7 +14,7 @@ verify.codeFixAll({
     *method() {
         yield* this.y();
     }
-    *y(): any {
+    *y() {
         throw new Error("Method not implemented.");
     }
 }`,
diff --git a/tests/cases/fourslash/codeFixAddMissingMember_non_generator_function.ts b/tests/cases/fourslash/codeFixAddMissingMember_non_generator_function.ts
@@ -14,7 +14,7 @@ verify.codeFixAll({
     method() {
         yield* this.y();
     }
-    y(): any {
+    y() {
         throw new Error("Method not implemented.");
     }
 }`,
diff --git a/tests/cases/fourslash/codeFixUndeclaredAcrossFiles1.ts b/tests/cases/fourslash/codeFixUndeclaredAcrossFiles1.ts
@@ -23,15 +23,15 @@ verify.getAndApplyCodeFix(/*errorCode*/undefined, 0);
 verify.getAndApplyCodeFix(/*errorCode*/undefined, 0);
 
 verify.rangeIs(`
-    m2(c: C): any {
+    m2(c: C) {
         throw new Error("Method not implemented.");
     }
     y: {};
-    m1(): any {
+    m1() {
         throw new Error("Method not implemented.");
     }
     static x: any;
-    static m0(arg0: number, arg1: string, arg2: undefined[]): any {
+    static m0(arg0: number, arg1: string, arg2: undefined[]) {
         throw new Error("Method not implemented.");
     }
 `);
diff --git a/tests/cases/fourslash/codeFixUndeclaredAcrossFiles3.ts b/tests/cases/fourslash/codeFixUndeclaredAcrossFiles3.ts
@@ -20,7 +20,7 @@
 verify.getAndApplyCodeFix(/*errorCode*/ undefined, 0);
 
 verify.rangeIs(`
-    m0(arg0: import("./f2").D): any {
+    m0(arg0: import("./f2").D) {
         throw new Error("Method not implemented.");
     }
 `);
diff --git a/tests/cases/fourslash/codeFixUndeclaredInStaticMethod.ts b/tests/cases/fourslash/codeFixUndeclaredInStaticMethod.ts
@@ -20,7 +20,7 @@ verify.codeFix({
         this.prop1 = 10;
         A.prop2 = "asdf";
     }
-    static m1(arg0: number, arg1: number, arg2: number): any {
+    static m1(arg0: number, arg1: number, arg2: number) {
         throw new Error("Method not implemented.");
     }
 }`,
@@ -38,10 +38,10 @@ verify.codeFix({
         this.prop1 = 10;
         A.prop2 = "asdf";
     }
-    static m2(arg0: number, arg1: number): any {
+    static m2(arg0: number, arg1: number) {
         throw new Error("Method not implemented.");
     }
-    static m1(arg0: number, arg1: number, arg2: number): any {
+    static m1(arg0: number, arg1: number, arg2: number) {
         throw new Error("Method not implemented.");
     }
 }`,
@@ -60,10 +60,10 @@ verify.codeFix({
         this.prop1 = 10;
         A.prop2 = "asdf";
     }
-    static m2(arg0: number, arg1: number): any {
+    static m2(arg0: number, arg1: number) {
         throw new Error("Method not implemented.");
     }
-    static m1(arg0: number, arg1: number, arg2: number): any {
+    static m1(arg0: number, arg1: number, arg2: number) {
         throw new Error("Method not implemented.");
     }
 }`,
@@ -83,10 +83,10 @@ verify.codeFix({
         this.prop1 = 10;
         A.prop2 = "asdf";
     }
-    static m2(arg0: number, arg1: number): any {
+    static m2(arg0: number, arg1: number) {
         throw new Error("Method not implemented.");
     }
-    static m1(arg0: number, arg1: number, arg2: number): any {
+    static m1(arg0: number, arg1: number, arg2: number) {
         throw new Error("Method not implemented.");
     }
 }`,
diff --git a/tests/cases/fourslash/codeFixUndeclaredMethod.ts b/tests/cases/fourslash/codeFixUndeclaredMethod.ts
@@ -15,7 +15,7 @@ verify.codeFix({
     index: 0,
     newFileContent:
 `class A {
-    foo1(arg0: number, arg1: number, arg2: number): any {
+    foo1(arg0: number, arg1: number, arg2: number) {
         throw new Error("Method not implemented.");
     }
     constructor() {
@@ -34,10 +34,10 @@ verify.codeFix({
     index: 0,
     newFileContent:
 `class A {
-    foo2<T, U, V, W, X, Y, Z>(): any {
+    foo2<T, U, V, W, X, Y, Z>() {
         throw new Error("Method not implemented.");
     }
-    foo1(arg0: number, arg1: number, arg2: number): any {
+    foo1(arg0: number, arg1: number, arg2: number) {
         throw new Error("Method not implemented.");
     }
     constructor() {
@@ -56,13 +56,13 @@ verify.codeFix({
     index: 0,
     newFileContent:
 `class A {
-    foo3<T0, T1, T2, T3, T4, T5, T6, T7>(): any {
+    foo3<T0, T1, T2, T3, T4, T5, T6, T7>() {
         throw new Error("Method not implemented.");
     }
-    foo2<T, U, V, W, X, Y, Z>(): any {
+    foo2<T, U, V, W, X, Y, Z>() {
         throw new Error("Method not implemented.");
     }
-    foo1(arg0: number, arg1: number, arg2: number): any {
+    foo1(arg0: number, arg1: number, arg2: number) {
         throw new Error("Method not implemented.");
     }
     constructor() {
diff --git a/tests/cases/fourslash/codeFixUndeclaredMethodFunctionArgs.ts b/tests/cases/fourslash/codeFixUndeclaredMethodFunctionArgs.ts
@@ -11,7 +11,7 @@ verify.codeFix({
     description: "Declare method 'foo1'",
     index: 0,
     newRangeContent: `
-    foo1(arg0: () => number, arg1: () => string, arg2: () => boolean): any {
+    foo1(arg0: () => number, arg1: () => string, arg2: () => boolean) {
         throw new Error("Method not implemented.");
     }
     `,
@@ -22,10 +22,10 @@ verify.codeFix({
     description: "Declare method 'foo2'",
     index: 0,
     newRangeContent: `
-    foo2(arg0: (a: number) => number, arg1: (b: string) => string, arg2: (c: boolean) => boolean): any {
+    foo2(arg0: (a: number) => number, arg1: (b: string) => string, arg2: (c: boolean) => boolean) {
         throw new Error("Method not implemented.");
     }
-    foo1(arg0: () => number, arg1: () => string, arg2: () => boolean): any {
+    foo1(arg0: () => number, arg1: () => string, arg2: () => boolean) {
         throw new Error("Method not implemented.");
     }
     `,
diff --git a/tests/cases/fourslash/codeFixUndeclaredMethodObjectLiteralArgs.ts b/tests/cases/fourslash/codeFixUndeclaredMethodObjectLiteralArgs.ts
@@ -3,14 +3,47 @@
 //// class A {[|
 ////     |]constructor() {
 ////         this.foo1(null, {}, { a: 1, b: "2"});
+////         const bar = this.foo2(null, {}, { a: 1, b: "2"});
+////         const baz: number = this.foo3(null, {}, { a: 1, b: "2"});
 ////     }
 //// }
 
 verify.codeFix({
     description: "Declare method 'foo1'",
     index: 0,
     newRangeContent: `
-    foo1(arg0: null, arg1: {}, arg2: { a: number; b: string; }): any {
+    foo1(arg0: null, arg1: {}, arg2: { a: number; b: string; }) {
+        throw new Error("Method not implemented.");
+    }
+    `,
+    applyChanges: true
+});
+
+verify.codeFix({
+    description: "Declare method 'foo2'",
+    index: 0,
+    newRangeContent: `
+    foo2(arg0: null, arg1: {}, arg2: { a: number; b: string; }) {
+        throw new Error("Method not implemented.");
+    }
+    foo1(arg0: null, arg1: {}, arg2: { a: number; b: string; }) {
+        throw new Error("Method not implemented.");
+    }
+    `,
+    applyChanges: true
+});
+
+verify.codeFix({
+    description: "Declare method 'foo3'",
+    index: 0,
+    newRangeContent: `
+    foo3(arg0: null, arg1: {}, arg2: { a: number; b: string; }): number {
+        throw new Error("Method not implemented.");
+    }
+    foo2(arg0: null, arg1: {}, arg2: { a: number; b: string; }) {
+        throw new Error("Method not implemented.");
+    }
+    foo1(arg0: null, arg1: {}, arg2: { a: number; b: string; }) {
         throw new Error("Method not implemented.");
     }
     `

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ verify.codeFixAll({`
`18`	`18`	`const x = 0;`
`19`	`19`	`this.y(x, "a", this.z);`
`20`	`20`	`}`
`21`		`- y(x: number, arg1: string, z: boolean): any {`
	`21`	`+ y(x: number, arg1: string, z: boolean) {`
`22`	`22`	`throw new Error("Method not implemented.");`
`23`	`23`	`}`
`24`	`24`	}`,
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ verify.codeFixAll({`
`36`	`36`	`this.y();`
`37`	`37`	`this.x = "";`
`38`	`38`	`}`
`39`		`- y(): any {`
	`39`	`+ y() {`
`40`	`40`	`throw new Error("Method not implemented.");`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ verify.codeFixAll({`
`14`	`14`	`*method() {`
`15`	`15`	`yield* this.y();`
`16`	`16`	`}`
`17`		`- *y(): any {`
	`17`	`+ *y() {`
`18`	`18`	`throw new Error("Method not implemented.");`
`19`	`19`	`}`
`20`	`20`	}`,
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@ verify.getAndApplyCodeFix(/errorCode/undefined, 0);`
`23`	`23`	`verify.getAndApplyCodeFix(/errorCode/undefined, 0);`
`24`	`24`
`25`	`25`	verify.rangeIs(`
`26`		`- m2(c: C): any {`
	`26`	`+ m2(c: C) {`
`27`	`27`	`throw new Error("Method not implemented.");`
`28`	`28`	`}`
`29`	`29`	`y: {};`
`30`		`- m1(): any {`
	`30`	`+ m1() {`
`31`	`31`	`throw new Error("Method not implemented.");`
`32`	`32`	`}`
`33`	`33`	`static x: any;`
`34`		`- static m0(arg0: number, arg1: string, arg2: undefined[]): any {`
	`34`	`+ static m0(arg0: number, arg1: string, arg2: undefined[]) {`
`35`	`35`	`throw new Error("Method not implemented.");`
`36`	`36`	`}`
`37`	`37`	`);
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`verify.getAndApplyCodeFix(/errorCode/ undefined, 0);`
`21`	`21`
`22`	`22`	verify.rangeIs(`
`23`		`- m0(arg0: import("./f2").D): any {`
	`23`	`+ m0(arg0: import("./f2").D) {`
`24`	`24`	`throw new Error("Method not implemented.");`
`25`	`25`	`}`
`26`	`26`	`);
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ verify.codeFix({`
`20`	`20`	`this.prop1 = 10;`
`21`	`21`	`A.prop2 = "asdf";`
`22`	`22`	`}`
`23`		`- static m1(arg0: number, arg1: number, arg2: number): any {`
	`23`	`+ static m1(arg0: number, arg1: number, arg2: number) {`
`24`	`24`	`throw new Error("Method not implemented.");`
`25`	`25`	`}`
`26`	`26`	}`,
`@@ -38,10 +38,10 @@ verify.codeFix({`
`38`	`38`	`this.prop1 = 10;`
`39`	`39`	`A.prop2 = "asdf";`
`40`	`40`	`}`
`41`		`- static m2(arg0: number, arg1: number): any {`
	`41`	`+ static m2(arg0: number, arg1: number) {`
`42`	`42`	`throw new Error("Method not implemented.");`
`43`	`43`	`}`
`44`		`- static m1(arg0: number, arg1: number, arg2: number): any {`
	`44`	`+ static m1(arg0: number, arg1: number, arg2: number) {`
`45`	`45`	`throw new Error("Method not implemented.");`
`46`	`46`	`}`
`47`	`47`	}`,
`@@ -60,10 +60,10 @@ verify.codeFix({`
`60`	`60`	`this.prop1 = 10;`
`61`	`61`	`A.prop2 = "asdf";`
`62`	`62`	`}`
`63`		`- static m2(arg0: number, arg1: number): any {`
	`63`	`+ static m2(arg0: number, arg1: number) {`
`64`	`64`	`throw new Error("Method not implemented.");`
`65`	`65`	`}`
`66`		`- static m1(arg0: number, arg1: number, arg2: number): any {`
	`66`	`+ static m1(arg0: number, arg1: number, arg2: number) {`
`67`	`67`	`throw new Error("Method not implemented.");`
`68`	`68`	`}`
`69`	`69`	}`,
`@@ -83,10 +83,10 @@ verify.codeFix({`
`83`	`83`	`this.prop1 = 10;`
`84`	`84`	`A.prop2 = "asdf";`
`85`	`85`	`}`
`86`		`- static m2(arg0: number, arg1: number): any {`
	`86`	`+ static m2(arg0: number, arg1: number) {`
`87`	`87`	`throw new Error("Method not implemented.");`
`88`	`88`	`}`
`89`		`- static m1(arg0: number, arg1: number, arg2: number): any {`
	`89`	`+ static m1(arg0: number, arg1: number, arg2: number) {`
`90`	`90`	`throw new Error("Method not implemented.");`
`91`	`91`	`}`
`92`	`92`	}`,