Skip to content

Fix class/constructor-function merge #27366

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 1 commit into from
Oct 8, 2018
Merged

Fix class/constructor-function merge #27366

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 @@ -20317,7 +20317,7 @@ namespace ts {
isBinaryExpression(decl.parent) && getSymbolOfNode(decl.parent.left) ||
isVariableDeclaration(decl.parent) && getSymbolOfNode(decl.parent));
const prototype = assignmentSymbol && assignmentSymbol.exports && assignmentSymbol.exports.get("prototype" as __String);
const init = prototype && getAssignedJSPrototype(prototype.valueDeclaration);
const init = prototype && prototype.valueDeclaration && getAssignedJSPrototype(prototype.valueDeclaration);
return init ? checkExpression(init) : undefined;
}

Expand Down
21 changes: 21 additions & 0 deletions tests/baselines/reference/constructorFunctionMergeWithClass.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
=== tests/cases/conformance/salsa/file1.js ===
var SomeClass = function () {
>SomeClass : Symbol(SomeClass, Decl(file1.js, 0, 3), Decl(file2.js, 0, 0), Decl(file2.js, 0, 19))

this.otherProp = 0;
>otherProp : Symbol(SomeClass.otherProp, Decl(file1.js, 0, 29))

};

new SomeClass();
>SomeClass : Symbol(SomeClass, Decl(file1.js, 0, 3), Decl(file2.js, 0, 0), Decl(file2.js, 0, 19))

=== tests/cases/conformance/salsa/file2.js ===
class SomeClass { }
>SomeClass : Symbol(SomeClass, Decl(file1.js, 0, 3), Decl(file2.js, 0, 0), Decl(file2.js, 0, 19))

SomeClass.prop = 0
>SomeClass.prop : Symbol(SomeClass.prop, Decl(file2.js, 0, 19))
>SomeClass : Symbol(SomeClass, Decl(file1.js, 0, 3), Decl(file2.js, 0, 0), Decl(file2.js, 0, 19))
>prop : Symbol(SomeClass.prop, Decl(file2.js, 0, 19))

29 changes: 29 additions & 0 deletions tests/baselines/reference/constructorFunctionMergeWithClass.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
=== tests/cases/conformance/salsa/file1.js ===
var SomeClass = function () {
>SomeClass : typeof SomeClass
>function () { this.otherProp = 0;} : typeof SomeClass

this.otherProp = 0;
>this.otherProp = 0 : 0
>this.otherProp : any
>this : any
>otherProp : any
>0 : 0

};

new SomeClass();
>new SomeClass() : SomeClass
>SomeClass : typeof SomeClass

=== tests/cases/conformance/salsa/file2.js ===
class SomeClass { }
>SomeClass : SomeClass

SomeClass.prop = 0
>SomeClass.prop = 0 : 0
>SomeClass.prop : number
>SomeClass : typeof SomeClass
>prop : number
>0 : 0

14 changes: 14 additions & 0 deletions tests/cases/conformance/salsa/constructorFunctionMergeWithClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// @allowJs: true
// @noEmit: true
// @checkJs: true

// @Filename: file1.js
var SomeClass = function () {
this.otherProp = 0;
};

new SomeClass();

// @Filename: file2.js
class SomeClass { }
SomeClass.prop = 0