From 38dce094633eeea8b4fac807075ee84e02c9b1f5 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 18 Nov 2014 10:27:31 -0800 Subject: [PATCH] Address code review --- src/services/services.ts | 8 ++++---- tests/cases/fourslash/goToDefinitionShorthandProperty.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/services/services.ts b/src/services/services.ts index 9345d84b7c1..12f4c49dd56 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3353,10 +3353,10 @@ module ts { // Because name in short-hand property assignment has two different meanings: property name and property value, // using go-to-definition at such position should go to the variable declaration of the property value rather than - // go to the declaration of the property name (in this case stay at the same position). However, if go-to-defition - // is performed at the location of property accessing, we would like to go to defition of the property in the short-hand - // assignment. Such case is handled as normal by below code section. - if (node.parent.kind === SyntaxKind.ShorthandPropertyAssignment && !(symbol.flags & SymbolFlags.Transient)) { + // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition + // is performed at the location of property access, we would like to go to definition of the property in the short-hand + // assignment. This case and others are handled by the following code. + if (node.parent.kind === SyntaxKind.ShorthandPropertyAssignment) { var shorthandSymbol = typeInfoResolver.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); var shorthandDeclarations = shorthandSymbol.getDeclarations(); var shorthandSymbolKind = getSymbolKind(shorthandSymbol, typeInfoResolver); diff --git a/tests/cases/fourslash/goToDefinitionShorthandProperty.ts b/tests/cases/fourslash/goToDefinitionShorthandProperty.ts index 9fa1be22ffd..7f0855e524d 100644 --- a/tests/cases/fourslash/goToDefinitionShorthandProperty.ts +++ b/tests/cases/fourslash/goToDefinitionShorthandProperty.ts @@ -3,11 +3,11 @@ //// var /*valueDeclaration1*/name = "hello"; //// var /*valueDeclaration2*/id = 100000; //// declare var /*valueDeclaration3*/id; -//// var obj = {/*valueDefition1*/name, /*valueDefinition2*/id}; +//// var obj = {/*valueDefinition1*/name, /*valueDefinition2*/id}; //// obj./*valueReference1*/name; //// obj./*valueReference2*/id; -goTo.marker("valueDefition1"); +goTo.marker("valueDefinition1"); goTo.definition(); verify.caretAtMarker("valueDeclaration1");