Merge branch 'main'

microsoft · sandersn · Nov 16, 2023 · Apr 1, 2023 · Apr 1, 2023 · Apr 1, 2023
commit f30827c0abe0068274de3e639da807fea60d1f82
diff --git a/src/testRunner/unittests/tsserver/completions.ts b/src/testRunner/unittests/tsserver/completions.ts
@@ -29,7 +29,9 @@ describe("unittests:: tsserver:: completions", () => {
         };
 
         const host = createServerHost([aTs, bTs, tsconfig]);
-        const session = createSession(host, { logger: createLoggerWithInMemoryLogs(host) });
+        const session = createSession(host, {
+            logger: createLoggerWithInMemoryLogs(host),
+        });
         openFilesForSession([aTs, bTs], session);
 
         const requestLocation: ts.server.protocol.FileLocationRequestArgs = {
@@ -51,7 +53,17 @@ describe("unittests:: tsserver:: completions", () => {
             command: ts.server.protocol.CommandTypes.CompletionDetails,
             arguments: {
                 ...requestLocation,
-                entryNames: [{ name: "foo", source: "/a", data: { exportName: "foo", fileName: "/a.ts", exportMapKey } }],
+                entryNames: [
+                    {
+                        name: "foo",
+                        source: "/a",
+                        data: {
+                            exportName: "foo",
+                            fileName: "/a.ts",
+                            exportMapKey,
+                        },
+                    },
+                ],
             },
         });
 
@@ -63,7 +75,17 @@ describe("unittests:: tsserver:: completions", () => {
             command: ts.server.protocol.CommandTypes.CompletionDetailsFull,
             arguments: {
                 ...requestLocation,
-                entryNames: [{ name: "foo", source: "/a", data: { exportName: "foo", fileName: "/a.ts", exportMapKey } }],
+                entryNames: [
+                    {
+                        name: "foo",
+                        source: "/a",
+                        data: {
+                            exportName: "foo",
+                            fileName: "/a.ts",
+                            exportMapKey,
+                        },
+                    },
+                ],
             },
         });
         baselineTsserverLogs("completions", "works", session);
@@ -198,6 +220,10 @@ export interface BrowserRouterProps {
                 includeInsertTextCompletions: true,
             },
         });
-        baselineTsserverLogs("completions", "works when files are included from two different drives of windows", session);
+        baselineTsserverLogs(
+            "completions",
+            "works when files are included from two different drives of windows",
+            session,
+        );
     });
 });
diff --git a/tests/baselines/reference/jsFileImportNoTypes.baseline b/tests/baselines/reference/jsFileImportNoTypes.baseline
@@ -1,3 +1,4 @@
+// === Completions ===
 === /a.js ===
 // import {  } from './declarations.ts'
 //          ^

diff --git a/...sserver/completions/works-when-files-are-included-from-two-different-drives-of-windows.js b/...sserver/completions/works-when-files-are-included-from-two-different-drives-of-windows.js
@@ -639,7 +639,7 @@ Info seq  [hh:mm:ss:mss] response:
             "source": "e:/myproject/node_modules/@types/react/index",
             "data": {
               "exportName": "Component",
-              "exportMapKey": "Component|*|",
+              "exportMapKey": "9 * Component ",
               "fileName": "e:/myproject/node_modules/@types/react/index.d.ts"
             }
           },