Skip to content

Commit 25fcbe2

Browse files
committedFeb 7, 2015
Change certain hasDynamicName checks to check the SyntaxKind instead
1 parent 9cb38fb commit 25fcbe2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed
 

‎src/compiler/checker.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -7243,7 +7243,7 @@ module ts {
72437243
}
72447244

72457245
function checkPropertyAssignment(node: PropertyAssignment, contextualMapper?: TypeMapper): Type {
7246-
if (hasDynamicName(node)) {
7246+
if (node.name.kind === SyntaxKind.ComputedPropertyName) {
72477247
checkComputedPropertyName(<ComputedPropertyName>node.name);
72487248
}
72497249

@@ -7254,7 +7254,7 @@ module ts {
72547254
// Grammar checking
72557255
checkGrammarMethod(node);
72567256

7257-
if (hasDynamicName(node)) {
7257+
if (node.name.kind === SyntaxKind.ComputedPropertyName) {
72587258
checkComputedPropertyName(<ComputedPropertyName>node.name);
72597259
}
72607260

@@ -8066,12 +8066,13 @@ module ts {
80668066
function checkFunctionLikeDeclaration(node: FunctionLikeDeclaration): void {
80678067
checkSignatureDeclaration(node);
80688068

8069-
if (hasDynamicName(node)) {
8069+
if (node.name.kind === SyntaxKind.ComputedPropertyName) {
80708070
// This check will account for methods in class/interface declarations,
80718071
// as well as accessors in classes/object literals
80728072
checkComputedPropertyName(<ComputedPropertyName>node.name);
80738073
}
8074-
else {
8074+
8075+
if (!hasDynamicName(node)) {
80758076
// first we want to check the local symbol that contain this declaration
80768077
// - if node.localSymbol !== undefined - this is current declaration is exported and localSymbol points to the local symbol
80778078
// - if node.localSymbol === undefined - this node is non-exported so we can just pick the result of getSymbolOfNode
@@ -8300,12 +8301,11 @@ module ts {
83008301
function checkVariableLikeDeclaration(node: VariableLikeDeclaration) {
83018302
checkSourceElement(node.type);
83028303
// For a computed property, just check the initializer and exit
8303-
if (hasDynamicName(node)) {
8304+
if (node.name.kind === SyntaxKind.ComputedPropertyName) {
83048305
checkComputedPropertyName(<ComputedPropertyName>node.name);
83058306
if (node.initializer) {
83068307
checkExpressionCached(node.initializer);
83078308
}
8308-
return;
83098309
}
83108310
// For a binding pattern, check contained binding elements
83118311
if (isBindingPattern(node.name)) {

0 commit comments

Comments
 (0)