tweak

Author: Andarist

src/services/goToDefinition.ts

@@ -316,11 +316,8 @@ function getDefinitionFromObjectLiteralElement(typeChecker: TypeChecker, node: N
         const contextualType = element && typeChecker.getContextualType(element.parent);
         if (contextualType) {
             let properties = getPropertySymbolsFromContextualType(element, typeChecker, contextualType, /*unionSymbolOk*/ false);
-            if (properties.length === 1) {
-                const declaration = properties[0].valueDeclaration;
-                const withoutNodeInferencesType = declaration && isObjectLiteralExpression(declaration.parent) && isObjectLiteralElementLike(declaration) && declaration.name === node ?
-                    typeChecker.getContextualType(element.parent, ContextFlags.IgnoreNodeInferences) :
-                    undefined;
+            if (some(properties, p => !!(p.valueDeclaration && isObjectLiteralExpression(p.valueDeclaration.parent) && isObjectLiteralElementLike(p.valueDeclaration) && p.valueDeclaration.name === node))) {
+                const withoutNodeInferencesType = typeChecker.getContextualType(element.parent, ContextFlags.IgnoreNodeInferences);
                 if (withoutNodeInferencesType) {
                     const withoutNodeInferencesProperties = getPropertySymbolsFromContextualType(element, typeChecker, withoutNodeInferencesType, /*unionSymbolOk*/ false);
                     if (withoutNodeInferencesProperties.length) {

tests/baselines/reference/goToDefinitionObjectLiteralProperties3.baseline.jsonc

@@ -0,0 +1,85 @@
+// === goToDefinition ===
+// === /tests/cases/fourslash/goToDefinitionObjectLiteralProperties3.ts ===
+// type A = {
+//   <|[|{| defId: 0 |}foo|]: unknown;|>
+// };
+// 
+// type B = {
+//   <|[|{| defId: 1 |}foo|]?: unknown;|>
+//   bar: unknown;
+// };
+// 
+// function test1(arg: A | B) {}
+// 
+// test1({
+//   foo/*GOTO DEF*/: 1,
+// });
+// 
+// function test2<T extends A>(arg: T | B) {}
+// --- (line: 17) skipped ---
+
+  // === Details ===
+  [
+   {
+    "defId": 0,
+    "kind": "property",
+    "name": "foo",
+    "containerName": "__type",
+    "isLocal": false,
+    "isAmbient": false,
+    "unverified": false
+   },
+   {
+    "defId": 1,
+    "kind": "property",
+    "name": "foo",
+    "containerName": "__type",
+    "isLocal": false,
+    "isAmbient": false,
+    "unverified": false
+   }
+  ]
+
+
+
+// === goToDefinition ===
+// === /tests/cases/fourslash/goToDefinitionObjectLiteralProperties3.ts ===
+// type A = {
+//   <|[|{| defId: 0 |}foo|]: unknown;|>
+// };
+// 
+// type B = {
+//   <|[|{| defId: 1 |}foo|]?: unknown;|>
+//   bar: unknown;
+// };
+// 
+// --- (line: 10) skipped ---
+
+// --- (line: 15) skipped ---
+// function test2<T extends A>(arg: T | B) {}
+// 
+// test2({
+//   foo/*GOTO DEF*/: 2,
+// });
+
+  // === Details ===
+  [
+   {
+    "defId": 0,
+    "kind": "property",
+    "name": "foo",
+    "containerName": "__type",
+    "isLocal": false,
+    "isAmbient": false,
+    "unverified": false
+   },
+   {
+    "defId": 1,
+    "kind": "property",
+    "name": "foo",
+    "containerName": "__type",
+    "isLocal": false,
+    "isAmbient": false,
+    "unverified": false
+   }
+  ]

tests/cases/fourslash/goToDefinitionObjectLiteralProperties3.ts

@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts'/>
+
+//// type A = {
+////   foo: unknown;
+//// };
+////
+//// type B = {
+////   foo?: unknown;
+////   bar: unknown;
+//// };
+////
+//// function test1(arg: A | B) {}
+////
+//// test1({
+////   foo/*1*/: 1,
+//// });
+////
+//// function test2<T extends A>(arg: T | B) {}
+////
+//// test2({
+////   foo/*2*/: 2,
+//// });
+
+verify.baselineGoToDefinition("1", "2");