maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Binder-based prop-assignment decls: messy version

Browse source
This commit is contained in:
Nathan Shively-Sanders 2017-11-22 13:52:45 -08:00
parent d4f6c8cc09
commit bee7d06761
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/compiler/binder.ts
View file

@ -274,7 +274,7 @@ namespace ts {
}
switch (node.kind) {
case SyntaxKind.Identifier:
// THIS IS WRONG
// TODO: THIS IS WRONG
return (node as any as Identifier).escapedText;
case SyntaxKind.Constructor:
return InternalSymbolName.Constructor;
@ -2010,6 +2010,7 @@ namespace ts {
node.flowNode = currentFlow;
}
if (isSpecialPropertyDeclaration(node as PropertyAccessExpression)) {
// TODO: this is wrong now that I allow it anywhere
bindThisPropertyAssignment(node as PropertyAccessExpression);
}
break;
@ -2397,17 +2398,21 @@ namespace ts {
if (targetSymbol && isDeclarationOfFunctionOrClassExpression(targetSymbol)) {
targetSymbol = (targetSymbol.valueDeclaration as VariableDeclaration).initializer.symbol;
}
if (isMagic && (!targetSymbol || !(targetSymbol.flags & SymbolFlags.Namespace))) {
// TODO: Magic may not be required
// TODO: Container.locals as symbolTable is probably wrong sometimes (maybe it's sometimes exports?)
// TODO: Container.symbol as parent is probably wrong sometimes
// TODO: propertyAccessExpression.expression isn't a Declaration
targetSymbol = declareSymbol(container.locals, container.symbol, propertyAccessExpression.expression as any as Declaration, SymbolFlags.NamespaceModule, SymbolFlags.NamespaceModuleExcludes);
Debug.assert(propertyAccessExpression.parent.kind === SyntaxKind.BinaryExpression);
if (isMagic &&
(!targetSymbol || !(targetSymbol.flags & SymbolFlags.Namespace)) &&
((propertyAccessExpression.parent as BinaryExpression).right.kind === SyntaxKind.ClassExpression || (propertyAccessExpression.parent as BinaryExpression).right.kind === SyntaxKind.FunctionExpression) &&
propertyAccessExpression.parent.parent.parent.kind === SyntaxKind.SourceFile) {
// TODO: Magic may not be required (but is so far)
Debug.assert(isIdentifier(propertyAccessExpression.expression));
// TODO: This should be exports if the tgargetSymbol is found, and already exported, otherwise locals
const symbolTable = container.symbol && container.symbol.exports ? container.symbol.exports : container.locals;
targetSymbol = declareSymbol(symbolTable, container.symbol, propertyAccessExpression.expression as Identifier, SymbolFlags.NamespaceModule, SymbolFlags.NamespaceModuleExcludes);
}
if (targetSymbol && isDeclarationOfFunctionOrClassExpression(targetSymbol)) {
targetSymbol = (targetSymbol.valueDeclaration as VariableDeclaration).initializer.symbol;
}
if (!isMagic && (!targetSymbol || !(targetSymbol.flags & (SymbolFlags.Function | SymbolFlags.Class)))) {
if (!targetSymbol || !(targetSymbol.flags & (SymbolFlags.Function | SymbolFlags.Class | SymbolFlags.NamespaceModule))) {
return;
}

2
src/compiler/types.ts
View file

@ -633,7 +633,7 @@ namespace ts {
Node, // Unique name based on the node in the 'original' property.
}
export interface Identifier extends PrimaryExpression {
export interface Identifier extends PrimaryExpression, Declaration {
kind: SyntaxKind.Identifier;
/**
* Prefer to use `id.unescapedText`. (Note: This is available only in services, not internally to the TypeScript compiler.)

1
src/services/services.ts
View file

@ -416,6 +416,7 @@ namespace ts {
_updateExpressionBrand: any;
_unaryExpressionBrand: any;
_expressionBrand: any;
_declarationBrand: any;
/*@internal*/typeArguments: NodeArray<TypeNode>;
constructor(_kind: SyntaxKind.Identifier, pos: number, end: number) {
super(pos, end);