Skip to content

adopt @codemirror/lsp-client #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Techatrix merged 2 commits into from
Apr 23, 2026
Merged

adopt @codemirror/lsp-client #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0333bef
various refactors
Techatrix Apr 22, 2026
a9545ce
adopt `@codemirror/lsp-client`
Techatrix Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 69 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,21 @@
"@codemirror/autocomplete": "^6.4.2",
"@codemirror/commands": "^6.2.2",
"@codemirror/language": "^6.6.0",
"@codemirror/lint": "^6.2.0",
"@codemirror/lsp-client": "^6.2.3",
"@codemirror/state": "^6.2.0",
"@codemirror/view": "^6.9.3",
"@ndim/codemirror-lang-zig": "^0.1.0",
"@ndim/lezer-zig": "^0.1.0",
"codemirror": "^6.0.1",
"vscode-languageserver-protocol": "^3.17.3"
},
"devDependencies": {
"typescript": "~5.7.2",
"vite": "^6.3.1"
},
"overrides": {
"lezer-zig": "@ndim/lezer-zig"
},
"browserslist": [
"since 2017-06"
]
Expand Down
119 changes: 33 additions & 86 deletions src/editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,94 +1,41 @@
import { EditorState } from "@codemirror/state"
import { keymap } from "@codemirror/view"
import { EditorView, basicSetup } from "codemirror"
import { JsonRpcMessage, LspClient } from "./lsp";
import { EditorState } from "@codemirror/state";
import { keymap } from "@codemirror/view";
import { EditorView, basicSetup } from "codemirror";
import { formatDocument } from "@codemirror/lsp-client";
import { indentWithTab } from "@codemirror/commands";
import { indentUnit } from "@codemirror/language";
import { editorTheme } from "./theme.ts";
// @ts-ignore
import ZLSWorker from './workers/zls.ts?worker';
import { indentUnit, syntaxHighlighting } from "@codemirror/language";
import { zigLanguage } from "@ndim/codemirror-lang-zig";
import { editorTheme, highlightStyle } from "./theme.ts";
import { lspClient } from "./lsp.ts";
// @ts-ignore
import ZigWorker from './workers/zig.ts?worker';
// @ts-ignore
import RunnerWorker from './workers/runner.ts?worker';
// @ts-ignore
import zigMainSource from './main.zig?raw';

export default class ZlsClient extends LspClient {
public worker: Worker;

constructor(worker: Worker) {
super("file:///", []);
this.worker = worker;

this.worker.addEventListener("message", this.messageHandler);
}

private messageHandler = (ev: MessageEvent) => {
const data = JSON.parse(ev.data);

if (data.method == "window/logMessage") {
if (!data.stderr) {
switch (data.params.type) {
case 5:
console.debug("ZLS --- ", data.params.message);
break;
case 4:
console.log("ZLS --- ", data.params.message);
break;
case 3:
console.info("ZLS --- ", data.params.message);
break;
case 2:
console.warn("ZLS --- ", data.params.message);
break;
case 1:
console.error("ZLS --- ", data.params.message);
break;
default:
console.error(data.params.message);
break;
}
}
} else {
console.debug("LSP <<-", data);
}
this.handleMessage(data);
};

public async sendMessage(message: JsonRpcMessage): Promise<void> {
console.debug("LSP ->>", message);
if (this.worker) {
this.worker.postMessage(JSON.stringify(message));
}
}

public async close(): Promise<void> {
super.close();
this.worker.terminate();
}
}

let client = new ZlsClient(new ZLSWorker());

let editor = (async () => {
await client.initialize();

let editor = new EditorView({
extensions: [],
parent: document.getElementById("editor")!,
state: EditorState.create({
doc: zigMainSource,
extensions: [basicSetup, editorTheme, indentUnit.of(" "), client.createPlugin("file:///main.zig", "zig", true), keymap.of([indentWithTab]),],
}),
});

await client.plugins[0].updateDecorations();
await client.plugins[0].updateFoldingRanges();
editor.update([]);

return editor;
})();
const editor = new EditorView({
extensions: [],
parent: document.getElementById("editor")!,
state: EditorState.create({
doc: zigMainSource,
extensions: [
basicSetup,
editorTheme,
indentUnit.of(" "),
keymap.of([
indentWithTab,
{
key: "Mod-s",
run: formatDocument,
},
]),
zigLanguage,
syntaxHighlighting(highlightStyle),
lspClient.plugin("file:///main.zig"),
],
}),
});

function revealOutputWindow() {
const outputs = document.getElementById("output")!;
Expand All @@ -101,7 +48,7 @@ function revealOutputWindow() {

let zigWorker = new ZigWorker();

zigWorker.onmessage = ev => {
zigWorker.onmessage = (ev: MessageEvent) => {
if (ev.data.stderr) {
document.querySelector(".zig-output:last-child")!.textContent += ev.data.stderr;
revealOutputWindow();
Expand All @@ -120,7 +67,7 @@ zigWorker.onmessage = ev => {

runnerWorker.postMessage({ run: ev.data.compiled });

runnerWorker.onmessage = rev => {
runnerWorker.onmessage = (rev: MessageEvent) => {
if (rev.data.stderr) {
document.querySelector(".runner-output:last-child")!.textContent += rev.data.stderr;
revealOutputWindow();
Expand Down Expand Up @@ -190,6 +137,6 @@ outputsRun.addEventListener("click", async () => {
revealOutputWindow();

zigWorker.postMessage({
run: (await editor).state.doc.toString(),
run: editor.state.doc.toString(),
});
});
Loading
Loading