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

This commit is contained in:
Daniel Rosenwasser 2015-05-27 16:03:04 -07:00
parent baf46a94a6
commit eb95532bfa

View File

@ -423,19 +423,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;
@ -444,7 +443,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;