Skip to content

Commit bd22ca6

Browse files
a-tarasyuka-tarasyuk
committed
change diagnostic message
1 parent ec857a9 commit bd22ca6

File tree

12 files changed

+80
-14
lines changed

12 files changed

+80
-14
lines changed

‎src/compiler/checker.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34621,15 +34621,17 @@ namespace ts {
3462134621
}
3462234622

3462334623
function checkNaNEquality(errorNode: Node | undefined, operator: SyntaxKind, left: Expression, right: Expression, leftType: Type, rightType: Type) {
34624-
const isLeftNaN = leftType.flags & TypeFlags.Number && isNaN(skipParentheses(left));
34625-
const isRightNaN = rightType.flags & TypeFlags.Number && isNaN(skipParentheses(right));
34624+
const isLeftNaN = (leftType.flags & TypeFlags.Number) && isNaN(skipParentheses(left));
34625+
const isRightNaN = (rightType.flags & TypeFlags.Number) && isNaN(skipParentheses(right));
3462634626
if (isLeftNaN || isRightNaN) {
3462734627
const err = error(errorNode, Diagnostics.This_condition_will_always_return_0,
3462834628
tokenToString(operator === SyntaxKind.EqualsEqualsEqualsToken || operator === SyntaxKind.EqualsEqualsToken ? SyntaxKind.FalseKeyword : SyntaxKind.TrueKeyword));
3462934629
if (isLeftNaN && isRightNaN) return;
34630+
const operatorString = operator === SyntaxKind.ExclamationEqualsEqualsToken || operator === SyntaxKind.ExclamationEqualsToken ? tokenToString(SyntaxKind.ExclamationToken) : "";
3463034631
const location = isLeftNaN ? right : left;
34632+
const expression = skipParentheses(location);
3463134633
addRelatedInfo(err, createDiagnosticForNode(location, Diagnostics.Did_you_mean_0,
34632-
`${operator === SyntaxKind.ExclamationEqualsEqualsToken || operator === SyntaxKind.ExclamationEqualsToken ? tokenToString(SyntaxKind.ExclamationToken) : ""}Number.isNaN(${getTextOfNode(location)})`));
34634+
`${operatorString}Number.isNaN(${isEntityNameExpression(expression) ? entityNameToString(expression) : "..."})`));
3463334635
}
3463434636
}
3463534637

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
tests/cases/compiler/nanEquality.ts(1,15): error TS2451: Cannot redeclare block-scoped variable 'x'.
12
tests/cases/compiler/nanEquality.ts(3,5): error TS2845: This condition will always return 'false'.
23
tests/cases/compiler/nanEquality.ts(4,5): error TS2845: This condition will always return 'false'.
34
tests/cases/compiler/nanEquality.ts(6,5): error TS2845: This condition will always return 'false'.
@@ -14,10 +15,14 @@ tests/cases/compiler/nanEquality.ts(21,5): error TS2845: This condition will alw
1415
tests/cases/compiler/nanEquality.ts(22,5): error TS2845: This condition will always return 'true'.
1516
tests/cases/compiler/nanEquality.ts(24,5): error TS2845: This condition will always return 'false'.
1617
tests/cases/compiler/nanEquality.ts(25,5): error TS2845: This condition will always return 'true'.
18+
tests/cases/compiler/nanEquality.ts(28,13): error TS2451: Cannot redeclare block-scoped variable 'x'.
19+
tests/cases/compiler/nanEquality.ts(29,5): error TS2845: This condition will always return 'false'.
1720

1821

19-
==== tests/cases/compiler/nanEquality.ts (16 errors) ====
22+
==== tests/cases/compiler/nanEquality.ts (19 errors) ====
2023
declare const x: number;
24+
~
25+
!!! error TS2451: Cannot redeclare block-scoped variable 'x'.
2126

2227
if (x === NaN) {}
2328
~~~~~~~~~
@@ -86,4 +91,13 @@ tests/cases/compiler/nanEquality.ts(25,5): error TS2845: This condition will alw
8691
if (NaN != NaN) {}
8792
~~~~~~~~~~
8893
!!! error TS2845: This condition will always return 'true'.
94+
95+
// ...
96+
declare let x: any;
97+
~
98+
!!! error TS2451: Cannot redeclare block-scoped variable 'x'.
99+
if (NaN === x[0][1]) {}
100+
~~~~~~~~~~~~~~~
101+
!!! error TS2845: This condition will always return 'false'.
102+
!!! related TS1369 tests/cases/compiler/nanEquality.ts:29:13: Did you mean 'Number.isNaN(...)'?
89103

‎tests/baselines/reference/nanEquality.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ if (NaN !== NaN) {}
2424

2525
if (NaN == NaN) {}
2626
if (NaN != NaN) {}
27+
28+
// ...
29+
declare let x: any;
30+
if (NaN === x[0][1]) {}
2731

2832

2933
//// [nanEquality.js]
@@ -43,3 +47,4 @@ if (NaN === NaN) { }
4347
if (NaN !== NaN) { }
4448
if (NaN == NaN) { }
4549
if (NaN != NaN) { }
50+
if (NaN === x[0][1]) { }

‎tests/baselines/reference/nanEquality.symbols‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,11 @@ if (NaN != NaN) {}
6666
>NaN : Symbol(NaN, Decl(lib.es5.d.ts, --, --))
6767
>NaN : Symbol(NaN, Decl(lib.es5.d.ts, --, --))
6868

69+
// ...
70+
declare let x: any;
71+
>x : Symbol(x, Decl(nanEquality.ts, 27, 11))
72+
73+
if (NaN === x[0][1]) {}
74+
>NaN : Symbol(NaN, Decl(lib.es5.d.ts, --, --))
75+
>x : Symbol(x, Decl(nanEquality.ts, 0, 13))
76+

‎tests/baselines/reference/nanEquality.types‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,16 @@ if (NaN != NaN) {}
9090
>NaN : number
9191
>NaN : number
9292

93+
// ...
94+
declare let x: any;
95+
>x : any
96+
97+
if (NaN === x[0][1]) {}
98+
>NaN === x[0][1] : boolean
99+
>NaN : number
100+
>x[0][1] : any
101+
>x[0] : any
102+
>x : number
103+
>0 : 0
104+
>1 : 1
105+

‎tests/cases/compiler/nanEquality.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ if (NaN !== NaN) {}
2323

2424
if (NaN == NaN) {}
2525
if (NaN != NaN) {}
26+
27+
// ...
28+
declare let x: any;
29+
if (NaN === x[0][1]) {}

‎tests/cases/fourslash/fixNaNEquality1.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/// <reference path="fourslash.ts" />
22

3-
////if (x === NaN) {}
3+
////declare const x: number;
4+
////[|if (x === NaN) {}|]
45

56
verify.codeFix({
67
index: 0,
78
description: "Use `Number.isNaN(x)`.",
8-
newFileContent: "if (Number.isNaN(x)) {}",
9+
newRangeContent: "if (Number.isNaN(x)) {}",
910
});

‎tests/cases/fourslash/fixNaNEquality2.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/// <reference path="fourslash.ts" />
22

3-
////if (NaN === x) {}
3+
////declare const x: number;
4+
////[|if (NaN === x) {}|]
45

56
verify.codeFix({
67
index: 0,
78
description: "Use `Number.isNaN(x)`.",
8-
newFileContent: "if (Number.isNaN(x)) {}",
9+
newRangeContent: "if (Number.isNaN(x)) {}",
910
});

‎tests/cases/fourslash/fixNaNEquality3.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/// <reference path="fourslash.ts" />
22

3-
////if (x !== NaN) {}
3+
////declare const x: number;
4+
////[|if (x !== NaN) {}|]
45

56
verify.codeFix({
67
index: 0,
78
description: "Use `!Number.isNaN(x)`.",
8-
newFileContent: "if (!Number.isNaN(x)) {}",
9+
newRangeContent: "if (!Number.isNaN(x)) {}",
910
});

‎tests/cases/fourslash/fixNaNEquality4.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/// <reference path="fourslash.ts" />
22

3-
////if (NaN !== x) {}
3+
////declare const x: number;
4+
////[|if (NaN !== x) {}|]
45

56
verify.codeFix({
67
index: 0,
78
description: "Use `!Number.isNaN(x)`.",
8-
newFileContent: "if (!Number.isNaN(x)) {}",
9+
newRangeContent: "if (!Number.isNaN(x)) {}",
910
});

0 commit comments

Comments
 (0)