@@ -221,7 +221,7 @@ export function getDefinitionAtPosition(program: Program, sourceFile: SourceFile
221221 if ( node . parent . kind === SyntaxKind . ShorthandPropertyAssignment ) {
222222 const shorthandSymbol = typeChecker . getShorthandAssignmentValueSymbol ( symbol . valueDeclaration ) ;
223223 const definitions = shorthandSymbol ?. declarations ? shorthandSymbol . declarations . map ( decl => createDefinitionInfo ( decl , typeChecker , shorthandSymbol , node , /*unverified*/ false , failedAliasResolution ) ) : emptyArray ;
224- return concatenate ( definitions , getDefinitionFromObjectLiteralElement ( typeChecker , node ) || emptyArray ) ;
224+ return concatenate ( definitions , getDefinitionFromObjectLiteralElement ( typeChecker , node ) ) ;
225225 }
226226
227227 // If the node is the name of a BindingElement within an ObjectBindingPattern instead of just returning the
@@ -245,7 +245,8 @@ export function getDefinitionAtPosition(program: Program, sourceFile: SourceFile
245245 } ) ;
246246 }
247247
248- return concatenate ( fileReferenceDefinition , getDefinitionFromObjectLiteralElement ( typeChecker , node ) || getDefinitionFromSymbol ( typeChecker , symbol , node , failedAliasResolution ) ) ;
248+ const objectLiteralElementDefinition = getDefinitionFromObjectLiteralElement ( typeChecker , node ) ;
249+ return concatenate ( fileReferenceDefinition , objectLiteralElementDefinition . length ? objectLiteralElementDefinition : getDefinitionFromSymbol ( typeChecker , symbol , node , failedAliasResolution ) ) ;
249250}
250251
251252/**
@@ -278,6 +279,7 @@ function getDefinitionFromObjectLiteralElement(typeChecker: TypeChecker, node: N
278279 getDefinitionFromSymbol ( typeChecker , propertySymbol , node ) ) ;
279280 }
280281 }
282+ return emptyArray ;
281283}
282284
283285function getDefinitionFromOverriddenMember ( typeChecker : TypeChecker , node : Node ) {
@@ -366,7 +368,7 @@ export function getTypeDefinitionAtPosition(typeChecker: TypeChecker, sourceFile
366368 const typeDefinitions = fromReturnType && fromReturnType . length !== 0 ? fromReturnType : definitionFromType ( typeAtLocation , typeChecker , node , failedAliasResolution ) ;
367369 return typeDefinitions . length ? typeDefinitions
368370 : ! ( symbol . flags & SymbolFlags . Value ) && symbol . flags & SymbolFlags . Type ? getDefinitionFromSymbol ( typeChecker , skipAlias ( symbol , typeChecker ) , node , failedAliasResolution )
369- : undefined ;
371+ : undefined ;
370372}
371373
372374function definitionFromType ( type : Type , checker : TypeChecker , node : Node , failedAliasResolution : boolean | undefined ) : readonly DefinitionInfo [ ] {
0 commit comments