Rename method.

CyrusNajmabadi · CyrusNajmabadi · commit 9125aa519207 · 2015-02-26T17:26:33.000-08:00
diff --git 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
@@ -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
@@ -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)) {

Original file line number	Diff line number	Diff line change
`@@ -10190,7 +10190,7 @@ module ts {`
`10190`	`10190`	`}`
`10191`	`10191`
`10192`	`10192`	`function getSymbolOfEntityNameOrPropertyAccessExpression(entityName: EntityName \| PropertyAccessExpression): Symbol {`
`10193`		`- if (isDeclarationOrCatchVariableName(entityName)) {`
	`10193`	`+ if (isDeclarationName(entityName)) {`
`10194`	`10194`	`return getSymbolOfNode(entityName.parent);`
`10195`	`10195`	`}`
`10196`	`10196`
`@@ -10255,7 +10255,7 @@ module ts {`
`10255`	`10255`	`return undefined;`
`10256`	`10256`	`}`
`10257`	`10257`
`10258`		`- if (isDeclarationOrCatchVariableName(node)) {`
	`10258`	`+ if (isDeclarationName(node)) {`
`10259`	`10259`	`// This is a declaration, call getSymbolOfNode`
`10260`	`10260`	`return getSymbolOfNode(node.parent);`
`10261`	`10261`	`}`
`@@ -10351,7 +10351,7 @@ module ts {`
`10351`	`10351`	`return getTypeOfSymbol(symbol);`
`10352`	`10352`	`}`
`10353`	`10353`
`10354`		`- if (isDeclarationOrCatchVariableName(node)) {`
	`10354`	`+ if (isDeclarationName(node)) {`
`10355`	`10355`	`var symbol = getSymbolInfo(node);`
`10356`	`10356`	`return symbol && getTypeOfSymbol(symbol);`
`10357`	`10357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@ module ts {`
`753`	`753`	`}`
`754`	`754`
`755`	`755`	`// True if the given identifier, string literal, or number literal is the name of a declaration node`
`756`		`- export function isDeclarationOrCatchVariableName(name: Node): boolean {`
	`756`	`+ export function isDeclarationName(name: Node): boolean {`
`757`	`757`	`if (name.kind !== SyntaxKind.Identifier && name.kind !== SyntaxKind.StringLiteral && name.kind !== SyntaxKind.NumericLiteral) {`
`758`	`758`	`return false;`
`759`	`759`	`}`
`@@ -769,10 +769,6 @@ module ts {`
`769`	`769`	`return (<Declaration>parent).name === name;`
`770`	`770`	`}`
`771`	`771`
`772`		`- //if (parent.kind === SyntaxKind.CatchClause) {`
`773`		`- // return (<CatchClause>parent).name === name;`
`774`		`- //}`
`775`		`-`
`776`	`772`	`return false;`
`777`	`773`	`}`
`778`	`774`
Original file line number	Diff line number	Diff line change
`@@ -4756,7 +4756,7 @@ module ts {`
`4756`	`4756`
`4757`	`4757`	`/** A node is considered a writeAccess iff it is a name of a declaration or a target of an assignment */`
`4758`	`4758`	`function isWriteAccess(node: Node): boolean {`
`4759`		`- if (node.kind === SyntaxKind.Identifier && isDeclarationOrCatchVariableName(node)) {`
	`4759`	`+ if (node.kind === SyntaxKind.Identifier && isDeclarationName(node)) {`
`4760`	`4760`	`return true;`
`4761`	`4761`	`}`
`4762`	`4762`
`@@ -4918,7 +4918,7 @@ module ts {`
`4918`	`4918`	`else if (isInRightSideOfImport(node)) {`
`4919`	`4919`	`return getMeaningFromRightHandSideOfImportEquals(node);`
`4920`	`4920`	`}`
`4921`		`- else if (isDeclarationOrCatchVariableName(node)) {`
	`4921`	`+ else if (isDeclarationName(node)) {`
`4922`	`4922`	`return getMeaningFromDeclaration(node.parent);`
`4923`	`4923`	`}`
`4924`	`4924`	`else if (isTypeReference(node)) {`