From 9125aa5192071774172c89d29a647dd97e46eeea Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 26 Feb 2015 17:26:33 -0800
Subject: [PATCH] Rename method.

---
 src/compiler/checker.ts   | 6 +++---
 src/compiler/utilities.ts | 6 +-----
 src/services/services.ts  | 4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 196871786e5..918090b3a94 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -10190,7 +10190,7 @@ module ts {
         }
 
         function getSymbolOfEntityNameOrPropertyAccessExpression(entityName: EntityName | PropertyAccessExpression): Symbol {
-            if (isDeclarationOrCatchVariableName(entityName)) {
+            if (isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
 
@@ -10255,7 +10255,7 @@ module ts {
                 return undefined;
             }
 
-            if (isDeclarationOrCatchVariableName(node)) {
+            if (isDeclarationName(node)) {
                 // This is a declaration, call getSymbolOfNode
                 return getSymbolOfNode(node.parent);
             }
@@ -10351,7 +10351,7 @@ module ts {
                 return getTypeOfSymbol(symbol);
             }
 
-            if (isDeclarationOrCatchVariableName(node)) {
+            if (isDeclarationName(node)) {
                 var symbol = getSymbolInfo(node);
                 return symbol && getTypeOfSymbol(symbol);
             }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index dde0cece723..01def791c02 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -753,7 +753,7 @@ module ts {
     }
 
     // True if the given identifier, string literal, or number literal is the name of a declaration node
-    export function isDeclarationOrCatchVariableName(name: Node): boolean {
+    export function isDeclarationName(name: Node): boolean {
         if (name.kind !== SyntaxKind.Identifier && name.kind !== SyntaxKind.StringLiteral && name.kind !== SyntaxKind.NumericLiteral) {
             return false;
         }
@@ -769,10 +769,6 @@ module ts {
             return (<Declaration>parent).name === name;
         }
 
-        //if (parent.kind === SyntaxKind.CatchClause) {
-        //    return (<CatchClause>parent).name === name;
-        //}
-
         return false;
     }
 
diff --git a/src/services/services.ts b/src/services/services.ts
index 5ee623fd3fa..c13ae22718b 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -4756,7 +4756,7 @@ module ts {
 
         /** A node is considered a writeAccess iff it is a name of a declaration or a target of an assignment */
         function isWriteAccess(node: Node): boolean {
-            if (node.kind === SyntaxKind.Identifier && isDeclarationOrCatchVariableName(node)) {
+            if (node.kind === SyntaxKind.Identifier && isDeclarationName(node)) {
                 return true;
             }
 
@@ -4918,7 +4918,7 @@ module ts {
             else if (isInRightSideOfImport(node)) {
                 return getMeaningFromRightHandSideOfImportEquals(node);
             }
-            else if (isDeclarationOrCatchVariableName(node)) {
+            else if (isDeclarationName(node)) {
                 return getMeaningFromDeclaration(node.parent);
             }
             else if (isTypeReference(node)) {