Merge pull request microsoft#31946 from orta/30246

Orta · web-flow · commit 78e03848a4f0 · 2019-08-02T10:29:34.000-04:00
Don't let the additional property setting on an object show up as a definition to tsserver
diff --git a/src/services/goToDefinition.ts b/src/services/goToDefinition.ts
@@ -233,20 +233,23 @@ namespace ts.GoToDefinition {
     }
 
     function getDefinitionFromSymbol(typeChecker: TypeChecker, symbol: Symbol, node: Node): DefinitionInfo[] | undefined {
-        return getConstructSignatureDefinition() || getCallSignatureDefinition() || map(symbol.declarations, declaration => createDefinitionInfo(declaration, typeChecker, symbol, node));
+        // There are cases when you extend a function by adding properties to it afterwards,
+        // we want to strip those extra properties
+        const filteredDeclarations = filter(symbol.declarations, d =>  !isAssignmentDeclaration(d) || d === symbol.valueDeclaration) || undefined;
+        return getConstructSignatureDefinition() || getCallSignatureDefinition() || map(filteredDeclarations, declaration => createDefinitionInfo(declaration, typeChecker, symbol, node));
 
         function getConstructSignatureDefinition(): DefinitionInfo[] | undefined {
             // Applicable only if we are in a new expression, or we are on a constructor declaration
             // and in either case the symbol has a construct signature definition, i.e. class
             if (symbol.flags & SymbolFlags.Class && (isNewExpressionTarget(node) || node.kind === SyntaxKind.ConstructorKeyword)) {
-                const cls = find(symbol.declarations, isClassLike) || Debug.fail("Expected declaration to have at least one class-like declaration");
+                const cls = find(filteredDeclarations, isClassLike) || Debug.fail("Expected declaration to have at least one class-like declaration");
                 return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
             }
         }
 
         function getCallSignatureDefinition(): DefinitionInfo[] | undefined {
             return isCallOrNewExpressionTarget(node) || isNameOfFunctionDeclaration(node)
-                ? getSignatureDefinition(symbol.declarations, /*selectConstructors*/ false)
+                ? getSignatureDefinition(filteredDeclarations, /*selectConstructors*/ false)
                 : undefined;
         }
 
diff --git a/tests/cases/fourslash/goToDefinitionPropertyAssignment.ts b/tests/cases/fourslash/goToDefinitionPropertyAssignment.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+//// export const /*FunctionResult*/Component = () => { return "OK"}
+//// Component./*PropertyResult*/displayName = 'Component'
+////
+//// [|/*FunctionClick*/Component|]
+////
+//// Component.[|/*PropertyClick*/displayName|]
+
+verify.goToDefinition("FunctionClick", "FunctionResult")
+verify.goToDefinition("PropertyClick", "PropertyResult")

Original file line number	Diff line number	Diff line change
`@@ -233,20 +233,23 @@ namespace ts.GoToDefinition {`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`function getDefinitionFromSymbol(typeChecker: TypeChecker, symbol: Symbol, node: Node): DefinitionInfo[] \| undefined {`
`236`		`- return getConstructSignatureDefinition() \|\| getCallSignatureDefinition() \|\| map(symbol.declarations, declaration => createDefinitionInfo(declaration, typeChecker, symbol, node));`
	`236`	`+ // There are cases when you extend a function by adding properties to it afterwards,`
	`237`	`+ // we want to strip those extra properties`
	`238`	`+ const filteredDeclarations = filter(symbol.declarations, d => !isAssignmentDeclaration(d) \|\| d === symbol.valueDeclaration) \|\| undefined;`
	`239`	`+ return getConstructSignatureDefinition() \|\| getCallSignatureDefinition() \|\| map(filteredDeclarations, declaration => createDefinitionInfo(declaration, typeChecker, symbol, node));`
`237`	`240`
`238`	`241`	`function getConstructSignatureDefinition(): DefinitionInfo[] \| undefined {`
`239`	`242`	`// Applicable only if we are in a new expression, or we are on a constructor declaration`
`240`	`243`	`// and in either case the symbol has a construct signature definition, i.e. class`
`241`	`244`	`if (symbol.flags & SymbolFlags.Class && (isNewExpressionTarget(node) \|\| node.kind === SyntaxKind.ConstructorKeyword)) {`
`242`		`- const cls = find(symbol.declarations, isClassLike) \|\| Debug.fail("Expected declaration to have at least one class-like declaration");`
	`245`	`+ const cls = find(filteredDeclarations, isClassLike) \|\| Debug.fail("Expected declaration to have at least one class-like declaration");`
`243`	`246`	`return getSignatureDefinition(cls.members, /selectConstructors/ true);`
`244`	`247`	`}`
`245`	`248`	`}`
`246`	`249`
`247`	`250`	`function getCallSignatureDefinition(): DefinitionInfo[] \| undefined {`
`248`	`251`	`return isCallOrNewExpressionTarget(node) \|\| isNameOfFunctionDeclaration(node)`
`249`		`- ? getSignatureDefinition(symbol.declarations, /selectConstructors/ false)`
	`252`	`+ ? getSignatureDefinition(filteredDeclarations, /selectConstructors/ false)`
`250`	`253`	`: undefined;`
`251`	`254`	`}`
`252`	`255`