Add source mappings for serialized properties with available declaration

src/compiler/checker.ts

@@ -992,6 +992,7 @@ import {
     setNodeFlags,
     setOriginalNode,
     setParent,
+    setSourceMapRange,
     setSyntheticLeadingComments,
     setTextRange as setTextRangeWorker,
     setTextRangePosEnd,
@@ -8575,12 +8576,16 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             const stringNamed = !!length(symbol.declarations) && every(symbol.declarations, isStringNamed);
             const singleQuote = !!length(symbol.declarations) && every(symbol.declarations, isSingleQuotedStringNamed);
             const isMethod = !!(symbol.flags & SymbolFlags.Method);
-            const fromNameType = getPropertyNameNodeForSymbolFromNameType(symbol, context, singleQuote, stringNamed, isMethod);
-            if (fromNameType) {
-                return fromNameType;
+            let propertyNameNode = getPropertyNameNodeForSymbolFromNameType(symbol, context, singleQuote, stringNamed, isMethod);
+            if (!propertyNameNode) {
+                const rawName = unescapeLeadingUnderscores(symbol.escapedName);
+                propertyNameNode = createPropertyNameNodeForIdentifierOrLiteral(rawName, getEmitScriptTarget(compilerOptions), singleQuote, stringNamed, isMethod);
             }
-            const rawName = unescapeLeadingUnderscores(symbol.escapedName);
-            return createPropertyNameNodeForIdentifierOrLiteral(rawName, getEmitScriptTarget(compilerOptions), singleQuote, stringNamed, isMethod);
+            const declaration = symbol.valueDeclaration ?? symbol.declarations?.[0];
+            if (declaration && (isPropertyAssignment(declaration) || isShorthandPropertyAssignment(declaration) || isMethodDeclaration(declaration) || isMethodSignature(declaration) || isPropertySignature(declaration) || isPropertyDeclaration(declaration) || isGetOrSetAccessorDeclaration(declaration))) {
+                setSourceMapRange(propertyNameNode, declaration.name);
+            }
+            return propertyNameNode;
         }
 
         // See getNameForSymbolFromNameType for a stringy equivalent

src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts

@@ -1,10 +1,12 @@
 import * as ts from "../../_namespaces/ts.js";
+import { dedent } from "../../_namespaces/Utils.js";
 import { jsonToReadableText } from "../helpers.js";
 import {
     baselineTsserverLogs,
     closeFilesForSession,
     createHostWithSolutionBuild,
     openFilesForSession,
+    protocolFileLocationFromSubstring,
     TestSession,
     TestSessionRequest,
 } from "../helpers/tsserver.js";
@@ -14,11 +16,11 @@ import {
 } from "../helpers/virtualFileSystemWithWatch.js";
 
 describe("unittests:: tsserver:: projectReferencesSourcemap:: with project references and tsbuild source map", () => {
-    const dependecyLocation = `/user/username/projects/myproject/dependency`;
-    const dependecyDeclsLocation = `/user/username/projects/myproject/decls`;
+    const dependencyLocation = `/user/username/projects/myproject/dependency`;
+    const dependencyDeclsLocation = `/user/username/projects/myproject/decls`;
     const mainLocation = `/user/username/projects/myproject/main`;
     const dependencyTs: File = {
-        path: `${dependecyLocation}/FnS.ts`,
+        path: `${dependencyLocation}/FnS.ts`,
         content: `export function fn1() { }
 export function fn2() { }
 export function fn3() { }
@@ -27,7 +29,7 @@ export function fn5() { }
 `,
     };
     const dependencyConfig: File = {
-        path: `${dependecyLocation}/tsconfig.json`,
+        path: `${dependencyLocation}/tsconfig.json`,
         content: jsonToReadableText({ compilerOptions: { composite: true, declarationMap: true, declarationDir: "../decls" } }),
     };
 
@@ -64,8 +66,8 @@ fn5();
         path: `/user/username/projects/myproject/random/tsconfig.json`,
         content: "{}",
     };
-    const dtsLocation = `${dependecyDeclsLocation}/FnS.d.ts`;
-    const dtsMapLocation = `${dependecyDeclsLocation}/FnS.d.ts.map`;
+    const dtsLocation = `${dependencyDeclsLocation}/FnS.d.ts`;
+    const dtsMapLocation = `${dependencyDeclsLocation}/FnS.d.ts.map`;
 
     const files = [dependencyTs, dependencyConfig, mainTs, mainConfig, randomFile, randomConfig];
 
@@ -142,7 +144,7 @@ fn5();
     }
 
     type OnHostCreate = (host: TestServerHost) => void;
-    function createSessionWithoutProjectReferences(onHostCreate?: OnHostCreate) {
+    function createSessionWithoutProjectReferences(files: File[], onHostCreate?: OnHostCreate) {
         const host = createHostWithSolutionBuild(files, [mainConfig.path]);
         // Erase project reference
         writeConfigWithoutProjectReferences(host);
@@ -159,13 +161,13 @@ fn5();
         );
     }
 
-    function createSessionWithProjectReferences(onHostCreate?: OnHostCreate) {
+    function createSessionWithProjectReferences(files: File[], onHostCreate?: OnHostCreate) {
         const host = createHostWithSolutionBuild(files, [mainConfig.path]);
         onHostCreate?.(host);
         return new TestSession(host);
     }
 
-    function createSessionWithDisabledProjectReferences(onHostCreate?: OnHostCreate) {
+    function createSessionWithDisabledProjectReferences(files: File[], onHostCreate?: OnHostCreate) {
         const host = createHostWithSolutionBuild(files, [mainConfig.path]);
         // Erase project reference
         WithDisabledProjectReferences(host);
@@ -227,16 +229,16 @@ fn5();
         });
     }
 
-    function createSession(type: SessionType, onHostCreate?: OnHostCreate) {
-        return type === SessionType.NoReference ? createSessionWithoutProjectReferences(onHostCreate) :
-            type === SessionType.ProjectReference ? createSessionWithProjectReferences(onHostCreate) :
+    function createSession(type: SessionType, files: File[], onHostCreate?: OnHostCreate) {
+        return type === SessionType.NoReference ? createSessionWithoutProjectReferences(files, onHostCreate) :
+            type === SessionType.ProjectReference ? createSessionWithProjectReferences(files, onHostCreate) :
             type === SessionType.DisableSourceOfProjectReferenceRedirect ?
-            createSessionWithDisabledProjectReferences(onHostCreate) :
+            createSessionWithDisabledProjectReferences(files, onHostCreate) :
             ts.Debug.assertNever(type);
     }
 
     function setup(type: SessionType, openFiles: readonly File[], action: Action | Action[], max?: number, onHostCreate?: OnHostCreate) {
-        const session = createSession(type, onHostCreate);
+        const session = createSession(type, files, onHostCreate);
         openFilesForSession(openFiles, session);
         runActions(session, action, max);
         return session;
@@ -510,7 +512,7 @@ fn5();
 
         verifyForAllSessionTypes(type => {
             it("goto Definition in usage and rename locations, deleting config file", () => {
-                const session = createSession(type);
+                const session = createSession(type, files);
                 openFilesForSession([mainTs], session);
                 session.executeCommandSeq<ts.server.protocol.RenameRequest>({
                     command: ts.server.protocol.CommandTypes.Rename,
@@ -549,4 +551,51 @@ fn5();
             });
         }, /*options*/ undefined);
     });
+
+    verifyForAllSessionTypes(type => {
+        it("goto Definition in usage of a property with mapped type origin", () => {
+            const dependencyTs: File = {
+                path: `${dependencyLocation}/api.ts`,
+                content: dedent`
+                    type ValidateShape<T> = {
+                        [K in keyof T]: T[K];
+                    };
+
+                    function getApi<T>(arg: ValidateShape<T>) {
+                        function createCaller<T>(arg: T): () => {
+                            [K in keyof T]: () => T[K];
+                        } {
+                            return null as any;
+                        }
+                        return {
+                            createCaller: createCaller(arg),
+                        };
+                    }
+
+                    const obj = getApi({
+                        foo: 1,
+                        bar: "",
+                    });
+
+                    export const createCaller = obj.createCaller;
+                `,
+            };
+            const mainTs: File = {
+                path: `${mainLocation}/main.ts`,
+                content: dedent`
+                    import { createCaller } from "../decls/api";
+                    const caller = createCaller();
+                    caller.foo;
+                `,
+            };
+            const files = [dependencyTs, dependencyConfig, mainTs, mainConfig];
+            const session = createSession(type, files);
+            openFilesForSession([mainTs], session);
+            session.executeCommandSeq<ts.server.protocol.DefinitionAndBoundSpanRequest>({
+                command: ts.server.protocol.CommandTypes.DefinitionAndBoundSpan,
+                arguments: protocolFileLocationFromSubstring(mainTs, "foo"),
+            });
+            baselineTsserverLogs("projectReferencesSourcemap", `dependencyAndUsage/${type}/goto Definition in usage of a property with mapped type origin`, session);
+        });
+    }, /*options*/ undefined);
 });

tests/baselines/reference/declarationMapsMultifile.sourcemap.txt

@@ -62,20 +62,27 @@ sourceFile:a.ts
 1 >Emitted(4, 6) Source(2, 27) + SourceIndex(0)
 ---
 >>>        b: number;
+1->^^^^^^^^
+2 >        ^
+1->) {
+  >        return {
+2 >        b
+1->Emitted(5, 9) Source(3, 17) + SourceIndex(0)
+2 >Emitted(5, 10) Source(3, 18) + SourceIndex(0)
+---
 >>>    };
 >>>    static make(): Foo;
-1->^^^^
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^^^^
-1->) {
-  >        return {b: x.a};
+1 >: x.a};
   >    }
   >    
 2 >    static
 3 >           
 4 >           make
-1->Emitted(7, 5) Source(5, 5) + SourceIndex(0)
+1 >Emitted(7, 5) Source(5, 5) + SourceIndex(0)
 2 >Emitted(7, 11) Source(5, 11) + SourceIndex(0)
 3 >Emitted(7, 12) Source(5, 12) + SourceIndex(0)
 4 >Emitted(7, 16) Source(5, 16) + SourceIndex(0)
@@ -166,11 +173,20 @@ sourceFile:index.ts
 4 >Emitted(3, 21) Source(6, 13) + SourceIndex(0)
 ---
 >>>    b: number;
+1 >^^^^
+2 >    ^
+1 >
+2 >    ;
+1 >Emitted(4, 5) Source(4, 19) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 20) + SourceIndex(0)
+---
 >>>};
 1 >^
 2 > ^
 3 >  ^^^^^^^^^^^^^^^^^->
-1 > = c.doThing({a: 12})
+1 >
+  >
+  >export let x = c.doThing({a: 12})
 2 > ;
 1 >Emitted(5, 2) Source(6, 34) + SourceIndex(0)
 2 >Emitted(5, 3) Source(6, 35) + SourceIndex(0)

tests/baselines/reference/declarationMapsOutFile.sourcemap.txt

@@ -64,20 +64,27 @@ sourceFile:a.ts
 1 >Emitted(5, 10) Source(2, 27) + SourceIndex(0)
 ---
 >>>            b: number;
+1->^^^^^^^^^^^^
+2 >            ^
+1->) {
+  >        return {
+2 >            b
+1->Emitted(6, 13) Source(3, 17) + SourceIndex(0)
+2 >Emitted(6, 14) Source(3, 18) + SourceIndex(0)
+---
 >>>        };
 >>>        static make(): Foo;
-1->^^^^^^^^
+1 >^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^^^^
-1->) {
-  >        return {b: x.a};
+1 >: x.a};
   >    }
   >    
 2 >        static
 3 >               
 4 >               make
-1->Emitted(8, 9) Source(5, 5) + SourceIndex(0)
+1 >Emitted(8, 9) Source(5, 5) + SourceIndex(0)
 2 >Emitted(8, 15) Source(5, 11) + SourceIndex(0)
 3 >Emitted(8, 16) Source(5, 12) + SourceIndex(0)
 4 >Emitted(8, 20) Source(5, 16) + SourceIndex(0)
@@ -158,13 +165,22 @@ sourceFile:index.ts
 5 >Emitted(14, 17) Source(6, 13) + SourceIndex(1)
 ---
 >>>        b: number;
+1->^^^^^^^^
+2 >        ^
+1->
+2 >        ;
+1->Emitted(15, 9) Source(4, 19) + SourceIndex(1)
+2 >Emitted(15, 10) Source(4, 20) + SourceIndex(1)
+---
 >>>    };
-1->^^^^^
+1 >^^^^^
 2 >     ^
 3 >      ^^^^^^^^^^^^^^^^^->
-1-> = c.doThing({a: 12})
+1 >
+  >
+  >export let x = c.doThing({a: 12})
 2 >     ;
-1->Emitted(16, 6) Source(6, 34) + SourceIndex(1)
+1 >Emitted(16, 6) Source(6, 34) + SourceIndex(1)
 2 >Emitted(16, 7) Source(6, 35) + SourceIndex(1)
 ---
 >>>    export { c, Foo };