Skip to content

Commit 590755b

Browse files
YuichiNukiyamaYuichiNukiyama
committed
change error message
1 parent dc7b18e commit 590755b

14 files changed

+30
-30
lines changed

‎src/compiler/checker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6275,7 +6275,7 @@ namespace ts {
62756275
(globalNumberType === source && numberType === target) ||
62766276
(globalBooleanType === source && booleanType === target) ||
62776277
(getGlobalESSymbolType() === source && esSymbolType === target)) {
6278-
reportError(Diagnostics._0_is_a_primitive_type_while_1_is_a_boxed_object_Prefer_using_0_when_possible, targetType, sourceType);
6278+
reportError(Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
62796279
}
62806280
}
62816281

‎src/compiler/diagnosticMessages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1955,7 +1955,7 @@
19551955
"category": "Error",
19561956
"code": 2691
19571957
},
1958-
"'{0}' is a primitive type while '{1}' is a boxed object. Prefer using '{0}' when possible.": {
1958+
"'{0}' is a primitive, but '{1}' is a wrapper object. Prefer using '{0}' when possible.": {
19591959
"category": "Error",
19601960
"code": 2692
19611961
},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSubtyping.ts(9,7): error TS2415: Class 'Derived<U>' incorrectly extends base class 'Base<string>'.
22
Types of property 'x' are incompatible.
33
Type 'String' is not assignable to type 'string'.
4-
'string' is a primitive type while 'String' is a boxed object. Prefer using 'string' when possible.
4+
'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
55

66

77
==== tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSubtyping.ts (1 errors) ====
@@ -18,7 +18,7 @@ tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSubtypi
1818
!!! error TS2415: Class 'Derived<U>' incorrectly extends base class 'Base<string>'.
1919
!!! error TS2415: Types of property 'x' are incompatible.
2020
!!! error TS2415: Type 'String' is not assignable to type 'string'.
21-
!!! error TS2415: 'string' is a primitive type while 'String' is a boxed object. Prefer using 'string' when possible.
21+
!!! error TS2415: 'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
2222
x: String;
2323
}
2424

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSuperty
22
Types of property 'x' are incompatible.
33
Type 'U' is not assignable to type 'string'.
44
Type 'String' is not assignable to type 'string'.
5-
'string' is a primitive type while 'String' is a boxed object. Prefer using 'string' when possible.
5+
'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
66

77

88
==== tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSupertype.ts (1 errors) ====
@@ -20,6 +20,6 @@ tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSuperty
2020
!!! error TS2415: Types of property 'x' are incompatible.
2121
!!! error TS2415: Type 'U' is not assignable to type 'string'.
2222
!!! error TS2415: Type 'String' is not assignable to type 'string'.
23-
!!! error TS2415: 'string' is a primitive type while 'String' is a boxed object. Prefer using 'string' when possible.
23+
!!! error TS2415: 'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
2424
x: U;
2525
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
1818
Types of parameters 'items' and 'items' are incompatible.
1919
Type 'Number' is not assignable to type 'string | number'.
2020
Type 'Number' is not assignable to type 'number'.
21-
'number' is a primitive type while 'Number' is a boxed object. Prefer using 'number' when possible.
21+
'number' is a primitive, but 'Number' is a wrapper object. Prefer using 'number' when possible.
2222

2323

2424
==== tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts (6 errors) ====
@@ -82,5 +82,5 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
8282
!!! error TS2322: Types of parameters 'items' and 'items' are incompatible.
8383
!!! error TS2322: Type 'Number' is not assignable to type 'string | number'.
8484
!!! error TS2322: Type 'Number' is not assignable to type 'number'.
85-
!!! error TS2322: 'number' is a primitive type while 'Number' is a boxed object. Prefer using 'number' when possible.
85+
!!! error TS2322: 'number' is a primitive, but 'Number' is a wrapper object. Prefer using 'number' when possible.
8686

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface.ts(3,1): error TS2322: Type 'Boolean' is not assignable to type 'boolean'.
2-
'boolean' is a primitive type while 'Boolean' is a boxed object. Prefer using 'boolean' when possible.
2+
'boolean' is a primitive, but 'Boolean' is a wrapper object. Prefer using 'boolean' when possible.
33

44

55
==== tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface.ts (1 errors) ====
@@ -8,5 +8,5 @@ tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface.ts(3
88
x = a;
99
~
1010
!!! error TS2322: Type 'Boolean' is not assignable to type 'boolean'.
11-
!!! error TS2322: 'boolean' is a primitive type while 'Boolean' is a boxed object. Prefer using 'boolean' when possible.
11+
!!! error TS2322: 'boolean' is a primitive, but 'Boolean' is a wrapper object. Prefer using 'boolean' when possible.
1212
a = x;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface2.ts(
33
Type '() => Object' is not assignable to type '() => boolean'.
44
Type 'Object' is not assignable to type 'boolean'.
55
tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface2.ts(19,1): error TS2322: Type 'Boolean' is not assignable to type 'boolean'.
6-
'boolean' is a primitive type while 'Boolean' is a boxed object. Prefer using 'boolean' when possible.
6+
'boolean' is a primitive, but 'Boolean' is a wrapper object. Prefer using 'boolean' when possible.
77
tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface2.ts(20,1): error TS2322: Type 'NotBoolean' is not assignable to type 'boolean'.
88

99

@@ -34,7 +34,7 @@ tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface2.ts(
3434
x = a; // expected error
3535
~
3636
!!! error TS2322: Type 'Boolean' is not assignable to type 'boolean'.
37-
!!! error TS2322: 'boolean' is a primitive type while 'Boolean' is a boxed object. Prefer using 'boolean' when possible.
37+
!!! error TS2322: 'boolean' is a primitive, but 'Boolean' is a wrapper object. Prefer using 'boolean' when possible.
3838
x = b; // expected error
3939
~
4040
!!! error TS2322: Type 'NotBoolean' is not assignable to type 'boolean'.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/conformance/types/primitives/number/assignFromNumberInterface.ts(3,1): error TS2322: Type 'Number' is not assignable to type 'number'.
2-
'number' is a primitive type while 'Number' is a boxed object. Prefer using 'number' when possible.
2+
'number' is a primitive, but 'Number' is a wrapper object. Prefer using 'number' when possible.
33

44

55
==== tests/cases/conformance/types/primitives/number/assignFromNumberInterface.ts (1 errors) ====
@@ -8,5 +8,5 @@ tests/cases/conformance/types/primitives/number/assignFromNumberInterface.ts(3,1
88
x = a;
99
~
1010
!!! error TS2322: Type 'Number' is not assignable to type 'number'.
11-
!!! error TS2322: 'number' is a primitive type while 'Number' is a boxed object. Prefer using 'number' when possible.
11+
!!! error TS2322: 'number' is a primitive, but 'Number' is a wrapper object. Prefer using 'number' when possible.
1212
a = x;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts(24,1): error TS2322: Type 'Number' is not assignable to type 'number'.
2-
'number' is a primitive type while 'Number' is a boxed object. Prefer using 'number' when possible.
2+
'number' is a primitive, but 'Number' is a wrapper object. Prefer using 'number' when possible.
33
tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts(25,1): error TS2322: Type 'NotNumber' is not assignable to type 'number'.
44

55

@@ -30,7 +30,7 @@ tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts(25
3030
x = a; // expected error
3131
~
3232
!!! error TS2322: Type 'Number' is not assignable to type 'number'.
33-
!!! error TS2322: 'number' is a primitive type while 'Number' is a boxed object. Prefer using 'number' when possible.
33+
!!! error TS2322: 'number' is a primitive, but 'Number' is a wrapper object. Prefer using 'number' when possible.
3434
x = b; // expected error
3535
~
3636
!!! error TS2322: Type 'NotNumber' is not assignable to type 'number'.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/conformance/types/primitives/string/assignFromStringInterface.ts(3,1): error TS2322: Type 'String' is not assignable to type 'string'.
2-
'string' is a primitive type while 'String' is a boxed object. Prefer using 'string' when possible.
2+
'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
33

44

55
==== tests/cases/conformance/types/primitives/string/assignFromStringInterface.ts (1 errors) ====
@@ -8,5 +8,5 @@ tests/cases/conformance/types/primitives/string/assignFromStringInterface.ts(3,1
88
x = a;
99
~
1010
!!! error TS2322: Type 'String' is not assignable to type 'string'.
11-
!!! error TS2322: 'string' is a primitive type while 'String' is a boxed object. Prefer using 'string' when possible.
11+
!!! error TS2322: 'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
1212
a = x;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts(47,1): error TS2322: Type 'String' is not assignable to type 'string'.
2-
'string' is a primitive type while 'String' is a boxed object. Prefer using 'string' when possible.
2+
'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
33
tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts(48,1): error TS2322: Type 'NotString' is not assignable to type 'string'.
44

55

@@ -53,7 +53,7 @@ tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts(48
5353
x = a; // expected error
5454
~
5555
!!! error TS2322: Type 'String' is not assignable to type 'string'.
56-
!!! error TS2322: 'string' is a primitive type while 'String' is a boxed object. Prefer using 'string' when possible.
56+
!!! error TS2322: 'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
5757
x = b; // expected error
5858
~
5959
!!! error TS2322: Type 'NotString' is not assignable to type 'string'.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
tests/cases/compiler/nativeToBoxedTypes.ts(3,1): error TS2322: Type 'Number' is not assignable to type 'number'.
2-
'number' is a primitive type while 'Number' is a boxed object. Prefer using 'number' when possible.
2+
'number' is a primitive, but 'Number' is a wrapper object. Prefer using 'number' when possible.
33
tests/cases/compiler/nativeToBoxedTypes.ts(7,1): error TS2322: Type 'String' is not assignable to type 'string'.
4-
'string' is a primitive type while 'String' is a boxed object. Prefer using 'string' when possible.
4+
'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
55
tests/cases/compiler/nativeToBoxedTypes.ts(11,1): error TS2322: Type 'Boolean' is not assignable to type 'boolean'.
6-
'boolean' is a primitive type while 'Boolean' is a boxed object. Prefer using 'boolean' when possible.
6+
'boolean' is a primitive, but 'Boolean' is a wrapper object. Prefer using 'boolean' when possible.
77
tests/cases/compiler/nativeToBoxedTypes.ts(14,10): error TS2304: Cannot find name 'Symbol'.
88

99

@@ -13,21 +13,21 @@ tests/cases/compiler/nativeToBoxedTypes.ts(14,10): error TS2304: Cannot find nam
1313
n = N;
1414
~
1515
!!! error TS2322: Type 'Number' is not assignable to type 'number'.
16-
!!! error TS2322: 'number' is a primitive type while 'Number' is a boxed object. Prefer using 'number' when possible.
16+
!!! error TS2322: 'number' is a primitive, but 'Number' is a wrapper object. Prefer using 'number' when possible.
1717

1818
var S = new String();
1919
var s = "foge";
2020
s = S;
2121
~
2222
!!! error TS2322: Type 'String' is not assignable to type 'string'.
23-
!!! error TS2322: 'string' is a primitive type while 'String' is a boxed object. Prefer using 'string' when possible.
23+
!!! error TS2322: 'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
2424

2525
var B = new Boolean();
2626
var b = true;
2727
b = B;
2828
~
2929
!!! error TS2322: Type 'Boolean' is not assignable to type 'boolean'.
30-
!!! error TS2322: 'boolean' is a primitive type while 'Boolean' is a boxed object. Prefer using 'boolean' when possible.
30+
!!! error TS2322: 'boolean' is a primitive, but 'Boolean' is a wrapper object. Prefer using 'boolean' when possible.
3131

3232
var sym: symbol;
3333
var Sym: Symbol;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
tests/cases/compiler/primitiveMembers.ts(5,3): error TS2339: Property 'toBAZ' does not exist on type 'number'.
22
tests/cases/compiler/primitiveMembers.ts(11,1): error TS2322: Type 'Number' is not assignable to type 'number'.
3-
'number' is a primitive type while 'Number' is a boxed object. Prefer using 'number' when possible.
3+
'number' is a primitive, but 'Number' is a wrapper object. Prefer using 'number' when possible.
44

55

66
==== tests/cases/compiler/primitiveMembers.ts (2 errors) ====
@@ -19,7 +19,7 @@ tests/cases/compiler/primitiveMembers.ts(11,1): error TS2322: Type 'Number' is n
1919
n = N; // should not work, as 'number' has a different brand
2020
~
2121
!!! error TS2322: Type 'Number' is not assignable to type 'number'.
22-
!!! error TS2322: 'number' is a primitive type while 'Number' is a boxed object. Prefer using 'number' when possible.
22+
!!! error TS2322: 'number' is a primitive, but 'Number' is a wrapper object. Prefer using 'number' when possible.
2323
N = n; // should work
2424

2525
var o: Object = {}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/conformance/es6/Symbols/symbolType15.ts(5,1): error TS2322: Type 'Symbol' is not assignable to type 'symbol'.
2-
'symbol' is a primitive type while 'Symbol' is a boxed object. Prefer using 'symbol' when possible.
2+
'symbol' is a primitive, but 'Symbol' is a wrapper object. Prefer using 'symbol' when possible.
33

44

55
==== tests/cases/conformance/es6/Symbols/symbolType15.ts (1 errors) ====
@@ -10,4 +10,4 @@ tests/cases/conformance/es6/Symbols/symbolType15.ts(5,1): error TS2322: Type 'Sy
1010
sym = symObj;
1111
~~~
1212
!!! error TS2322: Type 'Symbol' is not assignable to type 'symbol'.
13-
!!! error TS2322: 'symbol' is a primitive type while 'Symbol' is a boxed object. Prefer using 'symbol' when possible.
13+
!!! error TS2322: 'symbol' is a primitive, but 'Symbol' is a wrapper object. Prefer using 'symbol' when possible.

0 commit comments

Comments
 (0)