microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-20 22:51:17 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Simplify getLateBoundSymbol

Browse Source
This commit is contained in:
Ron Buckton
2017-10-20 15:04:04 -07:00
parent 7fd38c838b
commit 55e63a8288
2 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/compiler/checker.ts
View File

@@ -1996,11 +1996,11 @@ namespace ts {
}
function getSymbolOfNode(node: Node): Symbol {
return getMergedSymbol(getLateBoundSymbol(node.symbol));
return getMergedSymbol(node.symbol && getLateBoundSymbol(node.symbol));
}
function getParentOfSymbol(symbol: Symbol): Symbol {
return getMergedSymbol(getLateBoundSymbol(symbol.parent));
return getMergedSymbol(symbol.parent && getLateBoundSymbol(symbol.parent));
}
function getExportSymbolOfValueSymbolIfExported(symbol: Symbol): Symbol {
@@ -5511,6 +5511,15 @@ namespace ts {
return isDynamicName(node) && !isLateBindableName(node);
}
/**
* Indicates whether a symbol has a late-bindable name.
*/
function symbolHasLateBindableName(symbol: Symbol) {
return symbol.flags & SymbolFlags.ClassMember
&& symbol.escapedName === InternalSymbolName.Computed
&& some(symbol.declarations, hasLateBindableName);
}
/**
* Gets the symbolic name for a late-bound member from its type.
*/
@@ -5671,42 +5680,26 @@ namespace ts {
}
/**
* If a symbol is the dynamic name of the member of an object type, get its late-bound member.
* If a symbol is the dynamic name of the member of an object type, get the late-bound
* symbol of the member.
*
* For a description of late-binding, see `lateBindMember`.
*/
function getLateBoundSymbol(symbol: Symbol) {
if (symbol && (symbol.flags & SymbolFlags.ClassMember) && symbol.escapedName === InternalSymbolName.Computed) {
const isStaticMember = some(symbol.declarations, declaration => hasModifier(declaration, ModifierFlags.Static));
function getLateBoundSymbol(symbol: Symbol): Symbol {
const links = getSymbolLinks(symbol);
if (!links.lateSymbol) {
const parent = symbol.parent;
if (parent && (parent.flags & (isStaticMember ? SymbolFlags.Class : SymbolFlags.LateBindableContainer))) {
const links = getSymbolLinks(symbol);
if (!links.lateSymbol) {
// Get (or create) the SymbolTable from the parent used to store late-
// bound symbols. We get a shared table so that we can correctly merge
// late-bound symbols across accessor pairs.
//
// We do not eagerly resolve all of the members of the parent here as
// that results in an eager type-check of the expression of every member
// with a computed property name.
const lateSymbols = isStaticMember ? getLateBoundExportsOfSymbol(parent) : getLateBoundMembersOfSymbol(parent);
const earlySymbols = isStaticMember ? parent.exports : parent.members;
// In the event we attempt to get the late-bound symbol for a symbol recursively,
// fall back to the early-bound symbol.
links.lateSymbol = symbol;
// Fill in the late-bound symbol for each declaration of this symbol.
for (const decl of symbol.declarations) {
if (hasLateBindableName(decl)) {
lateBindMember(parent, earlySymbols, lateSymbols, decl);
}
}
if (symbolHasLateBindableName(symbol) && parent && parent.flags & SymbolFlags.LateBindableContainer) {
// force late binding of members/exports. This will set the late-bound symbol
if (some(symbol.declarations, hasStaticModifier)) {
getExportsOfSymbol(parent);
}
else {
getMembersOfSymbol(parent);
}
return links.lateSymbol;
}
}
return symbol;
return links.lateSymbol || (links.lateSymbol = symbol);
}
function getTypeWithThisArgument(type: Type, thisArgument?: Type): Type {

4
src/compiler/utilities.ts
View File

@@ -3005,6 +3005,10 @@ namespace ts {
return !!getSelectedModifierFlags(node, flags);
}
export function hasStaticModifier(node: Node): boolean {
return hasModifier(node, ModifierFlags.Static);
}
export function getSelectedModifierFlags(node: Node, flags: ModifierFlags): ModifierFlags {
return getModifierFlags(node) & flags;
}