Dont use sourcemap if it contains inlined sources (microsoft#36384)

sheetalkamat · web-flow · commit 502e711235d8 · 2020-01-29T11:21:42.000-08:00
Fixes microsoft#35014
diff --git a/src/services/sourcemaps.ts b/src/services/sourcemaps.ts
@@ -181,6 +181,9 @@ namespace ts {
             return undefined;
         }
 
+        // Dont support sourcemaps that contain inlined sources
+        if (map.sourcesContent && map.sourcesContent.some(isString)) return undefined;
+
         return createDocumentPositionMapper(host, map, mapFileName);
     }
 
diff --git a/src/testRunner/unittests/tsserver/declarationFileMaps.ts b/src/testRunner/unittests/tsserver/declarationFileMaps.ts
@@ -654,5 +654,63 @@ namespace ts.projectSystem {
             });
             assert.deepEqual<readonly protocol.FileCodeEdits[]>(response, []); // Should not change anything
         });
+
+        it("does not jump to source if inlined sources", () => {
+            const aDtsInlinedSources: RawSourceMap = {
+                ...aDtsMapContent,
+                sourcesContent: [aTs.content]
+            };
+            const aDtsMapInlinedSources: File = {
+                path: aDtsMap.path,
+                content: JSON.stringify(aDtsInlinedSources)
+            };
+            const host = createServerHost([aTs, aDtsMapInlinedSources, aDts, bTs, bDtsMap, bDts, userTs, dummyFile]);
+            const session = createSession(host);
+
+            openFilesForSession([userTs], session);
+            const service = session.getProjectService();
+            // If config file then userConfig project and bConfig project since it is referenced
+            checkNumberOfProjects(service, { inferredProjects: 1 });
+
+            // Inlined so does not jump to aTs
+            assert.deepEqual(
+                executeSessionRequest<protocol.DefinitionAndBoundSpanRequest, protocol.DefinitionAndBoundSpanResponse>(
+                    session,
+                    protocol.CommandTypes.DefinitionAndBoundSpan,
+                    protocolFileLocationFromSubstring(userTs, "fnA()")
+                ),
+                {
+                    textSpan: protocolTextSpanFromSubstring(userTs.content, "fnA"),
+                    definitions: [
+                        protocolFileSpanWithContextFromSubstring({
+                            file: aDts,
+                            text: "fnA",
+                            contextText: "export declare function fnA(): void;"
+                        })
+                    ],
+                }
+            );
+
+            // Not inlined, jumps to bTs
+            assert.deepEqual(
+                executeSessionRequest<protocol.DefinitionAndBoundSpanRequest, protocol.DefinitionAndBoundSpanResponse>(
+                    session,
+                    protocol.CommandTypes.DefinitionAndBoundSpan,
+                    protocolFileLocationFromSubstring(userTs, "fnB()")
+                ),
+                {
+                    textSpan: protocolTextSpanFromSubstring(userTs.content, "fnB"),
+                    definitions: [
+                        protocolFileSpanWithContextFromSubstring({
+                            file: bTs,
+                            text: "fnB",
+                            contextText: "export function fnB() {}"
+                        })
+                    ],
+                }
+            );
+
+            verifySingleInferredProject(session);
+        });
     });
 }

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,9 @@ namespace ts {`
`181`	`181`	`return undefined;`
`182`	`182`	`}`
`183`	`183`
	`184`	`+ // Dont support sourcemaps that contain inlined sources`
	`185`	`+ if (map.sourcesContent && map.sourcesContent.some(isString)) return undefined;`
	`186`	`+`
`184`	`187`	`return createDocumentPositionMapper(host, map, mapFileName);`
`185`	`188`	`}`
`186`	`189`