3 nit

Signed-off-by: wthrajat <[email protected]>
100Pulsar · Jul 1, 2024 · 0a25386 · 0a25386
1 parent a686110
commit 0a25386
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 38 deletions.
diff --git a/language-server/src/features/document-settings.test.ts b/language-server/src/features/document-settings.test.ts
@@ -1,21 +1,20 @@
 import { afterAll, beforeAll, describe, expect, test } from "vitest";
+import { ConfigurationRequest, DidChangeTextDocumentNotification, PublishDiagnosticsNotification } from "vscode-languageserver/node";
 import {
-  ConfigurationRequest,
-  DidChangeTextDocumentNotification,
-  PublishDiagnosticsNotification
-} from "vscode-languageserver";
-import { getTestClient, closeDocument, initializeServer, openDocument } from "../test-utils.js";
+  getTestClient,
+  closeDocument,
+  initializeServer,
+  openDocument
+} from "../test-utils.js";
 import documentSettings from "./document-settings.js";
 import schemaRegistry from "./schema-registry.js";
 import workspace from "./workspace.js";
 import validationErrorsFeature from "./validation-errors.js";
 
-import type { Connection, Diagnostic } from "vscode-languageserver";
-
 
 describe("Feature - Document Settings", () => {
-  let client: Connection;
-  let documentUri: string;
+  let client;
+  let documentUri;
 
   beforeAll(async () => {
     client = getTestClient([
@@ -34,86 +33,98 @@ describe("Feature - Document Settings", () => {
   });
 
   test("test default dialect", async () => {
-    documentUri = await openDocument(client, "./subject.schema.json", `{}`);
+    documentUri = "file://path/to/workspace/subjectA.schema.json";
+    await openDocument(client, documentUri, {});
 
-    const diagnosticsPromise = new Promise<Diagnostic[]>((resolve) => {
-      client.onNotification(PublishDiagnosticsNotification.type, (params) => {
+    const diagnosticsPromise = new Promise((resolve) => {
+      client.onNotification(PublishDiagnosticsNotification, (params) => {
         resolve(params.diagnostics);
       });
     });
 
-    await client.sendNotification(DidChangeTextDocumentNotification.type, {
-      textDocument: { uri: documentUri, version: 1 },
+    const params = {
+      textDocument: { uri: documentUri },
       contentChanges: []
-    });
+    };
+
+    await client.sendNotification(DidChangeTextDocumentNotification, params);
 
     const diagnostics = await diagnosticsPromise;
     expect(diagnostics).to.eql([]);
   });
 
   test("test no dialect", async () => {
-    documentUri = await openDocument(client, "./subject.schema.json", `{}`);
+    documentUri = "file://path/to/workspace/subjectB.schema.json";
+    await openDocument(client, documentUri, {});
 
-    client.onRequest(ConfigurationRequest.type, () => {
+    await client.onRequest(ConfigurationRequest, () => {
       return [{}];
     });
 
-    const diagnosticsPromise = new Promise<Diagnostic[]>((resolve) => {
-      client.onNotification(PublishDiagnosticsNotification.type, (params) => {
+    const diagnosticsPromise = new Promise((resolve) => {
+      client.onNotification(PublishDiagnosticsNotification, (params) => {
         resolve(params.diagnostics);
       });
     });
 
-    await client.sendNotification(DidChangeTextDocumentNotification.type, {
-      textDocument: { uri: documentUri, version: 1 },
+    const params = {
+      textDocument: { uri: documentUri },
       contentChanges: []
-    });
+    };
+
+    await client.sendNotification(DidChangeTextDocumentNotification, params);
 
     const diagnostics = await diagnosticsPromise;
     expect(diagnostics[0].message).to.eql("No dialect");
   });
 
   test("test unknown dialect", async () => {
-    documentUri = await openDocument(client, "./subject.schema.json", `{ "$schema": "" }`);
+    documentUri = "file://path/to/workspace/subjectC.schema.json";
+    await openDocument(client, documentUri, {"$schema":""});
 
-    client.onRequest(ConfigurationRequest.type, () => {
+    await client.onRequest(ConfigurationRequest, () => {
       return [{}];
     });
 
-    const diagnosticsPromise = new Promise<Diagnostic[]>((resolve) => {
-      client.onNotification(PublishDiagnosticsNotification.type, (params) => {
+    const diagnosticsPromise = new Promise((resolve) => {
+      client.onNotification(PublishDiagnosticsNotification, (params) => {
         resolve(params.diagnostics);
       });
     });
 
-    await client.sendNotification(DidChangeTextDocumentNotification.type, {
-      textDocument: { uri: documentUri, version: 1 },
+    const params = {
+      textDocument: { uri: documentUri },
       contentChanges: []
-    });
+    };
+
+    await client.sendNotification(DidChangeTextDocumentNotification, params);
 
     const diagnostics = await diagnosticsPromise;
     expect(diagnostics[0].message).to.eql("Unknown dialect");
   });
 
   test("test unknown dialect when default dialect is unknown", async () => {
-    documentUri = await openDocument(client, "./subject.schema.json", `{}`);
+    documentUri = "file://path/to/workspace/subjectD.schema.json";
+    await openDocument(client, documentUri, {});
 
-    client.onRequest(ConfigurationRequest.type, () => {
+    await client.onRequest(ConfigurationRequest, () => {
       return [{ "defaultDialect": "" }];
     });
 
-    const diagnosticsPromise = new Promise<Diagnostic[]>((resolve) => {
-      client.onNotification(PublishDiagnosticsNotification.type, (params) => {
+    const diagnosticsPromise = new Promise((resolve) => {
+      client.onNotification(PublishDiagnosticsNotification, (params) => {
         resolve(params.diagnostics);
       });
     });
 
-    await client.sendNotification(DidChangeTextDocumentNotification.type, {
-      textDocument: { uri: documentUri, version: 1 },
+    const params = {
+      textDocument: { uri: documentUri },
       contentChanges: []
-    });
+    };
+
+    await client.sendNotification(DidChangeTextDocumentNotification, params);
 
     const diagnostics = await diagnosticsPromise;
     expect(diagnostics[0].message).to.eql("Unknown dialect");
   });
-});
+});
diff --git a/language-server/src/test-utils.ts b/language-server/src/test-utils.ts
@@ -91,7 +91,7 @@ export const initializeServer = async (client: Connection, initParams: Partial<I
 };
 
 export const openDocument = async (client: Connection, uri: string, text?: string) => {
-  const baseUri = `file:///${randomUUID()}/`;
+  const baseUri = pathToFileURL(`/${randomUUID()}/`).toString();
   const documentUri = resolveIri(uri, baseUri);
 
   await client.sendNotification(DidOpenTextDocumentNotification.type, {