Skip to content

Include accessors in control flow type analysis #8443

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

Merged
ahejlsberg merged 2 commits into from
May 3, 2016
Merged

Include accessors in control flow type analysis #8443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3186a4
Include accessors in control flow type analysis
ahejlsberg May 3, 2016
c44fe76
Accepting new baselines
ahejlsberg May 3, 2016
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 @@ -9795,7 +9795,7 @@ namespace ts {
}

const propType = getTypeOfSymbol(prop);
if (node.kind !== SyntaxKind.PropertyAccessExpression || !(prop.flags & (SymbolFlags.Variable | SymbolFlags.Property)) || isAssignmentTarget(node)) {
if (node.kind !== SyntaxKind.PropertyAccessExpression || !(prop.flags & (SymbolFlags.Variable | SymbolFlags.Property | SymbolFlags.Accessor)) || isAssignmentTarget(node)) {
return propType;
}
const leftmostNode = getLeftmostIdentifierOrThis(node);
Expand Down
16 changes: 8 additions & 8 deletions tests/baselines/reference/typeGuardsInProperties.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,18 @@ class C1 {
>pp2 : string

strOrNum = typeof this.pp3 === "string" && this.pp3; // string | number
>strOrNum = typeof this.pp3 === "string" && this.pp3 : string | number
>strOrNum = typeof this.pp3 === "string" && this.pp3 : string
>strOrNum : string | number
>typeof this.pp3 === "string" && this.pp3 : string | number
>typeof this.pp3 === "string" && this.pp3 : string
>typeof this.pp3 === "string" : boolean
>typeof this.pp3 : string
>this.pp3 : string | number
>this : this
>pp3 : string | number
>"string" : string
>this.pp3 : string | number
>this.pp3 : string
>this : this
>pp3 : string | number
>pp3 : string
}
}
var c1: C1;
Expand All @@ -90,18 +90,18 @@ strOrNum = typeof c1.pp2 === "string" && c1.pp2; // string | number
>pp2 : string

strOrNum = typeof c1.pp3 === "string" && c1.pp3; // string | number
>strOrNum = typeof c1.pp3 === "string" && c1.pp3 : string | number
>strOrNum = typeof c1.pp3 === "string" && c1.pp3 : string
>strOrNum : string | number
>typeof c1.pp3 === "string" && c1.pp3 : string | number
>typeof c1.pp3 === "string" && c1.pp3 : string
>typeof c1.pp3 === "string" : boolean
>typeof c1.pp3 : string
>c1.pp3 : string | number
>c1 : C1
>pp3 : string | number
>"string" : string
>c1.pp3 : string | number
>c1.pp3 : string
>c1 : C1
>pp3 : string | number
>pp3 : string

var obj1: {
>obj1 : { x: string | number; }
Expand Down
8 changes: 4 additions & 4 deletions tests/baselines/reference/typeGuardsObjectMethods.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,16 +172,16 @@ strOrNum = typeof obj1.method(strOrNum) === "string" && obj1.method(strOrNum);

// accessing getter property
strOrNum = typeof obj1.prop === "string" && obj1.prop;
>strOrNum = typeof obj1.prop === "string" && obj1.prop : string | number
>strOrNum = typeof obj1.prop === "string" && obj1.prop : string
>strOrNum : string | number
>typeof obj1.prop === "string" && obj1.prop : string | number
>typeof obj1.prop === "string" && obj1.prop : string
>typeof obj1.prop === "string" : boolean
>typeof obj1.prop : string
>obj1.prop : string | number
>obj1 : { method(param: string | number): string | number; prop: string | number; }
>prop : string | number
>"string" : string
>obj1.prop : string | number
>obj1.prop : string
>obj1 : { method(param: string | number): string | number; prop: string | number; }
>prop : string | number
>prop : string