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.

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

Fixed syntactic nullisness semantics for comma expressions #60402

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39772,6 +39772,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
case SyntaxKind.AmpersandAmpersandToken:
case SyntaxKind.AmpersandAmpersandEqualsToken:
return PredicateSemantics.Sometimes;
case SyntaxKind.CommaToken:
return getSyntacticNullishnessSemantics((node as BinaryExpression).right);
}
return PredicateSemantics.Never;
case SyntaxKind.ConditionalExpression:
Expand Down
23 changes: 21 additions & 2 deletions tests/baselines/reference/predicateSemantics.errors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ predicateSemantics.ts(33,8): error TS2872: This kind of expression is always tru
predicateSemantics.ts(34,11): error TS2872: This kind of expression is always truthy.
predicateSemantics.ts(35,8): error TS2872: This kind of expression is always truthy.
predicateSemantics.ts(36,8): error TS2872: This kind of expression is always truthy.
predicateSemantics.ts(51,14): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
predicateSemantics.ts(52,14): error TS2695: Left side of comma operator is unused and has no side effects.
predicateSemantics.ts(52,14): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.


==== predicateSemantics.ts (11 errors) ====
==== predicateSemantics.ts (14 errors) ====
declare let cond: any;

// OK: One or other operand is possibly nullish
Expand Down Expand Up @@ -77,4 +80,20 @@ predicateSemantics.ts(36,8): error TS2872: This kind of expression is always tru
function foo(this: Object | undefined) {
// Should be OK
return this ?? 0;
}
}

// https://github.com/microsoft/TypeScript/issues/60401
{
const maybe = null as true | null;
let i = 0;
const d = (i++, maybe) ?? true; // ok
const e = (i++, i++) ?? true; // error
~~~~~~~~
!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
const f = (maybe, i++) ?? true; // error
~~~~~
!!! error TS2695: Left side of comma operator is unused and has no side effects.
~~~~~~~~~~
!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
}

22 changes: 20 additions & 2 deletions tests/baselines/reference/predicateSemantics.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,20 @@ console.log((cond || undefined) && 1 / cond);
function foo(this: Object | undefined) {
// Should be OK
return this ?? 0;
}
}

// https://github.com/microsoft/TypeScript/issues/60401
{
const maybe = null as true | null;
let i = 0;
const d = (i++, maybe) ?? true; // ok
const e = (i++, i++) ?? true; // error
const f = (maybe, i++) ?? true; // error
}


//// [predicateSemantics.js]
var _a, _b, _c, _d, _e, _f;
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
// OK: One or other operand is possibly nullish
var test1 = (_a = (cond ? undefined : 32)) !== null && _a !== void 0 ? _a : "possibly reached";
// Not OK: Both operands nullish
Expand Down Expand Up @@ -88,3 +98,11 @@ function foo() {
// Should be OK
return this !== null && this !== void 0 ? this : 0;
}
// https://github.com/microsoft/TypeScript/issues/60401
{
var maybe = null;
var i = 0;
var d = (_g = (i++, maybe)) !== null && _g !== void 0 ? _g : true; // ok
var e = (_h = (i++, i++)) !== null && _h !== void 0 ? _h : true; // error
var f = (_j = (maybe, i++)) !== null && _j !== void 0 ? _j : true; // error
}
25 changes: 25 additions & 0 deletions tests/baselines/reference/predicateSemantics.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,28 @@ function foo(this: Object | undefined) {
return this ?? 0;
>this : Symbol(this, Decl(predicateSemantics.ts, 40, 13))
}

// https://github.com/microsoft/TypeScript/issues/60401
{
const maybe = null as true | null;
>maybe : Symbol(maybe, Decl(predicateSemantics.ts, 47, 7))

let i = 0;
>i : Symbol(i, Decl(predicateSemantics.ts, 48, 5))

const d = (i++, maybe) ?? true; // ok
>d : Symbol(d, Decl(predicateSemantics.ts, 49, 7))
>i : Symbol(i, Decl(predicateSemantics.ts, 48, 5))
>maybe : Symbol(maybe, Decl(predicateSemantics.ts, 47, 7))

const e = (i++, i++) ?? true; // error
>e : Symbol(e, Decl(predicateSemantics.ts, 50, 7))
>i : Symbol(i, Decl(predicateSemantics.ts, 48, 5))
>i : Symbol(i, Decl(predicateSemantics.ts, 48, 5))

const f = (maybe, i++) ?? true; // error
>f : Symbol(f, Decl(predicateSemantics.ts, 51, 7))
>maybe : Symbol(maybe, Decl(predicateSemantics.ts, 47, 7))
>i : Symbol(i, Decl(predicateSemantics.ts, 48, 5))
}

74 changes: 74 additions & 0 deletions tests/baselines/reference/predicateSemantics.types
Original file line number Diff line number Diff line change
Expand Up @@ -234,3 +234,77 @@ function foo(this: Object | undefined) {
>0 : 0
> : ^
}

// https://github.com/microsoft/TypeScript/issues/60401
{
const maybe = null as true | null;
>maybe : true
> : ^^^^
>null as true | null : true
> : ^^^^
>true : true
> : ^^^^

let i = 0;
>i : number
> : ^^^^^^
>0 : 0
> : ^

const d = (i++, maybe) ?? true; // ok
>d : true
> : ^^^^
>(i++, maybe) ?? true : true
> : ^^^^
>(i++, maybe) : true
> : ^^^^
>i++, maybe : true
> : ^^^^
>i++ : number
> : ^^^^^^
>i : number
> : ^^^^^^
>maybe : true
> : ^^^^
>true : true
> : ^^^^

const e = (i++, i++) ?? true; // error
>e : number | true
> : ^^^^^^^^^^^^^
>(i++, i++) ?? true : number | true
> : ^^^^^^^^^^^^^
>(i++, i++) : number
> : ^^^^^^
>i++, i++ : number
> : ^^^^^^
>i++ : number
> : ^^^^^^
>i : number
> : ^^^^^^
>i++ : number
> : ^^^^^^
>i : number
> : ^^^^^^
>true : true
> : ^^^^

const f = (maybe, i++) ?? true; // error
>f : number | true
> : ^^^^^^^^^^^^^
>(maybe, i++) ?? true : number | true
> : ^^^^^^^^^^^^^
>(maybe, i++) : number
> : ^^^^^^
>maybe, i++ : number
> : ^^^^^^
>maybe : true
> : ^^^^
>i++ : number
> : ^^^^^^
>i : number
> : ^^^^^^
>true : true
> : ^^^^
}

11 changes: 10 additions & 1 deletion tests/cases/compiler/predicateSemantics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,13 @@ console.log((cond || undefined) && 1 / cond);
function foo(this: Object | undefined) {
// Should be OK
return this ?? 0;
}
}

// https://github.com/microsoft/TypeScript/issues/60401
{
const maybe = null as true | null;
let i = 0;
const d = (i++, maybe) ?? true; // ok
const e = (i++, i++) ?? true; // error
const f = (maybe, i++) ?? true; // error
}