@kerebron/extension-lsp 0.7.8 → 0.8.1

package/esm/LSPWorkspace.d.ts

@@ -0,0 +1,39 @@
+import type * as lsp from 'vscode-languageserver-protocol';
+import type { EditorUi } from '@kerebron/editor';
+import { Workspace, WorkspaceFile } from './workspace.js';
+import { PositionMapper } from '@kerebron/extension-markdown/PositionMapper';
+import { LSPClient } from './LSPClient.js';
+export interface LSPSource {
+    ui: EditorUi;
+    getMappedContent(): Promise<{
+        content: string;
+        mapper: PositionMapper;
+    }>;
+}
+declare class LSPWorkspaceFile implements WorkspaceFile {
+    readonly uri: string;
+    readonly languageId: string;
+    version: number;
+    content: string;
+    mapper: PositionMapper;
+    source: LSPSource;
+    syncedContent: string;
+    diagnostics: Array<lsp.Diagnostic>;
+    constructor(uri: string, languageId: string, version: number, content: string, mapper: PositionMapper, source: LSPSource);
+    getUi(): EditorUi;
+}
+export declare class LSPWorkspace extends Workspace {
+    private client;
+    files: LSPWorkspaceFile[];
+    private fileVersions;
+    constructor(client: LSPClient);
+    nextFileVersion(uri: string): number;
+    connected(): Promise<void>;
+    disconnected(): void;
+    syncFiles(): void;
+    changedFile(uri: string): Promise<void>;
+    openFile(uri: string, languageId: string, source: LSPSource): Promise<void>;
+    closeFile(uri: string): void;
+}
+export {};
+//# sourceMappingURL=LSPWorkspace.d.ts.map

package/esm/LSPWorkspace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LSPWorkspace.d.ts","sourceRoot":"","sources":["../src/LSPWorkspace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,gCAAgC,CAAC;AAG3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,QAAQ,CAAC;IACb,gBAAgB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,cAAc,CAAA;KAAE,CAAC,CAAC;CAC1E;AAED,cAAM,gBAAiB,YAAW,aAAa;IAK3C,QAAQ,CAAC,GAAG,EAAE,MAAM;IACpB,QAAQ,CAAC,UAAU,EAAE,MAAM;IACpB,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,SAAS;IATnB,aAAa,EAAE,MAAM,CAAM;IAC3B,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAM;gBAGpC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,SAAS;IAI1B,KAAK;CAGN;AAED,qBAAa,YAAa,SAAQ,SAAS;IAI7B,OAAO,CAAC,MAAM;IAH1B,KAAK,EAAE,gBAAgB,EAAE,CAAM;IAC/B,OAAO,CAAC,YAAY,CAAkD;gBAElD,MAAM,EAAE,SAAS;IAIrC,eAAe,CAAC,GAAG,EAAE,MAAM;IAIZ,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAOhC,YAAY,IAAI,IAAI;IAO7B,SAAS;IAUH,WAAW,CAAC,GAAG,EAAE,MAAM;IAqDvB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS;IAsBjE,SAAS,CAAC,GAAG,EAAE,MAAM;CAOtB"}

package/esm/LSPWorkspace.js

@@ -0,0 +1,118 @@
+import { TextDocumentSyncKind } from 'vscode-languageserver-protocol';
+import { Workspace } from './workspace.js';
+import { computeIncrementalChanges } from './computeIncrementalChanges.js';
+class LSPWorkspaceFile {
+    uri;
+    languageId;
+    version;
+    content;
+    mapper;
+    source;
+    syncedContent = '';
+    diagnostics = [];
+    constructor(uri, languageId, version, content, mapper, source) {
+        this.uri = uri;
+        this.languageId = languageId;
+        this.version = version;
+        this.content = content;
+        this.mapper = mapper;
+        this.source = source;
+    }
+    getUi() {
+        return this.source.ui;
+    }
+}
+export class LSPWorkspace extends Workspace {
+    client;
+    files = [];
+    fileVersions = Object.create(null);
+    constructor(client) {
+        super();
+        this.client = client;
+    }
+    nextFileVersion(uri) {
+        return this.fileVersions[uri] = (this.fileVersions[uri] ?? -1) + 1;
+    }
+    async connected() {
+        super.connected();
+        for await (const file of this.files) {
+            const result = await this.client.didOpen(file);
+        }
+    }
+    disconnected() {
+        for (const file of this.files) {
+            this.client.workspace.closeFile(file.uri);
+        }
+        super.disconnected();
+    }
+    syncFiles() {
+        if (!this.client.supportSync) {
+            return;
+        }
+        for (const file of this.files) {
+            this.changedFile(file.uri);
+        }
+    }
+    async changedFile(uri) {
+        const file = this.files.find((f) => f.uri == uri) || null;
+        if (file) {
+            const { content, mapper } = await file.source.getMappedContent();
+            if (!this.isConnected) {
+                file.content = content;
+                file.mapper = mapper;
+                return;
+            }
+            if (await this.client.notification('textDocument/didChange', {
+                textDocument: { uri: file.uri, version: file.version },
+                contentChanges: contentChangesFor(file, content, mapper, this.client.supportSync == TextDocumentSyncKind.Incremental),
+            })) {
+                file.syncedContent = file.content;
+                file.content = content;
+                file.mapper = mapper;
+                file.version = this.nextFileVersion(file.uri);
+                file.diagnostics = [];
+                this.dispatchEvent(new CustomEvent('fileChanged', {
+                    detail: {
+                        uri: file.uri,
+                        file,
+                    },
+                }));
+            }
+            await this.client.notification('textDocument/diagnostic', {
+                textDocument: {
+                    uri: file.uri,
+                },
+            });
+        }
+    }
+    async openFile(uri, languageId, source) {
+        // if (uri) {}
+        if (this.getFile(uri)) {
+            this.closeFile(uri);
+        }
+        const mappedContent = await source.getMappedContent();
+        const { content, mapper } = mappedContent;
+        const file = new LSPWorkspaceFile(uri, languageId, this.nextFileVersion(uri), content, mapper, source);
+        this.files.push(file);
+        this.client.didOpen(file);
+    }
+    closeFile(uri) {
+        const file = this.getFile(uri);
+        if (file) {
+            this.files = this.files.filter((f) => f.uri !== uri);
+            this.client.didClose(uri);
+        }
+    }
+}
+var Sync;
+(function (Sync) {
+    Sync[Sync["AlwaysIfSmaller"] = 1024] = "AlwaysIfSmaller";
+})(Sync || (Sync = {}));
+function contentChangesFor(file, newContent, mapper, supportInc) {
+    if (!supportInc || newContent.length < Sync.AlwaysIfSmaller) {
+        return [{ text: newContent }];
+    }
+    const changes = computeIncrementalChanges(file.content, newContent);
+    return changes.reverse();
+}
+//# sourceMappingURL=LSPWorkspace.js.map

package/esm/LSPWorkspace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LSPWorkspace.js","sourceRoot":"","sources":["../src/LSPWorkspace.ts"],"names":[],"mappings":"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"}

package/esm/createLspAutocomplete.d.ts

@@ -1,6 +1,5 @@
-import { DefaultRenderer } from '@kerebron/extension-autocomplete/DefaultRenderer';
-import { TextRange } from '@kerebron/editor';
-import { type AutocompleteProps } from '@kerebron/extension-autocomplete';
+import { DefaultRenderer } from '@kerebron/extension-ui/autocomplete/DefaultRenderer';
+import { AutocompleteConfig } from '@kerebron/extension-ui/autocomplete';
 import { ExtensionLsp } from './ExtensionLsp.js';
 interface CompletionItem {
     label: string;
@@ -12,12 +11,7 @@ export declare class CustomRenderer extends DefaultRenderer<CompletionItem> {
 }
 export declare function cleanPlaceholders(input: string): string;
 export declare function createLspAutocomplete(extensionLsp: ExtensionLsp): {
-    autocompleteConfig: {
-        renderer: CustomRenderer;
-        matchers: any[];
-        getItems: (query: string, props: AutocompleteProps) => Promise<CompletionItem[]>;
-        onSelect: (selected: CompletionItem, range: TextRange) => Promise<void>;
-    };
+    autocompleteConfig: AutocompleteConfig;
 };
 export {};
 //# sourceMappingURL=createLspAutocomplete.d.ts.map

package/esm/createLspAutocomplete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createLspAutocomplete.d.ts","sourceRoot":"","sources":["../src/createLspAutocomplete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAmB,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EACL,KAAK,iBAAiB,EAEvB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,cAAe,SAAQ,eAAe,CAAC,cAAc,CAAC;IACxD,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM;CAa1D;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,YAAY;;;;0BAOpC,MAAM,SAAS,iBAAiB;6BAiC7B,cAAc,SAAS,SAAS;;EAiB9D"}
+{"version":3,"file":"createLspAutocomplete.d.ts","sourceRoot":"","sources":["../src/createLspAutocomplete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AAGtF,OAAO,EACL,kBAAkB,EAGnB,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,cAAe,SAAQ,eAAe,CAAC,cAAc,CAAC;IACxD,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM;CAa1D;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,YAAY,GACzB;IAAE,kBAAkB,EAAE,kBAAkB,CAAA;CAAE,CAyD5C"}

package/esm/createLspAutocomplete.js

@@ -1,5 +1,4 @@
-import { DefaultRenderer } from '@kerebron/extension-autocomplete/DefaultRenderer';
-import { createRegexMatcher, } from '@kerebron/extension-autocomplete';
+import { DefaultRenderer } from '@kerebron/extension-ui/autocomplete/DefaultRenderer';
 export class CustomRenderer extends DefaultRenderer {
     createListItem(item, cnt) {
         const li = document.createElement('li');
@@ -23,14 +22,14 @@ export function createLspAutocomplete(extensionLsp) {
     const editor = extensionLsp.getEditor();
     const renderer = new CustomRenderer(editor);
     const config = {
-        renderer,
-        matchers: [createRegexMatcher([/\w+/, /(^|\s)@\w*/, /^#\w*/])],
+        // renderer,
+        // matchers: [createRegexMatcher([/\w+/, /(^|\s)@\w*/, /^#\w*/])],
         getItems: async (query, props) => {
             const { mapper } = await extensionLsp.source.getMappedContent();
             const lspPos = mapper.toRawTextLspPos(props.range.from);
             const client = extensionLsp.getClient(extensionLsp.mainLang);
             if (client) {
-                client.sync();
+                client.syncFiles();
                 try {
                     const completions = await client.request('textDocument/completion', {
                         textDocument: { uri: extensionLsp.uri },

package/esm/createLspAutocomplete.js.map

@@ -1 +1 @@
-{"version":3,"file":"createLspAutocomplete.js","sourceRoot":"","sources":["../src/createLspAutocomplete.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createLspAutocomplete.js","sourceRoot":"","sources":["../src/createLspAutocomplete.ts"],"names":[],"mappings":"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"}

package/esm/mod.d.ts

@@ -1,4 +1,4 @@
 export * from './ExtensionLsp.js';
 export * from './LSPClient.js';
-export * from './workspace.js';
+export * from './LSPWorkspace.js';
 //# sourceMappingURL=mod.d.ts.map

package/esm/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC"}

package/esm/mod.js

@@ -1,4 +1,4 @@
 export * from './ExtensionLsp.js';
 export * from './LSPClient.js';
-export * from './workspace.js';
+export * from './LSPWorkspace.js';
 //# sourceMappingURL=mod.js.map

package/esm/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC"}

package/esm/workspace.d.ts

@@ -1,8 +1,6 @@
-import type * as lsp from 'vscode-languageserver-protocol';
 import type { EditorUi } from '@kerebron/editor';
-import { LSPClient } from './LSPClient.js';
 import { PositionMapper } from '@kerebron/extension-markdown/PositionMapper';
-export interface LspSource {
+export interface LSPSource {
     ui: EditorUi;
     getMappedContent(): Promise<{
         content: string;
@@ -14,49 +12,22 @@ export interface WorkspaceFile {
     languageId: string;
     version: number;
     content: string;
-    source: LspSource;
+    source: LSPSource;
     getUi(): EditorUi | undefined;
     mapper: PositionMapper;
 }
-interface WorkspaceFileUpdate {
-    file: WorkspaceFile;
-    prevDoc: string;
-    changes: lsp.TextDocumentContentChangeEvent[];
-}
-export declare abstract class Workspace {
-    readonly client: LSPClient;
+export declare abstract class Workspace extends EventTarget {
     abstract files: WorkspaceFile[];
     protected isConnected: boolean;
-    constructor(client: LSPClient);
+    constructor();
     getFile(uri: string): WorkspaceFile | null;
-    abstract syncFiles(): readonly WorkspaceFileUpdate[];
+    abstract syncFiles(): void;
     requestFile(uri: string): Promise<WorkspaceFile | null>;
-    abstract openFile(uri: string, languageId: string, source: LspSource): void;
+    abstract openFile(uri: string, languageId: string, source: LSPSource): void;
     abstract changedFile(uri: string): void;
     abstract closeFile(uri: string): void;
     connected(): Promise<void>;
     disconnected(): void;
     getUi(uri: string): Promise<EditorUi | undefined>;
 }
-declare class DefaultWorkspaceFile implements WorkspaceFile {
-    readonly uri: string;
-    readonly languageId: string;
-    version: number;
-    content: string;
-    mapper: PositionMapper;
-    source: LspSource;
-    syncedContent: string;
-    constructor(uri: string, languageId: string, version: number, content: string, mapper: PositionMapper, source: LspSource);
-    getUi(): EditorUi;
-}
-export declare class DefaultWorkspace extends Workspace {
-    files: DefaultWorkspaceFile[];
-    private fileVersions;
-    nextFileVersion(uri: string): number;
-    syncFiles(): WorkspaceFileUpdate[];
-    changedFile(uri: string): Promise<void>;
-    openFile(uri: string, languageId: string, source: LspSource): Promise<void>;
-    closeFile(uri: string): void;
-}
-export {};
 //# sourceMappingURL=workspace.d.ts.map

package/esm/workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,gCAAgC,CAAC;AAG3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAG7E,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,QAAQ,CAAC;IACb,gBAAgB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,cAAc,CAAA;KAAE,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,IAAI,QAAQ,GAAG,SAAS,CAAC;IAC9B,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,UAAU,mBAAmB;IAC3B,IAAI,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,GAAG,CAAC,8BAA8B,EAAE,CAAC;CAC/C;AAED,8BAAsB,SAAS;IAK3B,QAAQ,CAAC,MAAM,EAAE,SAAS;IAJ5B,QAAQ,CAAC,KAAK,EAAE,aAAa,EAAE,CAAC;IAChC,SAAS,CAAC,WAAW,UAAS;gBAGnB,MAAM,EAAE,SAAS;IAG5B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAI1C,QAAQ,CAAC,SAAS,IAAI,SAAS,mBAAmB,EAAE;IAEpD,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAIvD,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI;IAC3E,QAAQ,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAE/B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAOhC,YAAY,IAAI,IAAI;IAOpB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;CAIlD;AAED,cAAM,oBAAqB,YAAW,aAAa;IAG/C,QAAQ,CAAC,GAAG,EAAE,MAAM;IACpB,QAAQ,CAAC,UAAU,EAAE,MAAM;IACpB,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,SAAS;IAPnB,aAAa,EAAE,MAAM,CAAM;gBAEvB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,SAAS;IAI1B,KAAK;CAGN;AAED,qBAAa,gBAAiB,SAAQ,SAAS;IAC7C,KAAK,EAAE,oBAAoB,EAAE,CAAM;IACnC,OAAO,CAAC,YAAY,CAAkD;IAEtE,eAAe,CAAC,GAAG,EAAE,MAAM;IAI3B,SAAS;IAaH,WAAW,CAAC,GAAG,EAAE,MAAM;IAkCvB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS;IAsBjE,SAAS,CAAC,GAAG,EAAE,MAAM;CAOtB"}
+{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAE7E,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,QAAQ,CAAC;IACb,gBAAgB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,cAAc,CAAA;KAAE,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,IAAI,QAAQ,GAAG,SAAS,CAAC;IAC9B,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,8BAAsB,SAAU,SAAQ,WAAW;IACjD,QAAQ,CAAC,KAAK,EAAE,aAAa,EAAE,CAAC;IAChC,SAAS,CAAC,WAAW,UAAS;;IAM9B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAI1C,QAAQ,CAAC,SAAS,IAAI,IAAI;IAE1B,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAIvD,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI;IAC3E,QAAQ,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAE/B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAIhC,YAAY,IAAI,IAAI;IAIpB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;CAIlD"}

package/esm/workspace.js

@@ -1,10 +1,7 @@
-import { TextDocumentSyncKind } from 'vscode-languageserver-protocol';
-import { computeIncrementalChanges } from './computeIncrementalChanges.js';
-export class Workspace {
-    client;
+export class Workspace extends EventTarget {
     isConnected = false;
-    constructor(client) {
-        this.client = client;
+    constructor() {
+        super();
     }
     getFile(uri) {
         return this.files.find((f) => f.uri == uri) || null;
@@ -14,14 +11,8 @@ export class Workspace {
     }
     async connected() {
         this.isConnected = true;
-        for await (const file of this.files) {
-            const result = await this.client.didOpen(file);
-        }
     }
     disconnected() {
-        for (const file of this.files) {
-            this.client.workspace.closeFile(file.uri);
-        }
         this.isConnected = false;
     }
     getUi(uri) {
@@ -29,90 +20,4 @@ export class Workspace {
         return Promise.resolve(file ? file.getUi() : undefined);
     }
 }
-class DefaultWorkspaceFile {
-    uri;
-    languageId;
-    version;
-    content;
-    mapper;
-    source;
-    syncedContent = '';
-    constructor(uri, languageId, version, content, mapper, source) {
-        this.uri = uri;
-        this.languageId = languageId;
-        this.version = version;
-        this.content = content;
-        this.mapper = mapper;
-        this.source = source;
-    }
-    getUi() {
-        return this.source.ui;
-    }
-}
-export class DefaultWorkspace extends Workspace {
-    files = [];
-    fileVersions = Object.create(null);
-    nextFileVersion(uri) {
-        return this.fileVersions[uri] = (this.fileVersions[uri] ?? -1) + 1;
-    }
-    syncFiles() {
-        if (!this.client.supportSync) {
-            return [];
-        }
-        const result = [];
-        for (const file of this.files) {
-            this.changedFile(file.uri);
-        }
-        return result;
-    }
-    async changedFile(uri) {
-        const file = this.files.find((f) => f.uri == uri) || null;
-        if (file) {
-            const { content, mapper } = await file.source.getMappedContent();
-            if (!this.isConnected) {
-                file.content = content;
-                file.mapper = mapper;
-                return;
-            }
-            if (await this.client.notification('textDocument/didChange', {
-                textDocument: { uri: file.uri, version: file.version },
-                contentChanges: contentChangesFor(file, content, mapper, this.client.supportSync == TextDocumentSyncKind.Incremental),
-            })) {
-                file.syncedContent = file.content;
-                file.content = content;
-                file.mapper = mapper;
-                file.version = this.nextFileVersion(file.uri);
-            }
-        }
-    }
-    async openFile(uri, languageId, source) {
-        // if (uri) {}
-        if (this.getFile(uri)) {
-            this.closeFile(uri);
-        }
-        const mappedContent = await source.getMappedContent();
-        const { content, mapper } = mappedContent;
-        const file = new DefaultWorkspaceFile(uri, languageId, this.nextFileVersion(uri), content, mapper, source);
-        this.files.push(file);
-        this.client.didOpen(file);
-    }
-    closeFile(uri) {
-        const file = this.getFile(uri);
-        if (file) {
-            this.files = this.files.filter((f) => f.uri !== uri);
-            this.client.didClose(uri);
-        }
-    }
-}
-var Sync;
-(function (Sync) {
-    Sync[Sync["AlwaysIfSmaller"] = 1024] = "AlwaysIfSmaller";
-})(Sync || (Sync = {}));
-function contentChangesFor(file, newContent, mapper, supportInc) {
-    if (!supportInc || newContent.length < Sync.AlwaysIfSmaller) {
-        return [{ text: newContent }];
-    }
-    const changes = computeIncrementalChanges(file.content, newContent);
-    return changes.reverse();
-}
 //# sourceMappingURL=workspace.js.map

package/esm/workspace.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"AAkBA,MAAM,OAAgB,SAAU,SAAQ,WAAW;IAEvC,WAAW,GAAG,KAAK,CAAC;IAE9B;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,OAAO,CAAC,GAAW;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,IAAI,CAAC;IACtD,CAAC;IAID,WAAW,CAAC,GAAW;QACrB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,CAAC;IAMD,KAAK,CAAC,SAAS;QACb,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,YAAY;QACV,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,GAAW;QACf,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kerebron/extension-lsp",
-  "version": "0.7.8",
+  "version": "0.8.1",
   "license": "MIT",
   "module": "./esm/mod.js",
   "exports": {
@@ -10,8 +10,8 @@
     "./types": {
       "import": "./esm/types.js"
     },
-    "./LspWebSocketTransport": {
-      "import": "./esm/LspWebSocketTransport.js"
+    "./LSPWebSocketTransport": {
+      "import": "./esm/LSPWebSocketTransport.js"
     }
   },
   "scripts": {},
@@ -20,9 +20,9 @@
     "src"
   ],
   "dependencies": {
-    "@kerebron/editor": "0.7.8",
-    "@kerebron/extension-autocomplete": "0.7.8",
-    "@kerebron/extension-markdown": "0.7.8",
+    "@kerebron/editor": "0.8.1",
+    "@kerebron/extension-markdown": "0.8.1",
+    "@kerebron/extension-ui": "0.8.1",
     "prosemirror-state": "1.4.3",
     "prosemirror-view": "1.40.0",
     "vscode-languageserver-protocol": "3.17.5"

package/src/ExtensionLsp.ts

@@ -2,19 +2,16 @@ import { Plugin } from 'prosemirror-state';
 
 import { Extension } from '@kerebron/editor';
 import { type ExtensionMarkdown } from '@kerebron/extension-markdown';
-import { type ExtensionAutocomplete } from '@kerebron/extension-autocomplete';
 import { PositionMapper } from '@kerebron/extension-markdown/PositionMapper';
 
 import { LSPClient, Transport } from './LSPClient.js';
-import { AutocompletePlugin } from '@kerebron/extension-autocomplete/AutocompletePlugin';
-import { DiagnosticPlugin } from './DiagnosticPlugin.js';
+import { LSPPlugin } from './LSPPlugin.js';
 import { createLspAutocomplete } from './createLspAutocomplete.js';
-import { LspSource } from './workspace.js';
 
-export type LspTransportGetter = (lang: string) => Transport | undefined;
+export type LSPTransportGetter = (lang: string) => Transport | undefined;
 
 export interface LspConfig {
-  getLspTransport: LspTransportGetter;
+  getLspTransport: LSPTransportGetter;
 }
 
 export class ExtensionLsp extends Extension {
@@ -22,9 +19,8 @@ export class ExtensionLsp extends Extension {
   clients: Record<string, LSPClient> = {};
   uri: string | undefined;
   extensionMarkdown!: ExtensionMarkdown;
-  extensionAutocomplete!: ExtensionAutocomplete;
   mainLang: string = 'markdown';
-  source!: LspSource;
+  // source!: LSPSource;
 
   constructor(public override config: LspConfig) {
     super(config);
@@ -35,8 +31,7 @@ export class ExtensionLsp extends Extension {
 
     const { autocompleteConfig } = createLspAutocomplete(this);
 
-    plugins.push(new AutocompletePlugin(autocompleteConfig, this.editor));
-    plugins.push(new DiagnosticPlugin({}, this));
+    plugins.push(new LSPPlugin(this.config, this));
 
     return plugins;
   }
@@ -44,62 +39,67 @@ export class ExtensionLsp extends Extension {
   override created() {
     this.mainLang = this.editor.config.languageID || 'markdown';
 
-    this.source = {
-      ui: this.editor.ui,
-      getMappedContent: async () => {
-        const editor = this.editor;
-        const result = await this.extensionMarkdown.toMarkdown(
-          editor.state.doc,
-        );
-        const mapper = new PositionMapper(editor, result.rawTextMap);
-        return {
-          ...result,
-          mapper,
-        };
-      },
-    };
+    // this.source = {
+    //   ui: this.editor.ui,
+    //   getMappedContent: async () => {
+    //     const editor = this.editor;
+    //     const result = await this.extensionMarkdown.toMarkdown(
+    //       editor.state.doc,
+    //     );
+    //     const mapper = new PositionMapper(editor, result.rawTextMap);
+    //     return {
+    //       ...result,
+    //       mapper,
+    //     };
+    //   },
+    // };
 
     const extensionMarkdown: ExtensionMarkdown | undefined = this.editor
-      .getExtension('markdown');
+      .ci.resolve('markdown');
     if (!extensionMarkdown) {
       throw new Error('No markdown extension');
     }
     this.extensionMarkdown = extensionMarkdown;
 
     this.editor.addEventListener('doc:loaded', async () => {
-      const languageID = this.mainLang;
       this.uri = this.editor.config.uri;
-      if (this.uri) {
-        const client = this.getClient(this.mainLang);
-        if (client) {
-          client.connect(this.uri, this.source);
-          await client.restart();
-          client.workspace.openFile(
-            this.uri,
-            languageID,
-            this.source,
-          );
-        }
+      if (this.editor.config.uri) {
+        const tr = this.editor.view.state.tr;
+        tr.setMeta('workspace', {
+          operation: 'openFile',
+          node: this.editor.view.state.doc,
+          // pos: this.getPos(),
+          uri: this.editor.config.uri,
+          lang: this.mainLang,
+        });
+        this.editor.view.dispatch(tr);
       }
+
+      // TODO start autocomplete...
+      // this.editor.chain()/aaaa.run();
     });
 
     this.editor.addEventListener('changed', () => {
       if (this.editor.config.uri) {
-        const client = this.getClient(this.mainLang);
-        if (client) {
-          client.workspace.changedFile(
-            this.editor.config.uri,
-          );
-        }
+        const tr = this.editor.view.state.tr;
+        tr.setMeta('workspace', {
+          operation: 'modifyFile',
+          node: this.editor.view.state.doc,
+          // pos: this.getPos(),
+          uri: this.editor.config.uri,
+          lang: this.mainLang,
+        });
+        this.editor.view.dispatch(tr);
       }
     });
 
     this.editor.addEventListener('beforeDestroy', () => {
       if (this.uri) {
-        const client = this.getClient(this.mainLang);
-        if (client) {
-          client.disconnect(this.uri);
-        }
+        const tr = this.editor.view.state.tr;
+        tr.setMeta('workspace', {
+          operation: 'closeFile',
+          uri: this.editor.config.uri,
+        });
       }
     });
   }