diff --git a/language-server/src/jsonc-instance.js b/language-server/src/jsonc-instance.js index cf506bb..dd05292 100644 --- a/language-server/src/jsonc-instance.js +++ b/language-server/src/jsonc-instance.js @@ -1,4 +1,4 @@ -import { parseTree } from "jsonc-parser"; +import { parseTree } from "jsonc-parser/lib/esm/main.js"; import * as JsonPointer from "@hyperjump/json-pointer"; import { getKeywordId } from "@hyperjump/json-schema/experimental"; import { drop, find, head, some } from "@hyperjump/pact"; diff --git a/vscode/src/extension.js b/vscode/src/extension.js index ade1c82..bc22951 100644 --- a/vscode/src/extension.js +++ b/vscode/src/extension.js @@ -1,30 +1,24 @@ "use strict"; const path = require("node:path"); -const { LanguageClient } = require("vscode-languageclient/node.js"); +const { LanguageClient, TransportKind } = require("vscode-languageclient/node.js"); let client; const activate = (context) => { - // const serverModule = context.asAbsolutePath(path.join("out", "server.js")); - // const serverOptions = { - // run: { - // module: serverModule, - // transport: TransportKind.ipc - // }, - // debug: { - // module: serverModule, - // transport: TransportKind.ipc, - // options: { - // execArgc: ["--nolazy", "--inspect=6009"] - // } - // } - // }; - - // Temporary Hack. Get the above code working. + const serverModule = context.asAbsolutePath(path.join("out", "server.js")); const serverOptions = { - command: "node", - args: [context.asAbsolutePath(path.join("..", "language-server", "src", "server.js")), "--stdio"] + run: { + module: serverModule, + transport: TransportKind.ipc + }, + debug: { + module: serverModule, + transport: TransportKind.ipc, + options: { + execArgc: ["--nolazy", "--inspect=6009"] + } + } }; const clientOptions = {