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

Reword predicate to be more readable

Browse Source
This commit is contained in:
Nathan Shively-Sanders
2015-11-04 16:44:21 -08:00
parent ec2eac53bf
commit 57f7d7f9df
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/binder.ts
View File

@@ -130,12 +130,14 @@ namespace ts {
symbol.members = {};
}
if (symbolFlags & SymbolFlags.Value &&
(!symbol.valueDeclaration ||
(symbol.valueDeclaration.kind === SyntaxKind.ModuleDeclaration && node.kind !== SyntaxKind.ModuleDeclaration))) {
// other kinds of value declarations take precedence over modules
symbol.valueDeclaration = node;
}
if (symbolFlags & SymbolFlags.Value) {
const valueDeclaration = symbol.valueDeclaration;
if (!valueDeclaration ||
(valueDeclaration.kind !== node.kind && valueDeclaration.kind === SyntaxKind.ModuleDeclaration)) {
// other kinds of value declarations take precedence over modules
symbol.valueDeclaration = node;
}
}
}
// Should not be called on a declaration with a computed property name,