quintenk
/
miller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small cleanup

This commit is contained in:
Quinten Kock 2025-12-01 02:29:05 +01:00
parent c0fed59548
commit c44971ff23
2 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/filestate.ts
View File

@ -86,10 +86,6 @@ export class OpenFile implements WorkspaceFile {
await window.electronAPI.saveFile(doc, this.filePath.val);
this.lastSaved.val = this.rootState.val.doc;
this.expectedDiskContent.val = doc;
// Notify LSP clients that the file was saved. The lsp plugin typically
// listens to EditorView changes and save events; nudging the views
// ensures any listeners pick up the final document state.
this.notifyLspSave();
} else {
await this.saveAs();
}
@ -221,20 +217,6 @@ export class OpenFile implements WorkspaceFile {
return null;
}
// Lightweight helper to nudge LSP plugins on views after a save. This
// triggers a no-op dispatch on each view so that any view-bound listeners
// (including lsp-client's save/didSave handling) can observe the new state.
notifyLspSave() {
this.editors.forEach((e) => {
try {
// dispatch an empty transaction to trigger plugin observers
e.view.dispatch({});
} catch (err) {
console.warn("Failed to notify LSP of save for view:", err);
}
});
}
notifyLspClose() {
// Some language clients respond to EditorView disposal/transactions; to be
// conservative, dispatch a no-op and then attempt to remove the LSP

40
src/app/lsp.ts
View File

@ -1,7 +1,7 @@
// Minimal LSP integration helper for the editor.
// Keeps all LSP-specific logic in one place so it's easy to review.
import { Extension, ChangeSet, Text } from "@codemirror/state";
import { Extension, ChangeSet, TransactionSpec } from "@codemirror/state";
import { EditorView } from "@codemirror/view";
import {
@ -85,7 +85,7 @@ export function inferLanguageFromPath(
// expectations. This supports multiple views per OpenFile by using the
// OpenFile.getView method.
class OpenFileWorkspace extends Workspace {
files: WorkspaceFile[] = [];
files: OpenFile[] = [];
private fileVersions: { [uri: string]: number } = Object.create(null);
nextFileVersion(uri: string) {
@ -98,6 +98,7 @@ class OpenFileWorkspace extends Workspace {
// Look through known workspace files and update their docs/versions
// based on the editor views or the OpenFile state when no view exists.
// TODO: fix (cause vibe coding is useless)
syncFiles() {
let result: any[] = [];
for (let file of this.files) {
@ -129,35 +130,36 @@ class OpenFileWorkspace extends Workspace {
}
openFile(uri: string, languageId: string, view: EditorView) {
console.log("LSP: attempting to open file", uri);
if (this.getFile(uri)) return;
// Try to map to an existing OpenFile instance, prefer using its doc
const path = uri.replace(/^file:\/\//, "");
const of = OpenFile.findOpenFile(path);
const file: WorkspaceFile = of
? {
uri,
languageId: of.languageId || languageId,
version: of.version,
doc: of.doc,
getView: (main?: EditorView) => of.getView(main ?? view),
}
: {
uri,
languageId,
version: this.nextFileVersion(uri),
doc: view.state.doc,
getView: () => view,
};
this.files.push(file);
this.client.didOpen(file);
if (!of) {
console.warn("LSP: attempted to open unknown file", uri);
return;
}
this.files.push(of);
this.client.didOpen(of);
}
updateFile(uri: string, update: TransactionSpec): void {
const file = this.getFile(uri) as OpenFile;
if (!file) {
console.warn("LSP: attempted to update unknown file", uri);
return;
}
file.dispatch(update);
}
closeFile(uri: string, view: EditorView) {
const path = uri.replace(/^file:\/\//, "");
const of = OpenFile.findOpenFile(path);
// If OpenFile exists and still has editors, defer closing
console.log("LSP: attempting to close file", uri, of);
if (of && of.editors.length > 0) return;
this.files = this.files.filter((f) => f.uri !== uri);
console.log("LSP: closing file", uri);
this.client.didClose(uri);
}
}