Cleanup /node.js imports

This was needed at some point, but apparently isn't needed anymore.

Author: jdesrosiers

language-server/src/build-server.js

@@ -1,4 +1,4 @@
-import { TextDocuments } from "vscode-languageserver/node.js";
+import { TextDocuments } from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
 
 // Hyperjump

language-server/src/features/completion.test.js

@@ -1,5 +1,5 @@
 import { beforeAll, describe, expect, test } from "vitest";
-import { InitializeRequest } from "vscode-languageserver/node";
+import { InitializeRequest } from "vscode-languageserver";
 import { getTestClient } from "../test-utils.js";
 import completion from "./completion.js";
 
@@ -13,7 +13,7 @@ describe("Feature - Completion", () => {
 
   test("completion provider capabilities", async () => {
     /**
-     * @type {import("vscode-languageserver/node.js").InitializeParams}
+     * @type {import("vscode-languageserver").InitializeParams}
      */
     const init = {
       capabilities: {}

language-server/src/features/document-settings.js

@@ -32,7 +32,7 @@ export default {
   onInitialized(connection) {
     if (hasDidChangeConfigurationCapability) {
       /**
-       * @type {import("vscode-languageserver/node.js").DidChangeConfigurationRegistrationOptions}
+       * @type {import("vscode-languageserver").DidChangeConfigurationRegistrationOptions}
        */
       const params = {
         section: "jsonSchemaLanguageServer"

language-server/src/features/document-settings.test.js

@@ -1,5 +1,5 @@
 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,

language-server/src/features/if-then-completion.test.js

@@ -1,5 +1,5 @@
 import { beforeAll, describe, expect, test } from "vitest";
-import { CompletionRequest } from "vscode-languageserver/node.js";
+import { CompletionRequest } from "vscode-languageserver";
 import completion from "./completion.js";
 import ifThenCompletionFeature, { ifThenPatternCompletion } from "./if-then-completion.js";
 import { getTestClient, initializeServer, openDocument } from "../test-utils.js";
@@ -20,7 +20,7 @@ describe("Feature - if/then completion", () => {
 }`);
 
     /**
-     * @type {import("vscode-languageserver/node.js").CompletionParams}
+     * @type {import("vscode-languageserver").CompletionParams}
      */
     const params = {
       textDocument: { uri: documentUri },
@@ -42,7 +42,7 @@ describe("Feature - if/then completion", () => {
 }`);
 
     /**
-     * @type {import("vscode-languageserver/node.js").CompletionParams}
+     * @type {import("vscode-languageserver").CompletionParams}
      */
     const params = {
       textDocument: { uri: documentUri },
@@ -64,7 +64,7 @@ describe("Feature - if/then completion", () => {
 }`);
 
     /**
-     * @type {import("vscode-languageserver/node.js").CompletionParams}
+     * @type {import("vscode-languageserver").CompletionParams}
      */
     const params = {
       textDocument: { uri: documentUri },
@@ -86,7 +86,7 @@ describe("Feature - if/then completion", () => {
 }`);
 
     /**
-     * @type {import("vscode-languageserver/node.js").CompletionParams}
+     * @type {import("vscode-languageserver").CompletionParams}
      */
     const params = {
       textDocument: { uri: documentUri },
@@ -108,7 +108,7 @@ describe("Feature - if/then completion", () => {
 }`);
 
     /**
-     * @type {import("vscode-languageserver/node.js").CompletionParams}
+     * @type {import("vscode-languageserver").CompletionParams}
      */
     const params = {
       textDocument: { uri: documentUri },

language-server/src/features/schema-completion.test.js

@@ -1,5 +1,5 @@
 import { beforeAll, describe, expect, test } from "vitest";
-import { CompletionItemKind, CompletionRequest } from "vscode-languageserver/node.js";
+import { CompletionItemKind, CompletionRequest } from "vscode-languageserver";
 import completion from "./completion.js";
 import schemaCompletion from "./schema-completion.js";
 import { getTestClient, initializeServer, openDocument } from "../test-utils.js";
@@ -20,7 +20,7 @@ describe("Feature - $schema completion", () => {
 }`);
 
     /**
-     * @type {import("vscode-languageserver/node.js").CompletionParams}
+     * @type {import("vscode-languageserver).CompletionParams}
      */
     const params = {
       textDocument: { uri: documentUri },
@@ -41,7 +41,7 @@ describe("Feature - $schema completion", () => {
 }`);
 
     /**
-     * @type {import("vscode-languageserver/node.js").CompletionParams}
+     * @type {import("vscode-languageserver").CompletionParams}
      */
     const params = {
       textDocument: { uri: documentUri },
@@ -62,7 +62,7 @@ describe("Feature - $schema completion", () => {
 }`);
 
     /**
-     * @type {import("vscode-languageserver/node.js").CompletionParams}
+     * @type {import("vscode-languageserver").CompletionParams}
      */
     const params = {
       textDocument: { uri: documentUri },
@@ -83,7 +83,7 @@ describe("Feature - $schema completion", () => {
 }`);
 
     /**
-     * @type {import("vscode-languageserver/node.js").CompletionParams}
+     * @type {import("vscode-languageserver").CompletionParams}
      */
     const params = {
       textDocument: { uri: documentUri },

language-server/src/features/workspace-neovim.test.js

@@ -4,7 +4,7 @@ import {
   PublishDiagnosticsNotification,
   WorkDoneProgress,
   WorkDoneProgressCreateRequest
-} from "vscode-languageserver/node.js";
+} from "vscode-languageserver";
 import { utimes } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 import { resolveIri } from "@hyperjump/uri";
@@ -26,7 +26,7 @@ describe("Feature - workspace (neovim)", () => {
     });
 
     /**
-     * @type {import("vscode-languageserver/node.js").InitializeParams}
+     * @type {import("vscode-languageserver").InitializeParams}
      */
     const init = {
       capabilities: {

language-server/src/features/workspace.js

@@ -6,14 +6,14 @@ import {
   DiagnosticSeverity,
   DidChangeWatchedFilesNotification,
   FileChangeType,
+  SemanticTokensRefreshRequest,
   TextDocumentSyncKind
 } from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import { publishAsync, subscribe } from "../pubsub.js";
 import { allSchemaDocuments, getSchemaDocument } from "./schema-registry.js";
 import { getDocumentSettings } from "./document-settings.js";
 import picomatch from "picomatch";
-import { SemanticTokensRefreshRequest } from "vscode-languageserver/node.js";
 
 
 let hasWorkspaceFolderCapability = false;

language-server/src/features/workspace.test.js

@@ -13,7 +13,7 @@ import {
   PublishDiagnosticsNotification,
   WorkDoneProgress,
   WorkDoneProgressCreateRequest
-} from "vscode-languageserver/node.js";
+} from "vscode-languageserver";
 import { resolveIri } from "@hyperjump/uri";
 import documentSettings from "./document-settings.js";
 import schemaRegistry from "./schema-registry.js";
@@ -33,7 +33,7 @@ describe("Feature - workspace", () => {
     });
 
     /**
-     * @type {import("vscode-languageserver/node.js").InitializeParams}
+     * @type {import("vscode-languageserver").InitializeParams}
      */
     const init = {
       workspaceFolders: [
@@ -76,7 +76,7 @@ describe("Feature - workspace", () => {
       });
 
       /**
-       * @type {import("vscode-languageserver/node.js").DidChangeTextDocumentParams}
+       * @type {import("vscode-languageserver").DidChangeTextDocumentParams}
        */
       const params = {
         textDocument: { uri: documentUri },
@@ -108,7 +108,7 @@ describe("Feature - workspace", () => {
     });
 
     /**
-     * @type {import("vscode-languageserver/node.js").DidChangeWatchedFilesParams}
+     * @type {import("vscode-languageserver").DidChangeWatchedFilesParams}
      */
     const params = { changes: [] };
     await client.sendNotification(DidChangeWatchedFilesNotification, params);

language-server/src/server.js

@@ -1,5 +1,5 @@
 // Language Server
-import { createConnection, ProposedFeatures } from "vscode-languageserver/node.js";
+import { createConnection, ProposedFeatures } from "vscode-languageserver";
 import { buildServer } from "./build-server.js";
 
 // Features

language-server/src/server.test.js

@@ -1,5 +1,5 @@
 import { describe, test, expect, beforeAll } from "vitest";
-import { InitializeRequest, TextDocumentSyncKind } from "vscode-languageserver/node";
+import { InitializeRequest, TextDocumentSyncKind } from "vscode-languageserver";
 import { getTestClient } from "./test-utils.js";
 
 
@@ -12,7 +12,7 @@ describe("JSON Schema Language Server", () => {
 
   test("textDocumentSync = Incremental", async () => {
     /**
-     * @type {import("vscode-languageserver/node.js").InitializeParams}
+     * @type {import("vscode-languageserver").InitializeParams}
      */
     const init = {
       capabilities: {}

language-server/src/test-utils.js

@@ -8,7 +8,7 @@ import {
   SemanticTokensRefreshRequest,
   WorkDoneProgressCreateRequest,
   createConnection
-} from "vscode-languageserver/node.js";
+} from "vscode-languageserver";
 import { Duplex } from "node:stream";
 import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
@@ -59,7 +59,7 @@ export const initializeServer = async (client, initParams = {}, settings = null)
   });
 
   /**
-   * @type {import("vscode-languageserver/node.js").InitializeParams}
+   * @type {import("vscode-languageserver").InitializeParams}
    */
   const init = merge({
     capabilities: {
@@ -87,7 +87,7 @@ export const initializeServer = async (client, initParams = {}, settings = null)
 
 export const openDocument = async (client, uri, text) => {
   /**
-   * @type {import("vscode-languageserver/node.js").DidOpenTextDocumentParams}
+   * @type {import("vscode-languageserver").DidOpenTextDocumentParams}
    */
   const openParams = {
     textDocument: {
@@ -102,7 +102,7 @@ export const openDocument = async (client, uri, text) => {
 
 export const closeDocument = async (client, uri) => {
   /**
-   * @type {import("vscode-languageserver/node.js").DidCloseTextDocumentParams}
+   * @type {import("vscode-languageserver").DidCloseTextDocumentParams}
    */
   const closeParams = {
     textDocument: {

vscode/src/extension.js

@@ -1,6 +1,6 @@
 "use strict";
 const path = require("node:path");
-const { LanguageClient, TransportKind, MarkupKind } = require("vscode-languageclient/node.js");
+const { LanguageClient, TransportKind, MarkupKind } = require("vscode-languageclient");
 
 
 let client;