Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1664,6 +1664,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, CheckMode.Normal),
getCandidateSignaturesForStringLiteralCompletions,
getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, CheckMode.IsForSignatureHelp)),
getContextualOriginTypeForStringDefinition: (node: StringLiteralLike) => {
const contextualType = getContextualType(node, /*contextFlags*/ undefined);
return contextualType && contextualType.flags & TypeFlags.Union ? (contextualType as UnionType).origin : undefined;
},
getExpandedParameters,
hasEffectiveRestParameter,
containsArgumentsReference,
Expand Down
1 change: 1 addition & 0 deletions src/compiler/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4967,6 +4967,7 @@ export interface TypeChecker {
/** @internal */ getContextualTypeForObjectLiteralElement(element: ObjectLiteralElementLike): Type | undefined;
/** @internal */ getContextualTypeForArgumentAtIndex(call: CallLikeExpression, argIndex: number): Type | undefined;
/** @internal */ getContextualTypeForJsxAttribute(attribute: JsxAttribute | JsxSpreadAttribute): Type | undefined;
/** @internal */ getContextualOriginTypeForStringDefinition(node: StringLiteralLike): Type | undefined;
/** @internal */ isContextSensitive(node: Expression | MethodDeclaration | ObjectLiteralElementLike | JsxAttributeLike): boolean;
/** @internal */ getTypeOfPropertyOfContextualType(type: Type, name: __String): Type | undefined;

Expand Down
11 changes: 11 additions & 0 deletions src/services/goToDefinition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import {
isPropertyName,
isRightSideOfPropertyAccess,
isStaticModifier,
isStringLiteralLike,
isSwitchStatement,
isTypeAliasDeclaration,
isTypeReferenceNode,
Expand Down Expand Up @@ -186,6 +187,16 @@ export function getDefinitionAtPosition(program: Program, sourceFile: SourceFile
});
}

if (isStringLiteralLike(node)) {
const contextualOriginType = typeChecker.getContextualOriginTypeForStringDefinition(node);
if (contextualOriginType?.isIndexType() && !contextualOriginType.type.isUnion()) {
const symbol = contextualOriginType.type.getProperty(node.text);
if (symbol) {
return getDefinitionFromSymbol(typeChecker, symbol, node);
}
}
}

let { symbol, failedAliasResolution } = getSymbol(node, typeChecker, stopAtAlias);
let fallbackNode = node;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// === goToDefinition ===
// === /tests/cases/fourslash/goToDefinitionStringLiteral1.ts ===
// type User = {
// <|[|name|]: string;|>
// age: number;
// };
//
// declare function fn<T>(obj: T, key: keyof T): void;
//
// declare const user: User;
//
// fn(user, "name/*GOTO DEF*/");

// === Details ===
[
{
"kind": "property",
"name": "name",
"containerName": "__type",
"isLocal": false,
"isAmbient": false,
"unverified": false
}
]
14 changes: 14 additions & 0 deletions tests/cases/fourslash/goToDefinitionStringLiteral1.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/// <reference path='fourslash.ts'/>

//// type User = {
//// name: string;
//// age: number;
//// };
////
//// declare function fn<T>(obj: T, key: keyof T): void;
////
//// declare const user: User;
////
//// fn(user, "name/*1*/");

verify.baselineGoToDefinition("1");