Skip to content

Commit 9f9f3ed

Browse files
a-tarasyuka-tarasyuk
committed
fix(46615): remove useless assertion. change error suggestion for rest params
1 parent bf6d164 commit 9f9f3ed

10 files changed

+75
-46
lines changed

‎src/compiler/checker.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21203,9 +21203,10 @@ namespace ts {
2120321203
(isCallSignatureDeclaration(param.parent) || isMethodSignature(param.parent) || isFunctionTypeNode(param.parent)) &&
2120421204
param.parent.parameters.indexOf(param) > -1 &&
2120521205
(resolveName(param, param.name.escapedText, SymbolFlags.Type, undefined, param.name.escapedText, /*isUse*/ true) ||
21206-
param.name.originalKeywordKind && isTypeNodeKind(param.name.originalKeywordKind))) {
21206+
param.name.originalKeywordKind && isTypeNodeKind(param.name.originalKeywordKind))) {
2120721207
const newName = "arg" + param.parent.parameters.indexOf(param);
21208-
errorOrSuggestion(noImplicitAny, declaration, Diagnostics.Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1, newName, declarationNameToString(param.name));
21208+
const typeName = declarationNameToString(param.name) + (param.dotDotDotToken ? "[]" : "");
21209+
errorOrSuggestion(noImplicitAny, declaration, Diagnostics.Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1, newName, typeName);
2120921210
return;
2121021211
}
2121121212
diagnostic = (declaration as ParameterDeclaration).dotDotDotToken ?

‎src/services/codefixes/addNameToNamelessParameter.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@ namespace ts.codefix {
1414

1515
function makeChange(changeTracker: textChanges.ChangeTracker, sourceFile: SourceFile, pos: number) {
1616
const token = getTokenAtPosition(sourceFile, pos);
17-
if (!isIdentifier(token)) {
18-
return Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + Debug.formatSyntaxKind(token.kind));
19-
}
2017
const param = token.parent;
2118
if (!isParameter(param)) {
2219
return Debug.fail("Tried to add a parameter name to a non-parameter: " + Debug.formatSyntaxKind(token.kind));
2320
}
21+
2422
const i = param.parent.parameters.indexOf(param);
2523
Debug.assert(!param.type, "Tried to add a parameter name to a parameter that already had one.");
2624
Debug.assert(i > -1, "Parameter not found in parent parameter list.");
25+
26+
const typeNode = factory.createTypeReferenceNode(param.name as Identifier, /*typeArguments*/ undefined);
2727
const replacement = factory.createParameterDeclaration(
2828
/*decorators*/ undefined,
2929
param.modifiers,
3030
param.dotDotDotToken,
3131
"arg" + i,
3232
param.questionToken,
33-
factory.createTypeReferenceNode(token, /*typeArguments*/ undefined),
33+
param.dotDotDotToken ? factory.createArrayTypeNode(typeNode) : typeNode,
3434
param.initializer);
35-
changeTracker.replaceNode(sourceFile, token, replacement);
35+
changeTracker.replaceNode(sourceFile, param, replacement);
3636
}
3737
}

‎tests/baselines/reference/noImplicitAnyNamelessParameter.errors.txt

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
1-
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(2,17): error TS7051: Parameter has a name but no type. Did you mean 'arg0: string'?
2-
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(2,25): error TS7051: Parameter has a name but no type. Did you mean 'arg1: C'?
3-
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(3,19): error TS7051: Parameter has a name but no type. Did you mean 'arg0: C'?
4-
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(3,22): error TS7051: Parameter has a name but no type. Did you mean 'arg1: number'?
5-
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(4,20): error TS7051: Parameter has a name but no type. Did you mean 'arg0: boolean'?
6-
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(4,29): error TS7051: Parameter has a name but no type. Did you mean 'arg1: C'?
7-
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(4,32): error TS7051: Parameter has a name but no type. Did you mean 'arg2: object'?
8-
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(4,40): error TS7051: Parameter has a name but no type. Did you mean 'arg3: undefined'?
1+
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(2,20): error TS7051: Parameter has a name but no type. Did you mean 'arg0: string[]'?
2+
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(3,17): error TS7051: Parameter has a name but no type. Did you mean 'arg0: string'?
3+
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(3,25): error TS7051: Parameter has a name but no type. Did you mean 'arg1: C'?
4+
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(4,19): error TS7051: Parameter has a name but no type. Did you mean 'arg0: C'?
5+
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(4,22): error TS7051: Parameter has a name but no type. Did you mean 'arg1: number'?
6+
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(5,20): error TS7051: Parameter has a name but no type. Did you mean 'arg0: boolean'?
7+
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(5,29): error TS7051: Parameter has a name but no type. Did you mean 'arg1: C'?
8+
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(5,32): error TS7051: Parameter has a name but no type. Did you mean 'arg2: object'?
9+
tests/cases/compiler/noImplicitAnyNamelessParameter.ts(5,40): error TS7051: Parameter has a name but no type. Did you mean 'arg3: undefined'?
910

1011

11-
==== tests/cases/compiler/noImplicitAnyNamelessParameter.ts (8 errors) ====
12+
==== tests/cases/compiler/noImplicitAnyNamelessParameter.ts (9 errors) ====
1213
class C { }
13-
declare var x: (string, C) => void;
14+
declare var a: { m(...string): void }
15+
~~~~~~~~~
16+
!!! error TS7051: Parameter has a name but no type. Did you mean 'arg0: string[]'?
17+
declare var b: (string, C) => void;
1418
~~~~~~
1519
!!! error TS7051: Parameter has a name but no type. Did you mean 'arg0: string'?
1620
~
1721
!!! error TS7051: Parameter has a name but no type. Did you mean 'arg1: C'?
18-
declare var y: { (C, number): void };
22+
declare var c: { (C, number): void };
1923
~
2024
!!! error TS7051: Parameter has a name but no type. Did you mean 'arg0: C'?
2125
~~~~~~
2226
!!! error TS7051: Parameter has a name but no type. Did you mean 'arg1: number'?
23-
declare var z: { m(boolean, C, object, undefined): void }
27+
declare var d: { m(boolean, C, object, undefined): void }
2428
~~~~~~~
2529
!!! error TS7051: Parameter has a name but no type. Did you mean 'arg0: boolean'?
2630
~

‎tests/baselines/reference/noImplicitAnyNamelessParameter.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
//// [noImplicitAnyNamelessParameter.ts]
22
class C { }
3-
declare var x: (string, C) => void;
4-
declare var y: { (C, number): void };
5-
declare var z: { m(boolean, C, object, undefined): void }
3+
declare var a: { m(...string): void }
4+
declare var b: (string, C) => void;
5+
declare var c: { (C, number): void };
6+
declare var d: { m(boolean, C, object, undefined): void }
67
// note: null and void do not parse correctly without a preceding parameter name
78

89

‎tests/baselines/reference/noImplicitAnyNamelessParameter.symbols

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,28 @@
22
class C { }
33
>C : Symbol(C, Decl(noImplicitAnyNamelessParameter.ts, 0, 0))
44

5-
declare var x: (string, C) => void;
6-
>x : Symbol(x, Decl(noImplicitAnyNamelessParameter.ts, 1, 11))
7-
>string : Symbol(string, Decl(noImplicitAnyNamelessParameter.ts, 1, 16))
8-
>C : Symbol(C, Decl(noImplicitAnyNamelessParameter.ts, 1, 23))
5+
declare var a: { m(...string): void }
6+
>a : Symbol(a, Decl(noImplicitAnyNamelessParameter.ts, 1, 11))
7+
>m : Symbol(m, Decl(noImplicitAnyNamelessParameter.ts, 1, 16))
8+
>string : Symbol(string, Decl(noImplicitAnyNamelessParameter.ts, 1, 19))
99

10-
declare var y: { (C, number): void };
11-
>y : Symbol(y, Decl(noImplicitAnyNamelessParameter.ts, 2, 11))
12-
>C : Symbol(C, Decl(noImplicitAnyNamelessParameter.ts, 2, 18))
13-
>number : Symbol(number, Decl(noImplicitAnyNamelessParameter.ts, 2, 20))
10+
declare var b: (string, C) => void;
11+
>b : Symbol(b, Decl(noImplicitAnyNamelessParameter.ts, 2, 11))
12+
>string : Symbol(string, Decl(noImplicitAnyNamelessParameter.ts, 2, 16))
13+
>C : Symbol(C, Decl(noImplicitAnyNamelessParameter.ts, 2, 23))
1414

15-
declare var z: { m(boolean, C, object, undefined): void }
16-
>z : Symbol(z, Decl(noImplicitAnyNamelessParameter.ts, 3, 11))
17-
>m : Symbol(m, Decl(noImplicitAnyNamelessParameter.ts, 3, 16))
18-
>boolean : Symbol(boolean, Decl(noImplicitAnyNamelessParameter.ts, 3, 19))
19-
>C : Symbol(C, Decl(noImplicitAnyNamelessParameter.ts, 3, 27))
20-
>object : Symbol(object, Decl(noImplicitAnyNamelessParameter.ts, 3, 30))
21-
>undefined : Symbol(undefined, Decl(noImplicitAnyNamelessParameter.ts, 3, 38))
15+
declare var c: { (C, number): void };
16+
>c : Symbol(c, Decl(noImplicitAnyNamelessParameter.ts, 3, 11))
17+
>C : Symbol(C, Decl(noImplicitAnyNamelessParameter.ts, 3, 18))
18+
>number : Symbol(number, Decl(noImplicitAnyNamelessParameter.ts, 3, 20))
19+
20+
declare var d: { m(boolean, C, object, undefined): void }
21+
>d : Symbol(d, Decl(noImplicitAnyNamelessParameter.ts, 4, 11))
22+
>m : Symbol(m, Decl(noImplicitAnyNamelessParameter.ts, 4, 16))
23+
>boolean : Symbol(boolean, Decl(noImplicitAnyNamelessParameter.ts, 4, 19))
24+
>C : Symbol(C, Decl(noImplicitAnyNamelessParameter.ts, 4, 27))
25+
>object : Symbol(object, Decl(noImplicitAnyNamelessParameter.ts, 4, 30))
26+
>undefined : Symbol(undefined, Decl(noImplicitAnyNamelessParameter.ts, 4, 38))
2227

2328
// note: null and void do not parse correctly without a preceding parameter name
2429

‎tests/baselines/reference/noImplicitAnyNamelessParameter.types

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,23 @@
22
class C { }
33
>C : C
44

5-
declare var x: (string, C) => void;
6-
>x : (string: any, C: any) => void
5+
declare var a: { m(...string): void }
6+
>a : { m(...string: any[]): void; }
7+
>m : (...string: any[]) => void
8+
>string : any[]
9+
10+
declare var b: (string, C) => void;
11+
>b : (string: any, C: any) => void
712
>string : any
813
>C : any
914

10-
declare var y: { (C, number): void };
11-
>y : (C: any, number: any) => void
15+
declare var c: { (C, number): void };
16+
>c : (C: any, number: any) => void
1217
>C : any
1318
>number : any
1419

15-
declare var z: { m(boolean, C, object, undefined): void }
16-
>z : { m(boolean: any, C: any, object: any, undefined: any): void; }
20+
declare var d: { m(boolean, C, object, undefined): void }
21+
>d : { m(boolean: any, C: any, object: any, undefined: any): void; }
1722
>m : (boolean: any, C: any, object: any, undefined: any) => void
1823
>boolean : any
1924
>C : any

‎tests/cases/compiler/noImplicitAnyNamelessParameter.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// @noImplicitAny: true
22
class C { }
3-
declare var x: (string, C) => void;
4-
declare var y: { (C, number): void };
5-
declare var z: { m(boolean, C, object, undefined): void }
3+
declare var a: { m(...string): void }
4+
declare var b: (string, C) => void;
5+
declare var c: { (C, number): void };
6+
declare var d: { m(boolean, C, object, undefined): void }
67
// note: null and void do not parse correctly without a preceding parameter name

‎tests/cases/fourslash/codeFixAddParameterNames.ts renamed to ‎tests/cases/fourslash/codeFixAddParameterNames1.ts

File renamed without changes.

‎tests/cases/fourslash/codeFixAddParameterNames2.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
// @noImplicitAny: true
4+
////type Rest = ([|...number|]) => void;
5+
6+
verify.rangeAfterCodeFix("...arg0: number[]");

‎tests/cases/fourslash/codeFixAddParameterNames3.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
// @noImplicitAny: true
4+
////type Rest = ([|public string|]) => void;
5+
6+
verify.rangeAfterCodeFix("public arg0: string");

0 commit comments

Comments
 (0)