Skip to content

Commit c37254e

Browse files
DanielRosenwasserDanielRosenwasser
authored
Merge pull request microsoft#30062 from jwunderl/quick-fix-any-annotation
Remove any annotation from declare method quickfix
2 parents a41a276 + d87e67d commit c37254e

11 files changed

Lines changed: 59 additions & 26 deletions

‎src/services/codefixes/helpers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ namespace ts.codefix {
156156
isIdentifier(arg) ? arg.text :
157157
isPropertyAccessExpression(arg) ? arg.name.text : undefined);
158158
const contextualType = checker.getContextualType(call);
159-
const returnType = inJs ? undefined : contextualType && checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker) || createKeywordTypeNode(SyntaxKind.AnyKeyword);
159+
const returnType = (inJs || !contextualType) ? undefined : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
160160
return createMethod(
161161
/*decorators*/ undefined,
162162
/*modifiers*/ makeStatic ? [createToken(SyntaxKind.StaticKeyword)] : undefined,

‎tests/cases/fourslash/codeFixAddMissingMember9.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ verify.codeFixAll({
1818
const x = 0;
1919
this.y(x, "a", this.z);
2020
}
21-
y(x: number, arg1: string, z: boolean): any {
21+
y(x: number, arg1: string, z: boolean) {
2222
throw new Error("Method not implemented.");
2323
}
2424
}`,

‎tests/cases/fourslash/codeFixAddMissingMember_all.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ verify.codeFixAll({
3636
this.y();
3737
this.x = "";
3838
}
39-
y(): any {
39+
y() {
4040
throw new Error("Method not implemented.");
4141
}
4242
}

‎tests/cases/fourslash/codeFixAddMissingMember_generator_function.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ verify.codeFixAll({
1414
*method() {
1515
yield* this.y();
1616
}
17-
*y(): any {
17+
*y() {
1818
throw new Error("Method not implemented.");
1919
}
2020
}`,

‎tests/cases/fourslash/codeFixAddMissingMember_non_generator_function.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ verify.codeFixAll({
1414
method() {
1515
yield* this.y();
1616
}
17-
y(): any {
17+
y() {
1818
throw new Error("Method not implemented.");
1919
}
2020
}`,

‎tests/cases/fourslash/codeFixUndeclaredAcrossFiles1.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ verify.getAndApplyCodeFix(/*errorCode*/undefined, 0);
2323
verify.getAndApplyCodeFix(/*errorCode*/undefined, 0);
2424

2525
verify.rangeIs(`
26-
m2(c: C): any {
26+
m2(c: C) {
2727
throw new Error("Method not implemented.");
2828
}
2929
y: {};
30-
m1(): any {
30+
m1() {
3131
throw new Error("Method not implemented.");
3232
}
3333
static x: any;
34-
static m0(arg0: number, arg1: string, arg2: undefined[]): any {
34+
static m0(arg0: number, arg1: string, arg2: undefined[]) {
3535
throw new Error("Method not implemented.");
3636
}
3737
`);

‎tests/cases/fourslash/codeFixUndeclaredAcrossFiles3.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
verify.getAndApplyCodeFix(/*errorCode*/ undefined, 0);
2121

2222
verify.rangeIs(`
23-
m0(arg0: import("./f2").D): any {
23+
m0(arg0: import("./f2").D) {
2424
throw new Error("Method not implemented.");
2525
}
2626
`);

‎tests/cases/fourslash/codeFixUndeclaredInStaticMethod.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ verify.codeFix({
2020
this.prop1 = 10;
2121
A.prop2 = "asdf";
2222
}
23-
static m1(arg0: number, arg1: number, arg2: number): any {
23+
static m1(arg0: number, arg1: number, arg2: number) {
2424
throw new Error("Method not implemented.");
2525
}
2626
}`,
@@ -38,10 +38,10 @@ verify.codeFix({
3838
this.prop1 = 10;
3939
A.prop2 = "asdf";
4040
}
41-
static m2(arg0: number, arg1: number): any {
41+
static m2(arg0: number, arg1: number) {
4242
throw new Error("Method not implemented.");
4343
}
44-
static m1(arg0: number, arg1: number, arg2: number): any {
44+
static m1(arg0: number, arg1: number, arg2: number) {
4545
throw new Error("Method not implemented.");
4646
}
4747
}`,
@@ -60,10 +60,10 @@ verify.codeFix({
6060
this.prop1 = 10;
6161
A.prop2 = "asdf";
6262
}
63-
static m2(arg0: number, arg1: number): any {
63+
static m2(arg0: number, arg1: number) {
6464
throw new Error("Method not implemented.");
6565
}
66-
static m1(arg0: number, arg1: number, arg2: number): any {
66+
static m1(arg0: number, arg1: number, arg2: number) {
6767
throw new Error("Method not implemented.");
6868
}
6969
}`,
@@ -83,10 +83,10 @@ verify.codeFix({
8383
this.prop1 = 10;
8484
A.prop2 = "asdf";
8585
}
86-
static m2(arg0: number, arg1: number): any {
86+
static m2(arg0: number, arg1: number) {
8787
throw new Error("Method not implemented.");
8888
}
89-
static m1(arg0: number, arg1: number, arg2: number): any {
89+
static m1(arg0: number, arg1: number, arg2: number) {
9090
throw new Error("Method not implemented.");
9191
}
9292
}`,

‎tests/cases/fourslash/codeFixUndeclaredMethod.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ verify.codeFix({
1515
index: 0,
1616
newFileContent:
1717
`class A {
18-
foo1(arg0: number, arg1: number, arg2: number): any {
18+
foo1(arg0: number, arg1: number, arg2: number) {
1919
throw new Error("Method not implemented.");
2020
}
2121
constructor() {
@@ -34,10 +34,10 @@ verify.codeFix({
3434
index: 0,
3535
newFileContent:
3636
`class A {
37-
foo2<T, U, V, W, X, Y, Z>(): any {
37+
foo2<T, U, V, W, X, Y, Z>() {
3838
throw new Error("Method not implemented.");
3939
}
40-
foo1(arg0: number, arg1: number, arg2: number): any {
40+
foo1(arg0: number, arg1: number, arg2: number) {
4141
throw new Error("Method not implemented.");
4242
}
4343
constructor() {
@@ -56,13 +56,13 @@ verify.codeFix({
5656
index: 0,
5757
newFileContent:
5858
`class A {
59-
foo3<T0, T1, T2, T3, T4, T5, T6, T7>(): any {
59+
foo3<T0, T1, T2, T3, T4, T5, T6, T7>() {
6060
throw new Error("Method not implemented.");
6161
}
62-
foo2<T, U, V, W, X, Y, Z>(): any {
62+
foo2<T, U, V, W, X, Y, Z>() {
6363
throw new Error("Method not implemented.");
6464
}
65-
foo1(arg0: number, arg1: number, arg2: number): any {
65+
foo1(arg0: number, arg1: number, arg2: number) {
6666
throw new Error("Method not implemented.");
6767
}
6868
constructor() {

‎tests/cases/fourslash/codeFixUndeclaredMethodFunctionArgs.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ verify.codeFix({
1111
description: "Declare method 'foo1'",
1212
index: 0,
1313
newRangeContent: `
14-
foo1(arg0: () => number, arg1: () => string, arg2: () => boolean): any {
14+
foo1(arg0: () => number, arg1: () => string, arg2: () => boolean) {
1515
throw new Error("Method not implemented.");
1616
}
1717
`,
@@ -22,10 +22,10 @@ verify.codeFix({
2222
description: "Declare method 'foo2'",
2323
index: 0,
2424
newRangeContent: `
25-
foo2(arg0: (a: number) => number, arg1: (b: string) => string, arg2: (c: boolean) => boolean): any {
25+
foo2(arg0: (a: number) => number, arg1: (b: string) => string, arg2: (c: boolean) => boolean) {
2626
throw new Error("Method not implemented.");
2727
}
28-
foo1(arg0: () => number, arg1: () => string, arg2: () => boolean): any {
28+
foo1(arg0: () => number, arg1: () => string, arg2: () => boolean) {
2929
throw new Error("Method not implemented.");
3030
}
3131
`,

0 commit comments

Comments
 (0)