microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-17 19:11:26 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Cleanup new code in binder

Browse Source
This commit is contained in:
Nathan Shively-Sanders 2018-02-20 15:46:45 -08:00
parent 116a8a8cff
commit 8e424f9f9b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/binder.ts
View File

@ -2350,14 +2350,13 @@ namespace ts {
if (node.expression.kind === SyntaxKind.ThisKeyword) {
bindThisPropertyAssignment(node);
}
else if (isEntityNameExpression(node) &&
isPropertyAccessExpression(node.expression) &&
node.expression.name.escapedText === "prototype" &&
node.parent.parent.kind === SyntaxKind.SourceFile) {
bindPrototypePropertyAssignment(node as PropertyAccessEntityNameExpression, node.parent);
}
else if (isEntityNameExpression(node) && node.parent.parent.kind === SyntaxKind.SourceFile) {
bindStaticPropertyAssignment(node as PropertyAccessEntityNameExpression);
if (isPropertyAccessExpression(node.expression) && node.expression.name.escapedText === "prototype") {
bindPrototypePropertyAssignment(node as PropertyAccessEntityNameExpression, node.parent);
}
else {
bindStaticPropertyAssignment(node as PropertyAccessEntityNameExpression);
}
}
}
@ -2368,7 +2367,6 @@ namespace ts {
function bindPrototypePropertyAssignment(lhs: PropertyAccessEntityNameExpression, parent: Node) {
// Look up the function in the local scope, since prototype assignments should
// follow the function declaration
// TODO: This cast is now insufficient for original case+nested case
const classPrototype = lhs.expression as PropertyAccessEntityNameExpression;
const constructorFunction = classPrototype.expression as Identifier;