Skip to content

Fix duplicate error message for literal union types #63180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erdinccurebal wants to merge 1 commit into
base: main
Choose a base branch
from
+125 −9
Open

Fix duplicate error message for literal union types #63180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22636,7 +22636,16 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (!(target.flags & TypeFlags.Never) && isLiteralType(source) && !typeCouldHaveTopLevelSingletonTypes(target)) {
generalizedSource = getBaseTypeOfLiteralType(source);
Debug.assert(!isTypeAssignableTo(generalizedSource, target), "generalized source shouldn't be assignable");
generalizedSourceType = getTypeNameForErrorDisplay(generalizedSource);
// When a non-enum union of literals generalizes to a single non-union
// base type (e.g. "a" | "b" -> string), skip the generalization for
// display purposes. The per-member elaboration already shows the base
// type, so using it here would produce a duplicate message (see #63050).
if (source.flags & TypeFlags.Union && !(source.flags & TypeFlags.EnumLiteral) && !(generalizedSource.flags & TypeFlags.Union)) {
generalizedSource = source;
}
else {
generalizedSourceType = getTypeNameForErrorDisplay(generalizedSource);
}
}

// If `target` is of indexed access type (And `source` it is not), we use the object type of `target` for better error reporting
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/bigintPropertyName.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ g.ts(32,3): error TS2538: Type 'bigint' cannot be used as an index type.
g.ts(33,4): error TS2538: Type 'bigint' cannot be used as an index type.
g.ts(35,1): error TS1434: Unexpected keyword or identifier.
g.ts(35,2): error TS1353: A bigint literal must be an integer.
q.ts(2,19): error TS2322: Type 'bigint' is not assignable to type 'string | number | symbol'.
q.ts(2,19): error TS2322: Type 'Q' is not assignable to type 'string | number | symbol'.
Type 'bigint' is not assignable to type 'string | number | symbol'.


Expand Down Expand Up @@ -138,6 +138,6 @@ q.ts(2,19): error TS2322: Type 'bigint' is not assignable to type 'string | numb
type Q = 6n | 7n | 8n;
type T = { [t in Q]: string };
~
!!! error TS2322: Type 'bigint' is not assignable to type 'string | number | symbol'.
!!! error TS2322: Type 'Q' is not assignable to type 'string | number | symbol'.
!!! error TS2322: Type 'bigint' is not assignable to type 'string | number | symbol'.

8 changes: 4 additions & 4 deletions .../baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.ts(33,5): error TS2322
Type '{ type: T; localChannelId: string; }' is not assignable to type 'Pick<ChannelOfType<T, TextChannel> | ChannelOfType<T, EmailChannel>, "type">'.
Types of property 'type' are incompatible.
Type 'T' is not assignable to type 'ChannelOfType<T, TextChannel>["type"] & ChannelOfType<T, EmailChannel>["type"]'.
Type 'string' is not assignable to type 'ChannelOfType<T, TextChannel>["type"] & ChannelOfType<T, EmailChannel>["type"]'.
Type '"text" | "email"' is not assignable to type 'ChannelOfType<T, TextChannel>["type"] & ChannelOfType<T, EmailChannel>["type"]'.
Type 'string' is not assignable to type 'ChannelOfType<T, TextChannel>["type"] & ChannelOfType<T, EmailChannel>["type"]'.
Type 'string' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
Type '"text"' is not assignable to type 'T & "text"'.
Type '"text"' is not assignable to type 'T'.
'"text"' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '"text" | "email"'.
Type 'T' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
Type 'string' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
Type '"text" | "email"' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
Type 'string' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
Type '"text"' is not assignable to type 'T & "text"'.
Type '"text"' is not assignable to type 'T'.
Expand Down Expand Up @@ -63,14 +63,14 @@ complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.ts(33,5): error TS2322
!!! error TS2322: Type '{ type: T; localChannelId: string; }' is not assignable to type 'Pick<ChannelOfType<T, TextChannel> | ChannelOfType<T, EmailChannel>, "type">'.
!!! error TS2322: Types of property 'type' are incompatible.
!!! error TS2322: Type 'T' is not assignable to type 'ChannelOfType<T, TextChannel>["type"] & ChannelOfType<T, EmailChannel>["type"]'.
!!! error TS2322: Type 'string' is not assignable to type 'ChannelOfType<T, TextChannel>["type"] & ChannelOfType<T, EmailChannel>["type"]'.
!!! error TS2322: Type '"text" | "email"' is not assignable to type 'ChannelOfType<T, TextChannel>["type"] & ChannelOfType<T, EmailChannel>["type"]'.
!!! error TS2322: Type 'string' is not assignable to type 'ChannelOfType<T, TextChannel>["type"] & ChannelOfType<T, EmailChannel>["type"]'.
!!! error TS2322: Type 'string' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
!!! error TS2322: Type '"text"' is not assignable to type 'T & "text"'.
!!! error TS2322: Type '"text"' is not assignable to type 'T'.
!!! error TS2322: '"text"' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '"text" | "email"'.
!!! error TS2322: Type 'T' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
!!! error TS2322: Type 'string' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
!!! error TS2322: Type '"text" | "email"' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
!!! error TS2322: Type 'string' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
!!! error TS2322: Type '"text"' is not assignable to type 'T & "text"'.
!!! error TS2322: Type '"text"' is not assignable to type 'T'.
Expand Down
23 changes: 23 additions & 0 deletions tests/baselines/reference/noDoubleErrorForLiteralUnionFromAmbient.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
noDoubleErrorForLiteralUnionFromAmbient.ts(7,7): error TS2322: Type '"a" | "b"' is not assignable to type 'number'.
Type 'string' is not assignable to type 'number'.
noDoubleErrorForLiteralUnionFromAmbient.ts(11,7): error TS2322: Type 'string' is not assignable to type 'number'.


==== noDoubleErrorForLiteralUnionFromAmbient.ts (2 errors) ====
// Repro from #63050
// When assigning a union of string literals from an ambient declaration to
// an incompatible type, the error should not show the same message twice.

declare const x: "a" | "b"

const y: number = x
~
!!! error TS2322: Type '"a" | "b"' is not assignable to type 'number'.
!!! error TS2322: Type 'string' is not assignable to type 'number'.

declare const single: "hello"

const z: number = single
~
!!! error TS2322: Type 'string' is not assignable to type 'number'.

23 changes: 23 additions & 0 deletions tests/baselines/reference/noDoubleErrorForLiteralUnionFromAmbient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//// [tests/cases/compiler/noDoubleErrorForLiteralUnionFromAmbient.ts] ////

//// [noDoubleErrorForLiteralUnionFromAmbient.ts]
// Repro from #63050
// When assigning a union of string literals from an ambient declaration to
// an incompatible type, the error should not show the same message twice.

declare const x: "a" | "b"

const y: number = x

declare const single: "hello"

const z: number = single


//// [noDoubleErrorForLiteralUnionFromAmbient.js]
"use strict";
// Repro from #63050
// When assigning a union of string literals from an ambient declaration to
// an incompatible type, the error should not show the same message twice.
const y = x;
const z = single;
21 changes: 21 additions & 0 deletions tests/baselines/reference/noDoubleErrorForLiteralUnionFromAmbient.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//// [tests/cases/compiler/noDoubleErrorForLiteralUnionFromAmbient.ts] ////

=== noDoubleErrorForLiteralUnionFromAmbient.ts ===
// Repro from #63050
// When assigning a union of string literals from an ambient declaration to
// an incompatible type, the error should not show the same message twice.

declare const x: "a" | "b"
>x : Symbol(x, Decl(noDoubleErrorForLiteralUnionFromAmbient.ts, 4, 13))

const y: number = x
>y : Symbol(y, Decl(noDoubleErrorForLiteralUnionFromAmbient.ts, 6, 5))
>x : Symbol(x, Decl(noDoubleErrorForLiteralUnionFromAmbient.ts, 4, 13))

declare const single: "hello"
>single : Symbol(single, Decl(noDoubleErrorForLiteralUnionFromAmbient.ts, 8, 13))

const z: number = single
>z : Symbol(z, Decl(noDoubleErrorForLiteralUnionFromAmbient.ts, 10, 5))
>single : Symbol(single, Decl(noDoubleErrorForLiteralUnionFromAmbient.ts, 8, 13))

27 changes: 27 additions & 0 deletions tests/baselines/reference/noDoubleErrorForLiteralUnionFromAmbient.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//// [tests/cases/compiler/noDoubleErrorForLiteralUnionFromAmbient.ts] ////

=== noDoubleErrorForLiteralUnionFromAmbient.ts ===
// Repro from #63050
// When assigning a union of string literals from an ambient declaration to
// an incompatible type, the error should not show the same message twice.

declare const x: "a" | "b"
>x : "a" | "b"
> : ^^^^^^^^^

const y: number = x
>y : number
> : ^^^^^^
>x : "a" | "b"
> : ^^^^^^^^^

declare const single: "hello"
>single : "hello"
> : ^^^^^^^

const z: number = single
>z : number
> : ^^^^^^
>single : "hello"
> : ^^^^^^^

4 changes: 2 additions & 2 deletions tests/baselines/reference/typeOfOperator1.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
typeOfOperator1.ts(3,5): error TS2322: Type 'string' is not assignable to type 'number'.
typeOfOperator1.ts(3,5): error TS2322: Type '"string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"' is not assignable to type 'number'.
Type 'string' is not assignable to type 'number'.


Expand All @@ -7,5 +7,5 @@ typeOfOperator1.ts(3,5): error TS2322: Type 'string' is not assignable to type '
var y: string = typeof x;
var z: number = typeof x;
~
!!! error TS2322: Type 'string' is not assignable to type 'number'.
!!! error TS2322: Type '"string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"' is not assignable to type 'number'.
!!! error TS2322: Type 'string' is not assignable to type 'number'.
13 changes: 13 additions & 0 deletions tests/cases/compiler/noDoubleErrorForLiteralUnionFromAmbient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// @strict: true

// Repro from #63050
// When assigning a union of string literals from an ambient declaration to
// an incompatible type, the error should not show the same message twice.

declare const x: "a" | "b"

const y: number = x

declare const single: "hello"

const z: number = single