Skip to content
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

Properly propagate silentNeverType in unions #60866

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+99 −2
Open

Properly propagate silentNeverType in unions #60866

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
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17723,7 +17723,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (typeSet.length === 0) {
return includes & TypeFlags.Null ? includes & TypeFlags.IncludesNonWideningType ? nullType : nullWideningType :
includes & TypeFlags.Undefined ? includes & TypeFlags.IncludesNonWideningType ? undefinedType : undefinedWideningType :
neverType;
contains(types, silentNeverType) ? silentNeverType : neverType;
}
}
if (!origin && includes & TypeFlags.Union) {
Expand Down
20 changes: 19 additions & 1 deletion tests/baselines/reference/silentNeverPropagation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ const breaks = convert(
breaks.state.a
breaks.state.z
breaks.foo()


declare function inner<T1, t2>(t1: T1, t2: t2): T1 | t2;
declare function outer<T1, T2>(m: T1 | T2): [T1, T2];

const outerResult = outer(
inner({ a: 12 }, { foo() { return true } })
);

//// [silentNeverPropagation.js]
"use strict";
Expand All @@ -35,6 +41,7 @@ var breaks = convert(createModule({ a: 12 }, { foo: function () { return true; }
breaks.state.a;
breaks.state.z;
breaks.foo();
var outerResult = outer(inner({ a: 12 }, { foo: function () { return true; } }));


//// [silentNeverPropagation.d.ts]
Expand All @@ -56,3 +63,14 @@ declare const breaks: ModuleWithState<{
}> & {
foo(): true;
};
declare function inner<T1, t2>(t1: T1, t2: t2): T1 | t2;
declare function outer<T1, T2>(m: T1 | T2): [T1, T2];
declare const outerResult: [{
a: number;
} | {
foo(): true;
}, {
a: number;
} | {
foo(): true;
}];
31 changes: 31 additions & 0 deletions tests/baselines/reference/silentNeverPropagation.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,34 @@ breaks.foo()
>breaks : Symbol(breaks, Decl(silentNeverPropagation.ts, 18, 5))
>foo : Symbol(foo, Decl(silentNeverPropagation.ts, 19, 29))

declare function inner<T1, t2>(t1: T1, t2: t2): T1 | t2;
>inner : Symbol(inner, Decl(silentNeverPropagation.ts, 24, 12))
>T1 : Symbol(T1, Decl(silentNeverPropagation.ts, 26, 23))
>t2 : Symbol(t2, Decl(silentNeverPropagation.ts, 26, 26), Decl(silentNeverPropagation.ts, 26, 38))
>t1 : Symbol(t1, Decl(silentNeverPropagation.ts, 26, 31))
>T1 : Symbol(T1, Decl(silentNeverPropagation.ts, 26, 23))
>t2 : Symbol(t2, Decl(silentNeverPropagation.ts, 26, 26), Decl(silentNeverPropagation.ts, 26, 38))
>t2 : Symbol(t2, Decl(silentNeverPropagation.ts, 26, 26), Decl(silentNeverPropagation.ts, 26, 38))
>T1 : Symbol(T1, Decl(silentNeverPropagation.ts, 26, 23))
>t2 : Symbol(t2, Decl(silentNeverPropagation.ts, 26, 26), Decl(silentNeverPropagation.ts, 26, 38))

declare function outer<T1, T2>(m: T1 | T2): [T1, T2];
>outer : Symbol(outer, Decl(silentNeverPropagation.ts, 26, 56))
>T1 : Symbol(T1, Decl(silentNeverPropagation.ts, 27, 23))
>T2 : Symbol(T2, Decl(silentNeverPropagation.ts, 27, 26))
>m : Symbol(m, Decl(silentNeverPropagation.ts, 27, 31))
>T1 : Symbol(T1, Decl(silentNeverPropagation.ts, 27, 23))
>T2 : Symbol(T2, Decl(silentNeverPropagation.ts, 27, 26))
>T1 : Symbol(T1, Decl(silentNeverPropagation.ts, 27, 23))
>T2 : Symbol(T2, Decl(silentNeverPropagation.ts, 27, 26))

const outerResult = outer(
>outerResult : Symbol(outerResult, Decl(silentNeverPropagation.ts, 29, 5))
>outer : Symbol(outer, Decl(silentNeverPropagation.ts, 26, 56))

inner({ a: 12 }, { foo() { return true } })
>inner : Symbol(inner, Decl(silentNeverPropagation.ts, 24, 12))
>a : Symbol(a, Decl(silentNeverPropagation.ts, 30, 11))
>foo : Symbol(foo, Decl(silentNeverPropagation.ts, 30, 22))

);
41 changes: 41 additions & 0 deletions tests/baselines/reference/silentNeverPropagation.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,44 @@ breaks.foo()
>foo : () => true
> : ^^^^^^^^^^

declare function inner<T1, t2>(t1: T1, t2: t2): T1 | t2;
>inner : <T1, t2>(t1: T1, t2: t2) => T1 | t2
> : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^
>t1 : T1
> : ^^
>t2 : t2
> : ^^

declare function outer<T1, T2>(m: T1 | T2): [T1, T2];
>outer : <T1, T2>(m: T1 | T2) => [T1, T2]
> : ^ ^^ ^^ ^^ ^^^^^
>m : T1 | T2
> : ^^^^^^^

const outerResult = outer(
>outerResult : [{ a: number; } | { foo(): true; }, { a: number; } | { foo(): true; }]
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>outer( inner({ a: 12 }, { foo() { return true } })) : [{ a: number; } | { foo(): true; }, { a: number; } | { foo(): true; }]
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>outer : <T1, T2>(m: T1 | T2) => [T1, T2]
> : ^ ^^ ^^ ^^ ^^^^^

inner({ a: 12 }, { foo() { return true } })
>inner({ a: 12 }, { foo() { return true } }) : { a: number; } | { foo(): true; }
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>inner : <T1, t2>(t1: T1, t2: t2) => T1 | t2
> : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^
>{ a: 12 } : { a: number; }
> : ^^^^^^^^^^^^^^
>a : number
> : ^^^^^^
>12 : 12
> : ^^
>{ foo() { return true } } : { foo(): true; }
> : ^^^^^^^^^^^^^^^^
>foo : () => true
> : ^^^^^^^^^^
>true : true
> : ^^^^

);
7 changes: 7 additions & 0 deletions tests/cases/compiler/silentNeverPropagation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,10 @@ const breaks = convert(
breaks.state.a
breaks.state.z
breaks.foo()

declare function inner<T1, t2>(t1: T1, t2: t2): T1 | t2;
declare function outer<T1, T2>(m: T1 | T2): [T1, T2];

const outerResult = outer(
inner({ a: 12 }, { foo() { return true } })
);
Comment on lines +30 to +35
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this test case is utterly non-sensical but it shows a behavior/consistency improvement introduced by this patch

Loading