Skip to content

Commit 9125aa5

Browse files
Rename method.
1 parent 11772e7 commit 9125aa5

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

src/compiler/checker.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10190,7 +10190,7 @@ module ts {
1019010190
}
1019110191

1019210192
function getSymbolOfEntityNameOrPropertyAccessExpression(entityName: EntityName | PropertyAccessExpression): Symbol {
10193-
if (isDeclarationOrCatchVariableName(entityName)) {
10193+
if (isDeclarationName(entityName)) {
1019410194
return getSymbolOfNode(entityName.parent);
1019510195
}
1019610196

@@ -10255,7 +10255,7 @@ module ts {
1025510255
return undefined;
1025610256
}
1025710257

10258-
if (isDeclarationOrCatchVariableName(node)) {
10258+
if (isDeclarationName(node)) {
1025910259
// This is a declaration, call getSymbolOfNode
1026010260
return getSymbolOfNode(node.parent);
1026110261
}
@@ -10351,7 +10351,7 @@ module ts {
1035110351
return getTypeOfSymbol(symbol);
1035210352
}
1035310353

10354-
if (isDeclarationOrCatchVariableName(node)) {
10354+
if (isDeclarationName(node)) {
1035510355
var symbol = getSymbolInfo(node);
1035610356
return symbol && getTypeOfSymbol(symbol);
1035710357
}

src/compiler/utilities.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ module ts {
753753
}
754754

755755
// 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 {
757757
if (name.kind !== SyntaxKind.Identifier && name.kind !== SyntaxKind.StringLiteral && name.kind !== SyntaxKind.NumericLiteral) {
758758
return false;
759759
}
@@ -769,10 +769,6 @@ module ts {
769769
return (<Declaration>parent).name === name;
770770
}
771771

772-
//if (parent.kind === SyntaxKind.CatchClause) {
773-
// return (<CatchClause>parent).name === name;
774-
//}
775-
776772
return false;
777773
}
778774

src/services/services.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4756,7 +4756,7 @@ module ts {
47564756

47574757
/** A node is considered a writeAccess iff it is a name of a declaration or a target of an assignment */
47584758
function isWriteAccess(node: Node): boolean {
4759-
if (node.kind === SyntaxKind.Identifier && isDeclarationOrCatchVariableName(node)) {
4759+
if (node.kind === SyntaxKind.Identifier && isDeclarationName(node)) {
47604760
return true;
47614761
}
47624762

@@ -4918,7 +4918,7 @@ module ts {
49184918
else if (isInRightSideOfImport(node)) {
49194919
return getMeaningFromRightHandSideOfImportEquals(node);
49204920
}
4921-
else if (isDeclarationOrCatchVariableName(node)) {
4921+
else if (isDeclarationName(node)) {
49224922
return getMeaningFromDeclaration(node.parent);
49234923
}
49244924
else if (isTypeReference(node)) {

0 commit comments

Comments
 (0)