Fix windows language server integration (#285)

* enable tests on windows

* Use path instead of fsPath

* fix some diffs

* align output with linting

Author: Jephuff

src/language-server/__e2e__/configFileTypes.e2e.ts

@@ -21,14 +21,14 @@ test.each([
 ] as const)("%s with `type: '%s'`", async (project, moduleType) => {
   await writeFile(
     resolveRelativeToSampleWorkspace(`configFileTypes/${project}/package.json`),
-    JSON.stringify(
+    `${JSON.stringify(
       {
         name: "test",
         type: moduleType,
       },
       undefined,
       2,
-    ),
+    )}\n`,
     "utf-8",
   );
   await reloadService();

src/language-server/__e2e__/rover.e2e.ts

@@ -1,4 +1,3 @@
-import { test as origTest } from "@jest/globals";
 import { TextEditor } from "vscode";
 import {
   closeAllEditors,
@@ -11,12 +10,6 @@ import {
   getDefinitions,
 } from "./utils";
 
-let test = origTest.skip;
-if (process.platform === "win32") {
-  console.info("Skipping rover E2E tests in Windows");
-  test = origTest.skip;
-}
-
 let editor: TextEditor;
 let getPosition: GetPositionFn;
 beforeAll(async () => {
@@ -47,19 +40,19 @@ test("completion", async () => {
     "label": "@authenticated",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@deprecated",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@external",
   },
   {
     "detail": undefined,
     "label": "@inaccessible",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@override(…)",
   },
   {
@@ -71,39 +64,39 @@ test("completion", async () => {
     "label": "@provides(…)",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@requires(…)",
   },
   {
     "detail": undefined,
     "label": "@requiresScopes(…)",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@shareable",
   },
   {
     "detail": undefined,
     "label": "@tag(…)",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@federation__authenticated",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@federation__inaccessible",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@federation__policy(…)",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@federation__provides(…)",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@federation__requiresScopes(…)",
   },
   {

src/language-server/config/config.ts

@@ -322,8 +322,10 @@ export abstract class ApolloConfig {
   get configDirURI() {
     // if the filepath has a _file_ in it, then we get its dir
     return this.configURI &&
-      this.configURI.fsPath.match(/\.(ts|js|cjs|mjs|yaml|yml|json)$/i)
-      ? URI.parse(dirname(this.configURI.fsPath))
+      this.configURI.path.match(/\.(ts|js|cjs|mjs|yaml|yml|json)$/i)
+      ? URI.from(this.configURI).with({
+          path: dirname(this.configURI.path),
+        })
       : this.configURI;
   }