@@ -221,7 +221,7 @@ export function getDefinitionAtPosition(program: Program, sourceFile: SourceFile
221
221
if ( node . parent . kind === SyntaxKind . ShorthandPropertyAssignment ) {
222
222
const shorthandSymbol = typeChecker . getShorthandAssignmentValueSymbol ( symbol . valueDeclaration ) ;
223
223
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 ) ) ;
225
225
}
226
226
227
227
// 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
245
245
} ) ;
246
246
}
247
247
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 ) ) ;
249
250
}
250
251
251
252
/**
@@ -278,6 +279,7 @@ function getDefinitionFromObjectLiteralElement(typeChecker: TypeChecker, node: N
278
279
getDefinitionFromSymbol ( typeChecker , propertySymbol , node ) ) ;
279
280
}
280
281
}
282
+ return emptyArray ;
281
283
}
282
284
283
285
function getDefinitionFromOverriddenMember ( typeChecker : TypeChecker , node : Node ) {
@@ -366,7 +368,7 @@ export function getTypeDefinitionAtPosition(typeChecker: TypeChecker, sourceFile
366
368
const typeDefinitions = fromReturnType && fromReturnType . length !== 0 ? fromReturnType : definitionFromType ( typeAtLocation , typeChecker , node , failedAliasResolution ) ;
367
369
return typeDefinitions . length ? typeDefinitions
368
370
: ! ( symbol . flags & SymbolFlags . Value ) && symbol . flags & SymbolFlags . Type ? getDefinitionFromSymbol ( typeChecker , skipAlias ( symbol , typeChecker ) , node , failedAliasResolution )
369
- : undefined ;
371
+ : undefined ;
370
372
}
371
373
372
374
function definitionFromType ( type : Type , checker : TypeChecker , node : Node , failedAliasResolution : boolean | undefined ) : readonly DefinitionInfo [ ] {
0 commit comments