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

Don't use 'Value' or 'Type' as they have overlap. Instead test for the precice meaning.

Browse source
This commit is contained in:
Daniel Rosenwasser 2015-05-27 16:03:04 -07:00
parent 4088bc099c
commit 644dbf230f
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/compiler/checker.ts
View file

@ -422,19 +422,18 @@ module ts {
case SyntaxKind.SetAccessor:
case SyntaxKind.FunctionDeclaration:
case SyntaxKind.ArrowFunction:
if (meaning & SymbolFlags.Value) {
if (name === "arguments") {
result = argumentsSymbol;
break loop;
}
if (meaning & SymbolFlags.Variable && name === "arguments") {
result = argumentsSymbol;
break loop;
}
break;
case SyntaxKind.FunctionExpression:
if (meaning & SymbolFlags.Value) {
if (name === "arguments") {
result = argumentsSymbol;
break loop;
}
if (meaning & SymbolFlags.Variable && name === "arguments") {
result = argumentsSymbol;
break loop;
}
if (meaning & SymbolFlags.Function) {
let functionName = (<FunctionExpression>location).name;
if (functionName && name === functionName.text) {
result = location.symbol;
@ -443,7 +442,7 @@ module ts {
}
break;
case SyntaxKind.ClassExpression:
if (meaning & (SymbolFlags.Value | SymbolFlags.Type)) {
if (meaning & SymbolFlags.Class) {
let className = (<ClassExpression>location).name;
if (className && name === className.text) {
result = location.symbol;