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

Fixed detection of optional chains containing a reference #59144

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+420 −1
Open

Fixed detection of optional chains containing a reference #59144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b21aa8
Fixed detection of optional chains containing a reference
Andarist Jul 5, 2024
08d13f2
Merge remote-tracking branch 'origin/main' into fix/optionalChainCont…
Andarist Dec 26, 2024
ae4bcce
add a test case
Andarist Dec 26, 2024
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 @@ -27275,7 +27275,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
function optionalChainContainsReference(source: Node, target: Node) {
while (isOptionalChain(source)) {
source = source.expression;
if (isMatchingReference(source, target)) {
if (isMatchingReference(target, source)) {
return true;
}
}
Expand Down
141 changes: 141 additions & 0 deletions tests/baselines/reference/controlFlowOptionalChain4.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
//// [tests/cases/conformance/controlFlow/controlFlowOptionalChain4.ts] ////

=== controlFlowOptionalChain4.ts ===
// https://github.com/microsoft/TypeScript/issues/56998

type Type = {
>Type : Symbol(Type, Decl(controlFlowOptionalChain4.ts, 0, 0))

id: number;
>id : Symbol(id, Decl(controlFlowOptionalChain4.ts, 2, 13))

};

type InferenceInfo = {
>InferenceInfo : Symbol(InferenceInfo, Decl(controlFlowOptionalChain4.ts, 4, 2))

typeParameter: Type;
>typeParameter : Symbol(typeParameter, Decl(controlFlowOptionalChain4.ts, 6, 22))
>Type : Symbol(Type, Decl(controlFlowOptionalChain4.ts, 0, 0))

impliedArity?: number;
>impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))

};

declare function getInferenceInfoForType(type: Type): InferenceInfo | undefined;
>getInferenceInfoForType : Symbol(getInferenceInfoForType, Decl(controlFlowOptionalChain4.ts, 9, 2))
>type : Symbol(type, Decl(controlFlowOptionalChain4.ts, 11, 41))
>Type : Symbol(Type, Decl(controlFlowOptionalChain4.ts, 0, 0))
>InferenceInfo : Symbol(InferenceInfo, Decl(controlFlowOptionalChain4.ts, 4, 2))

function fn1(t1: Type, t2: Type) {
>fn1 : Symbol(fn1, Decl(controlFlowOptionalChain4.ts, 11, 80))
>t1 : Symbol(t1, Decl(controlFlowOptionalChain4.ts, 13, 13))
>Type : Symbol(Type, Decl(controlFlowOptionalChain4.ts, 0, 0))
>t2 : Symbol(t2, Decl(controlFlowOptionalChain4.ts, 13, 22))
>Type : Symbol(Type, Decl(controlFlowOptionalChain4.ts, 0, 0))

let info = getInferenceInfoForType(t1);
>info : Symbol(info, Decl(controlFlowOptionalChain4.ts, 14, 5))
>getInferenceInfoForType : Symbol(getInferenceInfoForType, Decl(controlFlowOptionalChain4.ts, 9, 2))
>t1 : Symbol(t1, Decl(controlFlowOptionalChain4.ts, 13, 13))

if (info?.impliedArity !== undefined) {
>info?.impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
>info : Symbol(info, Decl(controlFlowOptionalChain4.ts, 14, 5))
>impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
>undefined : Symbol(undefined)

info.impliedArity;
>info.impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
>info : Symbol(info, Decl(controlFlowOptionalChain4.ts, 14, 5))
>impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))

} else if ((info = getInferenceInfoForType(t2))?.impliedArity !== undefined) {
>(info = getInferenceInfoForType(t2))?.impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
>info : Symbol(info, Decl(controlFlowOptionalChain4.ts, 14, 5))
>getInferenceInfoForType : Symbol(getInferenceInfoForType, Decl(controlFlowOptionalChain4.ts, 9, 2))
>t2 : Symbol(t2, Decl(controlFlowOptionalChain4.ts, 13, 22))
>impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
>undefined : Symbol(undefined)

info.impliedArity;
>info.impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
>info : Symbol(info, Decl(controlFlowOptionalChain4.ts, 14, 5))
>impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
}
}

function fn2(t1: Type, t2: Type) {
>fn2 : Symbol(fn2, Decl(controlFlowOptionalChain4.ts, 20, 1))
>t1 : Symbol(t1, Decl(controlFlowOptionalChain4.ts, 22, 13))
>Type : Symbol(Type, Decl(controlFlowOptionalChain4.ts, 0, 0))
>t2 : Symbol(t2, Decl(controlFlowOptionalChain4.ts, 22, 22))
>Type : Symbol(Type, Decl(controlFlowOptionalChain4.ts, 0, 0))

let info = getInferenceInfoForType(t1);
>info : Symbol(info, Decl(controlFlowOptionalChain4.ts, 23, 5))
>getInferenceInfoForType : Symbol(getInferenceInfoForType, Decl(controlFlowOptionalChain4.ts, 9, 2))
>t1 : Symbol(t1, Decl(controlFlowOptionalChain4.ts, 22, 13))

if (info?.impliedArity !== undefined) {
>info?.impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
>info : Symbol(info, Decl(controlFlowOptionalChain4.ts, 23, 5))
>impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
>undefined : Symbol(undefined)

info.impliedArity;
>info.impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
>info : Symbol(info, Decl(controlFlowOptionalChain4.ts, 23, 5))
>impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))

} else if ((info = getInferenceInfoForType(t2))?.impliedArity) {
>(info = getInferenceInfoForType(t2))?.impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
>info : Symbol(info, Decl(controlFlowOptionalChain4.ts, 23, 5))
>getInferenceInfoForType : Symbol(getInferenceInfoForType, Decl(controlFlowOptionalChain4.ts, 9, 2))
>t2 : Symbol(t2, Decl(controlFlowOptionalChain4.ts, 22, 22))
>impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))

info.impliedArity;
>info.impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
>info : Symbol(info, Decl(controlFlowOptionalChain4.ts, 23, 5))
>impliedArity : Symbol(impliedArity, Decl(controlFlowOptionalChain4.ts, 7, 22))
}
}

// https://github.com/microsoft/TypeScript/issues/60855

type Option = { type: "Some"; value: number } | { type: "None" };
>Option : Symbol(Option, Decl(lib.dom.d.ts, --, --), Decl(controlFlowOptionalChain4.ts, 29, 1))
>type : Symbol(type, Decl(controlFlowOptionalChain4.ts, 33, 15))
>value : Symbol(value, Decl(controlFlowOptionalChain4.ts, 33, 29))
>type : Symbol(type, Decl(controlFlowOptionalChain4.ts, 33, 49))

declare function someOptionalOption(): Option | undefined;
>someOptionalOption : Symbol(someOptionalOption, Decl(controlFlowOptionalChain4.ts, 33, 65))
>Option : Symbol(Option, Decl(lib.dom.d.ts, --, --), Decl(controlFlowOptionalChain4.ts, 29, 1))

function test60855(): number | undefined {
>test60855 : Symbol(test60855, Decl(controlFlowOptionalChain4.ts, 35, 58))

let option: Option | undefined;
>option : Symbol(option, Decl(controlFlowOptionalChain4.ts, 38, 5))
>Option : Symbol(Option, Decl(lib.dom.d.ts, --, --), Decl(controlFlowOptionalChain4.ts, 29, 1))

if ((option = someOptionalOption())?.type === "Some") {
>(option = someOptionalOption())?.type : Symbol(type, Decl(controlFlowOptionalChain4.ts, 33, 15), Decl(controlFlowOptionalChain4.ts, 33, 49))
>option : Symbol(option, Decl(controlFlowOptionalChain4.ts, 38, 5))
>someOptionalOption : Symbol(someOptionalOption, Decl(controlFlowOptionalChain4.ts, 33, 65))
>type : Symbol(type, Decl(controlFlowOptionalChain4.ts, 33, 15), Decl(controlFlowOptionalChain4.ts, 33, 49))

return option.value;
>option.value : Symbol(value, Decl(controlFlowOptionalChain4.ts, 33, 29))
>option : Symbol(option, Decl(controlFlowOptionalChain4.ts, 38, 5))
>value : Symbol(value, Decl(controlFlowOptionalChain4.ts, 33, 29))
}

return undefined;
>undefined : Symbol(undefined)
}

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

=== controlFlowOptionalChain4.ts ===
// https://github.com/microsoft/TypeScript/issues/56998

type Type = {
>Type : Type
> : ^^^^

id: number;
>id : number
> : ^^^^^^

};

type InferenceInfo = {
>InferenceInfo : InferenceInfo
> : ^^^^^^^^^^^^^

typeParameter: Type;
>typeParameter : Type
> : ^^^^

impliedArity?: number;
>impliedArity : number | undefined
> : ^^^^^^^^^^^^^^^^^^

};

declare function getInferenceInfoForType(type: Type): InferenceInfo | undefined;
>getInferenceInfoForType : (type: Type) => InferenceInfo | undefined
> : ^ ^^ ^^^^^
>type : Type
> : ^^^^

function fn1(t1: Type, t2: Type) {
>fn1 : (t1: Type, t2: Type) => void
> : ^ ^^ ^^ ^^ ^^^^^^^^^
>t1 : Type
> : ^^^^
>t2 : Type
> : ^^^^

let info = getInferenceInfoForType(t1);
>info : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>getInferenceInfoForType(t1) : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>getInferenceInfoForType : (type: Type) => InferenceInfo | undefined
> : ^ ^^ ^^^^^
>t1 : Type
> : ^^^^

if (info?.impliedArity !== undefined) {
>info?.impliedArity !== undefined : boolean
> : ^^^^^^^
>info?.impliedArity : number | undefined
> : ^^^^^^^^^^^^^^^^^^
>info : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>impliedArity : number | undefined
> : ^^^^^^^^^^^^^^^^^^
>undefined : undefined
> : ^^^^^^^^^

info.impliedArity;
>info.impliedArity : number
> : ^^^^^^
>info : InferenceInfo
> : ^^^^^^^^^^^^^
>impliedArity : number
> : ^^^^^^

} else if ((info = getInferenceInfoForType(t2))?.impliedArity !== undefined) {
>(info = getInferenceInfoForType(t2))?.impliedArity !== undefined : boolean
> : ^^^^^^^
>(info = getInferenceInfoForType(t2))?.impliedArity : number | undefined
> : ^^^^^^^^^^^^^^^^^^
>(info = getInferenceInfoForType(t2)) : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>info = getInferenceInfoForType(t2) : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>info : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>getInferenceInfoForType(t2) : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>getInferenceInfoForType : (type: Type) => InferenceInfo | undefined
> : ^ ^^ ^^^^^
>t2 : Type
> : ^^^^
>impliedArity : number | undefined
> : ^^^^^^^^^^^^^^^^^^
>undefined : undefined
> : ^^^^^^^^^

info.impliedArity;
>info.impliedArity : number
> : ^^^^^^
>info : InferenceInfo
> : ^^^^^^^^^^^^^
>impliedArity : number
> : ^^^^^^
}
}

function fn2(t1: Type, t2: Type) {
>fn2 : (t1: Type, t2: Type) => void
> : ^ ^^ ^^ ^^ ^^^^^^^^^
>t1 : Type
> : ^^^^
>t2 : Type
> : ^^^^

let info = getInferenceInfoForType(t1);
>info : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>getInferenceInfoForType(t1) : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>getInferenceInfoForType : (type: Type) => InferenceInfo | undefined
> : ^ ^^ ^^^^^
>t1 : Type
> : ^^^^

if (info?.impliedArity !== undefined) {
>info?.impliedArity !== undefined : boolean
> : ^^^^^^^
>info?.impliedArity : number | undefined
> : ^^^^^^^^^^^^^^^^^^
>info : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>impliedArity : number | undefined
> : ^^^^^^^^^^^^^^^^^^
>undefined : undefined
> : ^^^^^^^^^

info.impliedArity;
>info.impliedArity : number
> : ^^^^^^
>info : InferenceInfo
> : ^^^^^^^^^^^^^
>impliedArity : number
> : ^^^^^^

} else if ((info = getInferenceInfoForType(t2))?.impliedArity) {
>(info = getInferenceInfoForType(t2))?.impliedArity : number | undefined
> : ^^^^^^^^^^^^^^^^^^
>(info = getInferenceInfoForType(t2)) : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>info = getInferenceInfoForType(t2) : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>info : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>getInferenceInfoForType(t2) : InferenceInfo | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
>getInferenceInfoForType : (type: Type) => InferenceInfo | undefined
> : ^ ^^ ^^^^^
>t2 : Type
> : ^^^^
>impliedArity : number | undefined
> : ^^^^^^^^^^^^^^^^^^

info.impliedArity;
>info.impliedArity : number
> : ^^^^^^
>info : InferenceInfo
> : ^^^^^^^^^^^^^
>impliedArity : number
> : ^^^^^^
}
}

// https://github.com/microsoft/TypeScript/issues/60855

type Option = { type: "Some"; value: number } | { type: "None" };
>Option : Option
> : ^^^^^^
>type : "Some"
> : ^^^^^^
>value : number
> : ^^^^^^
>type : "None"
> : ^^^^^^

declare function someOptionalOption(): Option | undefined;
>someOptionalOption : () => Option | undefined
> : ^^^^^^

function test60855(): number | undefined {
>test60855 : () => number | undefined
> : ^^^^^^

let option: Option | undefined;
>option : Option | undefined
> : ^^^^^^^^^^^^^^^^^^

if ((option = someOptionalOption())?.type === "Some") {
>(option = someOptionalOption())?.type === "Some" : boolean
> : ^^^^^^^
>(option = someOptionalOption())?.type : "Some" | "None" | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
>(option = someOptionalOption()) : Option | undefined
> : ^^^^^^^^^^^^^^^^^^
>option = someOptionalOption() : Option | undefined
> : ^^^^^^^^^^^^^^^^^^
>option : Option | undefined
> : ^^^^^^^^^^^^^^^^^^
>someOptionalOption() : Option | undefined
> : ^^^^^^^^^^^^^^^^^^
>someOptionalOption : () => Option | undefined
> : ^^^^^^
>type : "Some" | "None" | undefined
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
>"Some" : "Some"
> : ^^^^^^

return option.value;
>option.value : number
> : ^^^^^^
>option : { type: "Some"; value: number; }
> : ^^^^^^^^ ^^^^^^^^^ ^^^
>value : number
> : ^^^^^^
}

return undefined;
>undefined : undefined
> : ^^^^^^^^^
}

Loading
Loading