From 4088bc099c797ada14b0b2606d1e8d758324a413 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 27 May 2015 15:04:34 -0700
Subject: [PATCH] Only resolve 'arguments' and function/class expression names
 if the meaning permits it.

---
 src/compiler/checker.ts | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index d409d1ea2fa..8a833123dcb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -422,27 +422,33 @@ module ts {
                     case SyntaxKind.SetAccessor:
                     case SyntaxKind.FunctionDeclaration:
                     case SyntaxKind.ArrowFunction:
-                        if (name === "arguments") {
-                            result = argumentsSymbol;
-                            break loop;
+                        if (meaning & SymbolFlags.Value) {
+                            if (name === "arguments") {
+                                result = argumentsSymbol;
+                                break loop;
+                            }
                         }
                         break;
                     case SyntaxKind.FunctionExpression:
-                        if (name === "arguments") {
-                            result = argumentsSymbol;
-                            break loop;
-                        }
-                        let functionName = (<FunctionExpression>location).name;
-                        if (functionName && name === functionName.text) {
-                            result = location.symbol;
-                            break loop;
+                        if (meaning & SymbolFlags.Value) {
+                            if (name === "arguments") {
+                                result = argumentsSymbol;
+                                break loop;
+                            }
+                            let functionName = (<FunctionExpression>location).name;
+                            if (functionName && name === functionName.text) {
+                                result = location.symbol;
+                                break loop;
+                            }
                         }
                         break;
                     case SyntaxKind.ClassExpression:
-                        let className = (<ClassExpression>location).name;
-                        if (className && name === className.text) {
-                            result = location.symbol;
-                            break loop;
+                        if (meaning & (SymbolFlags.Value | SymbolFlags.Type)) {
+                            let className = (<ClassExpression>location).name;
+                            if (className && name === className.text) {
+                                result = location.symbol;
+                                break loop;
+                            }
                         }
                         break;
                     case SyntaxKind.Decorator: