Skip to content

Set symbol/flags only on (fresh) object spreads #12896

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
sandersn merged 2 commits into from
Dec 13, 2016
Merged

Set symbol/flags only on (fresh) object spreads #12896

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
8dc1747
Set symbol/flags only on (fresh) object spreads
sandersn Dec 13, 2016
587ba8d
Test:spreading any doesn't set flags on anyType
sandersn Dec 13, 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
7 changes: 5 additions & 2 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11638,8 +11638,11 @@ namespace ts {
if (propertiesArray.length > 0) {
spread = getSpreadType(spread, createObjectLiteralType(), /*isFromObjectLiteral*/ true);
}
spread.flags |= propagatedFlags;
spread.symbol = node.symbol;
if (spread.flags & TypeFlags.Object) {
// only set the symbol and flags if this is a (fresh) object type
spread.flags |= propagatedFlags;
spread.symbol = node.symbol;
}
return spread;
}

Expand Down
16 changes: 16 additions & 0 deletions tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//// [explicitAnyAfterSpreadNoImplicitAnyError.ts]
({ a: [], ...(null as any) });
let x: any;


//// [explicitAnyAfterSpreadNoImplicitAnyError.js]
var __assign = (this && this.__assign) || Object.assign || function(t) {
for (var s, i = 1, n = arguments.length; i < n; i++) {
s = arguments[i];
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
t[p] = s[p];
}
return t;
};
(__assign({ a: [] }, null));
var x;
7 changes: 7 additions & 0 deletions tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts ===
({ a: [], ...(null as any) });
>a : Symbol(a, Decl(explicitAnyAfterSpreadNoImplicitAnyError.ts, 0, 2))

let x: any;
>x : Symbol(x, Decl(explicitAnyAfterSpreadNoImplicitAnyError.ts, 1, 3))

13 changes: 13 additions & 0 deletions tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts ===
({ a: [], ...(null as any) });
>({ a: [], ...(null as any) }) : any
>{ a: [], ...(null as any) } : any
>a : undefined[]
>[] : undefined[]
>(null as any) : any
>null as any : any
>null : null

let x: any;
>x : any

1 change: 0 additions & 1 deletion tests/baselines/reference/objectSpread.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } }
>plus : Symbol(plus, Decl(objectSpread.ts, 49, 23))
>c : Symbol(c, Decl(objectSpread.ts, 45, 3))
>plus : Symbol(plus, Decl(objectSpread.ts, 49, 48))
>this : Symbol(__object, Decl(objectSpread.ts, 41, 15))

cplus.plus();
>cplus.plus : Symbol(plus, Decl(objectSpread.ts, 49, 23))
Expand Down
3 changes: 3 additions & 0 deletions tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// @noImplicitAny: true
({ a: [], ...(null as any) });
let x: any;