ace-linters 1.8.5 → 1.8.7

package/build/ace-language-client.d.ts

@@ -757,6 +757,7 @@ declare class SessionLanguageProvider {
 	editor: Ace.Editor;
 	private semanticTokensLegend?;
 	private $provider;
+	private $changeScrollTopHandler?;
 	/**
 	 * Constructs a new instance of the `SessionLanguageProvider` class.
 	 *
@@ -799,10 +800,18 @@ declare class SessionLanguageProvider {
 	applyEdits: (edits: lsp.TextEdit[]) => void;
 	getSemanticTokens(): void;
 	$applyDocumentHighlight: (documentHighlights: lsp.DocumentHighlight[]) => void;
+	/**
+	 * Disposes of the SessionLanguageProvider, cleaning up all event listeners,
+	 * marker groups, and notifying the server to close the document.
+	 * This method should be called when the session is no longer needed.
+	 *
+	 * @param callback - Optional callback to execute after the document is closed
+	 */
+	dispose(callback?: any): void;
 	closeDocument(callback?: any): void;
 }
 declare class LanguageProvider {
-	activeEditor: Ace.Editor;
+	activeEditor: Ace.Editor | null;
 	private readonly $messageController;
 	private $signatureTooltip;
 	$sessionLanguageProviders: {
@@ -820,6 +829,8 @@ declare class LanguageProvider {
 	private inlineCompleter?;
 	private doLiveAutocomplete;
 	private completerAdapter?;
+	private $editorEventHandlers;
+	private $editorOriginalState;
 	private constructor();
 	/**
 	 *  Creates LanguageProvider using our transport protocol with the ability to register different services on the same
@@ -883,6 +894,16 @@ declare class LanguageProvider {
 	 * @param [config] - Configuration options for the session.
 	 */
 	registerEditor(editor: Ace.Editor, config?: SessionLspConfig): void;
+	/**
+	 * Unregisters an Ace editor instance, removing all event listeners, completers, tooltips,
+	 * and cleaning up associated resources. This is the counterpart to registerEditor.
+	 *
+	 * @param editor - The Ace editor instance to be unregistered.
+	 * @param cleanupSession - Optional flag to also dispose the current session. When true,
+	 *                         calls closeDocument on the editor's session, cleaning up all
+	 *                         session-related resources. Default: false.
+	 */
+	unregisterEditor(editor: Ace.Editor, cleanupSession?: boolean): void;
 	codeActionCallback: (codeActions: CodeActionsByService[]) => void;
 	/**
 	 * Sets a callback function that will be triggered with an array of code actions grouped by service.
@@ -893,6 +914,7 @@ declare class LanguageProvider {
 	executeCommand(command: string, serviceName: string, args?: any[], callback?: (something: any) => void): void;
 	applyEdit(workspaceEdit: lsp.WorkspaceEdit, serviceName: string, callback?: (result: lsp.ApplyWorkspaceEditResult, serviceName: string) => void): void;
 	$registerEditor(editor: Ace.Editor): void;
+	$unregisterEditor(editor: Ace.Editor, cleanupSession?: boolean): void;
 	private $provideCodeActions;
 	private $initHoverTooltip;
 	private createHoverNode;
@@ -960,9 +982,10 @@ declare class LanguageProvider {
 	$registerCompleters(editor: Ace.Editor): void;
 	closeConnection(): void;
 	/**
-	 * Removes document from all linked services by session id
-	 * @param session
-	 * @param [callback]
+	 * Removes document from all linked services by session id and cleans up all associated resources.
+	 * This includes removing event listeners, clearing marker groups, annotations, and notifying the server.
+	 * @param session - The Ace EditSession to close
+	 * @param [callback] - Optional callback to execute after the document is closed
 	 */
 	closeDocument(session: Ace.EditSession, callback?: any): void;
 	/**

package/build/ace-language-client.js

@@ -20990,7 +20990,20 @@ function signature_tooltip_define_property(obj, key, value) {
 
 class SignatureTooltip extends BaseTooltip {
     registerEditor(editor) {
-        editor.on("changeSelection", ()=>this.onChangeSelection(editor));
+        const handler = ()=>this.onChangeSelection(editor);
+        this.editorHandlers.set(editor, handler);
+        editor.on("changeSelection", handler);
+    }
+    unregisterEditor(editor) {
+        const handler = this.editorHandlers.get(editor);
+        if (handler) {
+            editor.off("changeSelection", handler);
+            this.editorHandlers.delete(editor);
+        }
+        // Clean up if this was the active editor
+        if (this.$activeEditor === editor) {
+            this.$inactivateEditor();
+        }
     }
     $registerEditorEvents() {
         this.$activeEditor.on("mousewheel", this.$onMouseWheel);
@@ -21000,6 +21013,7 @@ class SignatureTooltip extends BaseTooltip {
     }
     constructor(...args){
         super(...args);
+        signature_tooltip_define_property(this, "editorHandlers", new Map());
         signature_tooltip_define_property(this, "onChangeSelection", (editor)=>{
             if (!this.provider.options.functionality.signatureHelp) return;
             this.$activateEditor(editor);
@@ -21021,6 +21035,10 @@ class SignatureTooltip extends BaseTooltip {
             this.provideSignatureHelp();
         });
         signature_tooltip_define_property(this, "provideSignatureHelp", ()=>{
+            if (!this.$activeEditor) {
+                // Editor was deactivated before this callback
+                return;
+            }
             let cursor = this.$activeEditor.getCursorPosition();
             let session = this.$activeEditor.session;
             let docPos = session.screenToDocumentPosition(cursor.row, cursor.column);
@@ -21718,6 +21736,7 @@ class LightbulbWidget {
     removeListeners() {
         this.editor.off("changeSelection", this.hideAll);
         this.editor.off("focus", this.hideAll);
+        this.editor.renderer.off("afterRender", this.setPosition);
         this.editor.session.off("changeScrollTop", this.setPosition);
         this.editor.session.off("changeScrollLeft", this.setPosition);
     }
@@ -21806,7 +21825,10 @@ class LightbulbWidget {
     }
     dispose() {
         this.removeListeners();
-        document.body.removeChild(this.lightbulb);
+        if (this.lightbulb && this.lightbulb.parentNode) {
+            this.lightbulb.parentNode.removeChild(this.lightbulb);
+        }
+        this.popup.destroy();
     }
     constructor(editor, executeActionCallback){
         lightbulb_define_property(this, "codeActions", void 0);
@@ -22910,6 +22932,39 @@ class SessionLanguageProvider {
             }, 20);
         });
     }
+    /**
+     * Disposes of the SessionLanguageProvider, cleaning up all event listeners,
+     * marker groups, and notifying the server to close the document.
+     * This method should be called when the session is no longer needed.
+     *
+     * @param callback - Optional callback to execute after the document is closed
+     */ dispose(callback) {
+        this.session.doc.off("change", this.$changeListener);
+        this.session.off("changeMode", this.$changeMode);
+        if (this.$changeScrollTopHandler) {
+            this.session.off("changeScrollTop", this.$changeScrollTopHandler);
+            this.$changeScrollTopHandler = undefined;
+        }
+        if (this.state.occurrenceMarkers) {
+            this.state.occurrenceMarkers.setMarkers([]);
+            this.state.occurrenceMarkers = null;
+        }
+        if (this.state.diagnosticMarkers) {
+            this.state.diagnosticMarkers.setMarkers([]);
+            this.state.diagnosticMarkers = null;
+        }
+        this.session.clearAnnotations();
+        if (this.session.setSemanticTokens) {
+            this.session.setSemanticTokens(undefined);
+        }
+        this.$deltaQueue = null;
+        this.$requestsQueue = [];
+        if (this.documentUri) {
+            delete this.$provider.$urisToSessionsIds[this.documentUri];
+        }
+        this.$isConnected = false;
+        this.closeDocument(callback);
+    }
     closeDocument(callback) {
         this.$messageController.closeDocument(this.comboDocumentIdentifier, callback);
     }
@@ -22942,6 +22997,7 @@ class SessionLanguageProvider {
         session_language_provider_define_property(this, "editor", void 0);
         session_language_provider_define_property(this, "semanticTokensLegend", void 0);
         session_language_provider_define_property(this, "$provider", void 0);
+        session_language_provider_define_property(this, "$changeScrollTopHandler", void 0);
         session_language_provider_define_property(this, "$connected", (capabilities)=>{
             this.$isConnected = true;
             this.setServerCapabilities(capabilities);
@@ -23095,7 +23151,8 @@ class SessionLanguageProvider {
         this.addSemanticTokenSupport(session); //TODO: ?
         session.on("changeMode", this.$changeMode);
         if (this.$provider.options.functionality.semanticTokens) {
-            session.on("changeScrollTop", ()=>this.getSemanticTokens());
+            this.$changeScrollTopHandler = ()=>this.getSemanticTokens();
+            session.on("changeScrollTop", this.$changeScrollTopHandler);
         }
         this.$init(config);
     }
@@ -23251,6 +23308,17 @@ class LanguageProvider {
         config = config !== null && config !== void 0 ? config : editor.session.lspConfig;
         this.registerSession(editor.session, editor, config);
     }
+    /**
+     * Unregisters an Ace editor instance, removing all event listeners, completers, tooltips,
+     * and cleaning up associated resources. This is the counterpart to registerEditor.
+     *
+     * @param editor - The Ace editor instance to be unregistered.
+     * @param cleanupSession - Optional flag to also dispose the current session. When true,
+     *                         calls closeDocument on the editor's session, cleaning up all
+     *                         session-related resources. Default: false.
+     */ unregisterEditor(editor, cleanupSession = false) {
+        if (this.editors.includes(editor)) this.$unregisterEditor(editor, cleanupSession);
+    }
     /**
      * Sets a callback function that will be triggered with an array of code actions grouped by service.
      *
@@ -23318,20 +23386,25 @@ class LanguageProvider {
         AceVirtualRenderer.getConstructor(editor);
         AceEditor.getConstructor(editor);
         editor.setOption("useWorker", false);
+        this.$editorEventHandlers[editor.id] = {};
         if (!this.options.manualSessionControl) {
-            editor.on("changeSession", ({ session })=>this.registerSession(session, editor, session.lspConfig));
+            const changeSessionHandler = ({ session })=>this.registerSession(session, editor, session.lspConfig);
+            this.$editorEventHandlers[editor.id].changeSession = changeSessionHandler;
+            editor.on("changeSession", changeSessionHandler);
         }
         if (this.options.functionality.completion || this.options.functionality.inlineCompletion) {
             this.$registerCompleters(editor);
         }
         var _this_activeEditor;
         (_this_activeEditor = this.activeEditor) !== null && _this_activeEditor !== void 0 ? _this_activeEditor : this.activeEditor = editor;
-        editor.on("focus", ()=>{
+        const focusHandler = ()=>{
             this.activeEditor = editor;
-        });
+        };
+        this.$editorEventHandlers[editor.id].focus = focusHandler;
+        editor.on("focus", focusHandler);
         if (this.options.functionality.documentHighlights) {
             var $timer;
-            editor.on("changeSelection", ()=>{
+            const changeSelectionForHighlights = ()=>{
                 if (!$timer) $timer = setTimeout(()=>{
                     let sessionLanguageProvider = this.$getSessionLanguageProvider(editor.session);
                     if (!sessionLanguageProvider) {
@@ -23342,7 +23415,9 @@ class LanguageProvider {
                     this.$messageController.findDocumentHighlights(this.$getFileName(editor.session), fromPoint(cursor), sessionLanguageProvider.$applyDocumentHighlight);
                     $timer = undefined;
                 }, 50);
-            });
+            };
+            this.$editorEventHandlers[editor.id].changeSelectionForHighlights = changeSelectionForHighlights;
+            editor.on("changeSelection", changeSelectionForHighlights);
         }
         if (this.options.functionality.codeActions) {
             this.$provideCodeActions(editor);
@@ -23358,6 +23433,71 @@ class LanguageProvider {
         }
         this.setStyles(editor);
     }
+    $unregisterEditor(editor, cleanupSession = false) {
+        var _this_options_functionality, _this_options_functionality1, _this_options_functionality2;
+        const editorIndex = this.editors.indexOf(editor);
+        if (editorIndex > -1) {
+            this.editors.splice(editorIndex, 1);
+        }
+        const handlers = this.$editorEventHandlers[editor.id];
+        if (handlers) {
+            if (handlers.changeSession) {
+                editor.off("changeSession", handlers.changeSession);
+            }
+            if (handlers.focus) {
+                editor.off("focus", handlers.focus);
+            }
+            if (handlers.changeSelectionForHighlights) {
+                editor.off("changeSelection", handlers.changeSelectionForHighlights);
+            }
+            if (handlers.changeSelectionForCodeActions) {
+                editor.off("changeSelection", handlers.changeSelectionForCodeActions);
+            }
+            if (handlers.afterExec) {
+                editor.commands.off('afterExec', handlers.afterExec);
+            }
+            delete this.$editorEventHandlers[editor.id];
+        }
+        const originalState = this.$editorOriginalState[editor.id];
+        if (originalState) {
+            var _this_options_functionality3, _this_options_functionality4, _this_options_functionality5;
+            if (((_this_options_functionality3 = this.options.functionality) === null || _this_options_functionality3 === void 0 ? void 0 : _this_options_functionality3.completion) && originalState.completers !== undefined) {
+                editor.completers = originalState.completers;
+            }
+            if (((_this_options_functionality4 = this.options.functionality) === null || _this_options_functionality4 === void 0 ? void 0 : _this_options_functionality4.inlineCompletion) && originalState.inlineCompleters !== undefined) {
+                editor.inlineCompleters = originalState.inlineCompleters;
+            }
+            if ((_this_options_functionality5 = this.options.functionality) === null || _this_options_functionality5 === void 0 ? void 0 : _this_options_functionality5.inlineCompletion) {
+                if (originalState.inlineAutocompleteCommand) {
+                    editor.commands.addCommand(originalState.inlineAutocompleteCommand);
+                } else {
+                    try {
+                        editor.commands.removeCommand("startInlineAutocomplete");
+                    } catch (e) {}
+                }
+            }
+            delete this.$editorOriginalState[editor.id];
+        }
+        if ((_this_options_functionality = this.options.functionality) === null || _this_options_functionality === void 0 ? void 0 : _this_options_functionality.signatureHelp) {
+            this.$signatureTooltip.unregisterEditor(editor);
+        }
+        if (((_this_options_functionality1 = this.options.functionality) === null || _this_options_functionality1 === void 0 ? void 0 : _this_options_functionality1.hover) && this.$hoverTooltip) {
+            this.$hoverTooltip.removeFromEditor(editor);
+        }
+        if ((_this_options_functionality2 = this.options.functionality) === null || _this_options_functionality2 === void 0 ? void 0 : _this_options_functionality2.codeActions) {
+            const lightBulb = this.$lightBulbWidgets[editor.id];
+            if (lightBulb) {
+                lightBulb.dispose();
+                delete this.$lightBulbWidgets[editor.id];
+            }
+        }
+        if (this.activeEditor === editor) {
+            this.activeEditor = this.editors.length > 0 ? this.editors[0] : null;
+        }
+        if (cleanupSession && editor.session) {
+            this.closeDocument(editor.session);
+        }
+    }
     $provideCodeActions(editor) {
         const lightBulb = new LightbulbWidget(editor);
         this.$lightBulbWidgets[editor.id] = lightBulb;
@@ -23376,7 +23516,7 @@ class LanguageProvider {
             }
         });
         var actionTimer;
-        editor.on("changeSelection", ()=>{
+        const changeSelectionForCodeActions = ()=>{
             if (!actionTimer) actionTimer = setTimeout(()=>{
                 if (!this.$getSessionLanguageProvider(editor.session)) {
                     actionTimer = undefined;
@@ -23394,7 +23534,9 @@ class LanguageProvider {
                 });
                 actionTimer = undefined;
             }, 500);
-        });
+        };
+        this.$editorEventHandlers[editor.id].changeSelectionForCodeActions = changeSelectionForCodeActions;
+        editor.on("changeSelection", changeSelectionForCodeActions);
     }
     $initHoverTooltip(editor) {
         const Range = editor.getSelectionRange().constructor;
@@ -23508,8 +23650,10 @@ class LanguageProvider {
     }
     getSemanticTokens() {
         if (!this.options.functionality.semanticTokens) return;
-        let sessionLanguageProvider = this.$getSessionLanguageProvider(this.activeEditor.session);
-        sessionLanguageProvider.getSemanticTokens();
+        if (this.activeEditor) {
+            let sessionLanguageProvider = this.$getSessionLanguageProvider(this.activeEditor.session);
+            sessionLanguageProvider.getSemanticTokens();
+        }
     }
     doComplete(editor, session, callback) {
         let cursor = editor.getCursorPosition();
@@ -23523,16 +23667,27 @@ class LanguageProvider {
         this.$messageController.doResolve(item["fileName"], toCompletionItem(item), callback);
     }
     $registerCompleters(editor) {
-        var _this_options_functionality, _this_options_functionality1, _this_options_functionality2, _this_options_functionality3, _this_options_functionality4, _this_options_functionality5, _this_options_functionality6, _this_options, _this_options_functionality7;
+        var _this_options_functionality, _this_options_functionality1, _this_options_functionality2, _this_options_functionality3, _this_options_functionality4, _this_options, _this_options_functionality5;
         let completer, inlineCompleter;
         if (!((_this_options_functionality = this.options.functionality) === null || _this_options_functionality === void 0 ? void 0 : _this_options_functionality.completion) && !((_this_options_functionality1 = this.options.functionality) === null || _this_options_functionality1 === void 0 ? void 0 : _this_options_functionality1.inlineCompletion)) {
             return;
         }
-        if (((_this_options_functionality2 = this.options.functionality) === null || _this_options_functionality2 === void 0 ? void 0 : _this_options_functionality2.completion) && ((_this_options_functionality3 = this.options.functionality) === null || _this_options_functionality3 === void 0 ? void 0 : _this_options_functionality3.completion.overwriteCompleters)) {
-            editor.completers = [];
+        this.$editorOriginalState[editor.id] = {};
+        if ((_this_options_functionality2 = this.options.functionality) === null || _this_options_functionality2 === void 0 ? void 0 : _this_options_functionality2.completion) {
+            this.$editorOriginalState[editor.id].completers = editor.completers ? [
+                ...editor.completers
+            ] : [];
+            if (this.options.functionality.completion.overwriteCompleters) {
+                editor.completers = [];
+            }
         }
-        if (((_this_options_functionality4 = this.options.functionality) === null || _this_options_functionality4 === void 0 ? void 0 : _this_options_functionality4.inlineCompletion) && ((_this_options_functionality5 = this.options.functionality) === null || _this_options_functionality5 === void 0 ? void 0 : _this_options_functionality5.inlineCompletion.overwriteCompleters)) {
-            editor.inlineCompleters = [];
+        if ((_this_options_functionality3 = this.options.functionality) === null || _this_options_functionality3 === void 0 ? void 0 : _this_options_functionality3.inlineCompletion) {
+            this.$editorOriginalState[editor.id].inlineCompleters = editor.inlineCompleters ? [
+                ...editor.inlineCompleters
+            ] : [];
+            if (this.options.functionality.inlineCompletion.overwriteCompleters) {
+                editor.inlineCompleters = [];
+            }
         }
         if (this.options.functionality.completion) {
             completer = {
@@ -23578,7 +23733,7 @@ class LanguageProvider {
             };
             editor.completers.push(completer);
         }
-        if ((_this_options = this.options) === null || _this_options === void 0 ? void 0 : (_this_options_functionality6 = _this_options.functionality) === null || _this_options_functionality6 === void 0 ? void 0 : _this_options_functionality6.inlineCompletion) {
+        if ((_this_options = this.options) === null || _this_options === void 0 ? void 0 : (_this_options_functionality4 = _this_options.functionality) === null || _this_options_functionality4 === void 0 ? void 0 : _this_options_functionality4.inlineCompletion) {
             this.checkInlineCompletionAdapter(()=>{
                 if (this.completerAdapter) {
                     var _editor;
@@ -23590,7 +23745,9 @@ class LanguageProvider {
                 }
             });
         }
-        if ((_this_options_functionality7 = this.options.functionality) === null || _this_options_functionality7 === void 0 ? void 0 : _this_options_functionality7.inlineCompletion) {
+        if ((_this_options_functionality5 = this.options.functionality) === null || _this_options_functionality5 === void 0 ? void 0 : _this_options_functionality5.inlineCompletion) {
+            const existingCommand = editor.commands.commands["startInlineAutocomplete"];
+            this.$editorOriginalState[editor.id].inlineAutocompleteCommand = existingCommand || null;
             editor.commands.addCommand({
                 name: "startInlineAutocomplete",
                 exec: (editor, options)=>{
@@ -23603,6 +23760,7 @@ class LanguageProvider {
                     mac: "Option-C"
                 }
             });
+            this.$editorEventHandlers[editor.id].afterExec = this.doLiveAutocomplete;
             editor.commands.on('afterExec', this.doLiveAutocomplete);
             inlineCompleter = {
                 getCompletions: async (editor, session, pos, prefix, callback)=>{
@@ -23630,13 +23788,14 @@ class LanguageProvider {
         });
     }
     /**
-     * Removes document from all linked services by session id
-     * @param session
-     * @param [callback]
+     * Removes document from all linked services by session id and cleans up all associated resources.
+     * This includes removing event listeners, clearing marker groups, annotations, and notifying the server.
+     * @param session - The Ace EditSession to close
+     * @param [callback] - Optional callback to execute after the document is closed
      */ closeDocument(session, callback) {
         let sessionProvider = this.$getSessionLanguageProvider(session);
         if (sessionProvider) {
-            sessionProvider.closeDocument(callback);
+            sessionProvider.dispose(callback);
             delete this.$sessionLanguageProviders[session["id"]];
         }
     }
@@ -23678,6 +23837,8 @@ class LanguageProvider {
         language_provider_define_property(this, "inlineCompleter", void 0);
         language_provider_define_property(this, "doLiveAutocomplete", void 0);
         language_provider_define_property(this, "completerAdapter", void 0);
+        language_provider_define_property(this, "$editorEventHandlers", {});
+        language_provider_define_property(this, "$editorOriginalState", {});
         /**
      * Registers a new editing session with the editor and associates it with a language provider.
      * If a language provider for the specified editing session does not already exist, it initializes
@@ -23697,8 +23858,10 @@ class LanguageProvider {
         language_provider_define_property(this, "codeActionCallback", void 0);
         language_provider_define_property(this, "format", ()=>{
             if (!this.options.functionality.format) return;
-            let sessionLanguageProvider = this.$getSessionLanguageProvider(this.activeEditor.session);
-            sessionLanguageProvider.$sendDeltaQueue(sessionLanguageProvider.format);
+            if (this.activeEditor) {
+                let sessionLanguageProvider = this.$getSessionLanguageProvider(this.activeEditor.session);
+                sessionLanguageProvider.$sendDeltaQueue(sessionLanguageProvider.format);
+            }
         });
         this.$messageController = new MessageController(worker, this);
         this.setProviderOptions(options);

package/build/ace-linters.d.ts

@@ -686,6 +686,7 @@ declare class SessionLanguageProvider {
 	editor: Ace.Editor;
 	private semanticTokensLegend?;
 	private $provider;
+	private $changeScrollTopHandler?;
 	/**
 	 * Constructs a new instance of the `SessionLanguageProvider` class.
 	 *
@@ -728,10 +729,18 @@ declare class SessionLanguageProvider {
 	applyEdits: (edits: lsp.TextEdit[]) => void;
 	getSemanticTokens(): void;
 	$applyDocumentHighlight: (documentHighlights: lsp.DocumentHighlight[]) => void;
+	/**
+	 * Disposes of the SessionLanguageProvider, cleaning up all event listeners,
+	 * marker groups, and notifying the server to close the document.
+	 * This method should be called when the session is no longer needed.
+	 *
+	 * @param callback - Optional callback to execute after the document is closed
+	 */
+	dispose(callback?: any): void;
 	closeDocument(callback?: any): void;
 }
 export declare class LanguageProvider {
-	activeEditor: Ace.Editor;
+	activeEditor: Ace.Editor | null;
 	private readonly $messageController;
 	private $signatureTooltip;
 	$sessionLanguageProviders: {
@@ -749,6 +758,8 @@ export declare class LanguageProvider {
 	private inlineCompleter?;
 	private doLiveAutocomplete;
 	private completerAdapter?;
+	private $editorEventHandlers;
+	private $editorOriginalState;
 	private constructor();
 	/**
 	 *  Creates LanguageProvider using our transport protocol with the ability to register different services on the same
@@ -812,6 +823,16 @@ export declare class LanguageProvider {
 	 * @param [config] - Configuration options for the session.
 	 */
 	registerEditor(editor: Ace.Editor, config?: SessionLspConfig): void;
+	/**
+	 * Unregisters an Ace editor instance, removing all event listeners, completers, tooltips,
+	 * and cleaning up associated resources. This is the counterpart to registerEditor.
+	 *
+	 * @param editor - The Ace editor instance to be unregistered.
+	 * @param cleanupSession - Optional flag to also dispose the current session. When true,
+	 *                         calls closeDocument on the editor's session, cleaning up all
+	 *                         session-related resources. Default: false.
+	 */
+	unregisterEditor(editor: Ace.Editor, cleanupSession?: boolean): void;
 	codeActionCallback: (codeActions: CodeActionsByService[]) => void;
 	/**
 	 * Sets a callback function that will be triggered with an array of code actions grouped by service.
@@ -822,6 +843,7 @@ export declare class LanguageProvider {
 	executeCommand(command: string, serviceName: string, args?: any[], callback?: (something: any) => void): void;
 	applyEdit(workspaceEdit: lsp.WorkspaceEdit, serviceName: string, callback?: (result: lsp.ApplyWorkspaceEditResult, serviceName: string) => void): void;
 	$registerEditor(editor: Ace.Editor): void;
+	$unregisterEditor(editor: Ace.Editor, cleanupSession?: boolean): void;
 	private $provideCodeActions;
 	private $initHoverTooltip;
 	private createHoverNode;
@@ -889,9 +911,10 @@ export declare class LanguageProvider {
 	$registerCompleters(editor: Ace.Editor): void;
 	closeConnection(): void;
 	/**
-	 * Removes document from all linked services by session id
-	 * @param session
-	 * @param [callback]
+	 * Removes document from all linked services by session id and cleans up all associated resources.
+	 * This includes removing event listeners, clearing marker groups, annotations, and notifying the server.
+	 * @param session - The Ace EditSession to close
+	 * @param [callback] - Optional callback to execute after the document is closed
 	 */
 	closeDocument(session: Ace.EditSession, callback?: any): void;
 	/**

package/build/ace-linters.js

@@ -19981,7 +19981,20 @@ function signature_tooltip_define_property(obj, key, value) {
 
 class SignatureTooltip extends BaseTooltip {
     registerEditor(editor) {
-        editor.on("changeSelection", ()=>this.onChangeSelection(editor));
+        const handler = ()=>this.onChangeSelection(editor);
+        this.editorHandlers.set(editor, handler);
+        editor.on("changeSelection", handler);
+    }
+    unregisterEditor(editor) {
+        const handler = this.editorHandlers.get(editor);
+        if (handler) {
+            editor.off("changeSelection", handler);
+            this.editorHandlers.delete(editor);
+        }
+        // Clean up if this was the active editor
+        if (this.$activeEditor === editor) {
+            this.$inactivateEditor();
+        }
     }
     $registerEditorEvents() {
         this.$activeEditor.on("mousewheel", this.$onMouseWheel);
@@ -19991,6 +20004,7 @@ class SignatureTooltip extends BaseTooltip {
     }
     constructor(...args){
         super(...args);
+        signature_tooltip_define_property(this, "editorHandlers", new Map());
         signature_tooltip_define_property(this, "onChangeSelection", (editor)=>{
             if (!this.provider.options.functionality.signatureHelp) return;
             this.$activateEditor(editor);
@@ -20012,6 +20026,10 @@ class SignatureTooltip extends BaseTooltip {
             this.provideSignatureHelp();
         });
         signature_tooltip_define_property(this, "provideSignatureHelp", ()=>{
+            if (!this.$activeEditor) {
+                // Editor was deactivated before this callback
+                return;
+            }
             let cursor = this.$activeEditor.getCursorPosition();
             let session = this.$activeEditor.session;
             let docPos = session.screenToDocumentPosition(cursor.row, cursor.column);
@@ -20709,6 +20727,7 @@ class LightbulbWidget {
     removeListeners() {
         this.editor.off("changeSelection", this.hideAll);
         this.editor.off("focus", this.hideAll);
+        this.editor.renderer.off("afterRender", this.setPosition);
         this.editor.session.off("changeScrollTop", this.setPosition);
         this.editor.session.off("changeScrollLeft", this.setPosition);
     }
@@ -20797,7 +20816,10 @@ class LightbulbWidget {
     }
     dispose() {
         this.removeListeners();
-        document.body.removeChild(this.lightbulb);
+        if (this.lightbulb && this.lightbulb.parentNode) {
+            this.lightbulb.parentNode.removeChild(this.lightbulb);
+        }
+        this.popup.destroy();
     }
     constructor(editor, executeActionCallback){
         lightbulb_define_property(this, "codeActions", void 0);
@@ -21901,6 +21923,39 @@ class SessionLanguageProvider {
             }, 20);
         });
     }
+    /**
+     * Disposes of the SessionLanguageProvider, cleaning up all event listeners,
+     * marker groups, and notifying the server to close the document.
+     * This method should be called when the session is no longer needed.
+     *
+     * @param callback - Optional callback to execute after the document is closed
+     */ dispose(callback) {
+        this.session.doc.off("change", this.$changeListener);
+        this.session.off("changeMode", this.$changeMode);
+        if (this.$changeScrollTopHandler) {
+            this.session.off("changeScrollTop", this.$changeScrollTopHandler);
+            this.$changeScrollTopHandler = undefined;
+        }
+        if (this.state.occurrenceMarkers) {
+            this.state.occurrenceMarkers.setMarkers([]);
+            this.state.occurrenceMarkers = null;
+        }
+        if (this.state.diagnosticMarkers) {
+            this.state.diagnosticMarkers.setMarkers([]);
+            this.state.diagnosticMarkers = null;
+        }
+        this.session.clearAnnotations();
+        if (this.session.setSemanticTokens) {
+            this.session.setSemanticTokens(undefined);
+        }
+        this.$deltaQueue = null;
+        this.$requestsQueue = [];
+        if (this.documentUri) {
+            delete this.$provider.$urisToSessionsIds[this.documentUri];
+        }
+        this.$isConnected = false;
+        this.closeDocument(callback);
+    }
     closeDocument(callback) {
         this.$messageController.closeDocument(this.comboDocumentIdentifier, callback);
     }
@@ -21933,6 +21988,7 @@ class SessionLanguageProvider {
         session_language_provider_define_property(this, "editor", void 0);
         session_language_provider_define_property(this, "semanticTokensLegend", void 0);
         session_language_provider_define_property(this, "$provider", void 0);
+        session_language_provider_define_property(this, "$changeScrollTopHandler", void 0);
         session_language_provider_define_property(this, "$connected", (capabilities)=>{
             this.$isConnected = true;
             this.setServerCapabilities(capabilities);
@@ -22086,7 +22142,8 @@ class SessionLanguageProvider {
         this.addSemanticTokenSupport(session); //TODO: ?
         session.on("changeMode", this.$changeMode);
         if (this.$provider.options.functionality.semanticTokens) {
-            session.on("changeScrollTop", ()=>this.getSemanticTokens());
+            this.$changeScrollTopHandler = ()=>this.getSemanticTokens();
+            session.on("changeScrollTop", this.$changeScrollTopHandler);
         }
         this.$init(config);
     }
@@ -22242,6 +22299,17 @@ class LanguageProvider {
         config = config !== null && config !== void 0 ? config : editor.session.lspConfig;
         this.registerSession(editor.session, editor, config);
     }
+    /**
+     * Unregisters an Ace editor instance, removing all event listeners, completers, tooltips,
+     * and cleaning up associated resources. This is the counterpart to registerEditor.
+     *
+     * @param editor - The Ace editor instance to be unregistered.
+     * @param cleanupSession - Optional flag to also dispose the current session. When true,
+     *                         calls closeDocument on the editor's session, cleaning up all
+     *                         session-related resources. Default: false.
+     */ unregisterEditor(editor, cleanupSession = false) {
+        if (this.editors.includes(editor)) this.$unregisterEditor(editor, cleanupSession);
+    }
     /**
      * Sets a callback function that will be triggered with an array of code actions grouped by service.
      *
@@ -22309,20 +22377,25 @@ class LanguageProvider {
         AceVirtualRenderer.getConstructor(editor);
         AceEditor.getConstructor(editor);
         editor.setOption("useWorker", false);
+        this.$editorEventHandlers[editor.id] = {};
         if (!this.options.manualSessionControl) {
-            editor.on("changeSession", ({ session })=>this.registerSession(session, editor, session.lspConfig));
+            const changeSessionHandler = ({ session })=>this.registerSession(session, editor, session.lspConfig);
+            this.$editorEventHandlers[editor.id].changeSession = changeSessionHandler;
+            editor.on("changeSession", changeSessionHandler);
         }
         if (this.options.functionality.completion || this.options.functionality.inlineCompletion) {
             this.$registerCompleters(editor);
         }
         var _this_activeEditor;
         (_this_activeEditor = this.activeEditor) !== null && _this_activeEditor !== void 0 ? _this_activeEditor : this.activeEditor = editor;
-        editor.on("focus", ()=>{
+        const focusHandler = ()=>{
             this.activeEditor = editor;
-        });
+        };
+        this.$editorEventHandlers[editor.id].focus = focusHandler;
+        editor.on("focus", focusHandler);
         if (this.options.functionality.documentHighlights) {
             var $timer;
-            editor.on("changeSelection", ()=>{
+            const changeSelectionForHighlights = ()=>{
                 if (!$timer) $timer = setTimeout(()=>{
                     let sessionLanguageProvider = this.$getSessionLanguageProvider(editor.session);
                     if (!sessionLanguageProvider) {
@@ -22333,7 +22406,9 @@ class LanguageProvider {
                     this.$messageController.findDocumentHighlights(this.$getFileName(editor.session), fromPoint(cursor), sessionLanguageProvider.$applyDocumentHighlight);
                     $timer = undefined;
                 }, 50);
-            });
+            };
+            this.$editorEventHandlers[editor.id].changeSelectionForHighlights = changeSelectionForHighlights;
+            editor.on("changeSelection", changeSelectionForHighlights);
         }
         if (this.options.functionality.codeActions) {
             this.$provideCodeActions(editor);
@@ -22349,6 +22424,71 @@ class LanguageProvider {
         }
         this.setStyles(editor);
     }
+    $unregisterEditor(editor, cleanupSession = false) {
+        var _this_options_functionality, _this_options_functionality1, _this_options_functionality2;
+        const editorIndex = this.editors.indexOf(editor);
+        if (editorIndex > -1) {
+            this.editors.splice(editorIndex, 1);
+        }
+        const handlers = this.$editorEventHandlers[editor.id];
+        if (handlers) {
+            if (handlers.changeSession) {
+                editor.off("changeSession", handlers.changeSession);
+            }
+            if (handlers.focus) {
+                editor.off("focus", handlers.focus);
+            }
+            if (handlers.changeSelectionForHighlights) {
+                editor.off("changeSelection", handlers.changeSelectionForHighlights);
+            }
+            if (handlers.changeSelectionForCodeActions) {
+                editor.off("changeSelection", handlers.changeSelectionForCodeActions);
+            }
+            if (handlers.afterExec) {
+                editor.commands.off('afterExec', handlers.afterExec);
+            }
+            delete this.$editorEventHandlers[editor.id];
+        }
+        const originalState = this.$editorOriginalState[editor.id];
+        if (originalState) {
+            var _this_options_functionality3, _this_options_functionality4, _this_options_functionality5;
+            if (((_this_options_functionality3 = this.options.functionality) === null || _this_options_functionality3 === void 0 ? void 0 : _this_options_functionality3.completion) && originalState.completers !== undefined) {
+                editor.completers = originalState.completers;
+            }
+            if (((_this_options_functionality4 = this.options.functionality) === null || _this_options_functionality4 === void 0 ? void 0 : _this_options_functionality4.inlineCompletion) && originalState.inlineCompleters !== undefined) {
+                editor.inlineCompleters = originalState.inlineCompleters;
+            }
+            if ((_this_options_functionality5 = this.options.functionality) === null || _this_options_functionality5 === void 0 ? void 0 : _this_options_functionality5.inlineCompletion) {
+                if (originalState.inlineAutocompleteCommand) {
+                    editor.commands.addCommand(originalState.inlineAutocompleteCommand);
+                } else {
+                    try {
+                        editor.commands.removeCommand("startInlineAutocomplete");
+                    } catch (e) {}
+                }
+            }
+            delete this.$editorOriginalState[editor.id];
+        }
+        if ((_this_options_functionality = this.options.functionality) === null || _this_options_functionality === void 0 ? void 0 : _this_options_functionality.signatureHelp) {
+            this.$signatureTooltip.unregisterEditor(editor);
+        }
+        if (((_this_options_functionality1 = this.options.functionality) === null || _this_options_functionality1 === void 0 ? void 0 : _this_options_functionality1.hover) && this.$hoverTooltip) {
+            this.$hoverTooltip.removeFromEditor(editor);
+        }
+        if ((_this_options_functionality2 = this.options.functionality) === null || _this_options_functionality2 === void 0 ? void 0 : _this_options_functionality2.codeActions) {
+            const lightBulb = this.$lightBulbWidgets[editor.id];
+            if (lightBulb) {
+                lightBulb.dispose();
+                delete this.$lightBulbWidgets[editor.id];
+            }
+        }
+        if (this.activeEditor === editor) {
+            this.activeEditor = this.editors.length > 0 ? this.editors[0] : null;
+        }
+        if (cleanupSession && editor.session) {
+            this.closeDocument(editor.session);
+        }
+    }
     $provideCodeActions(editor) {
         const lightBulb = new LightbulbWidget(editor);
         this.$lightBulbWidgets[editor.id] = lightBulb;
@@ -22367,7 +22507,7 @@ class LanguageProvider {
             }
         });
         var actionTimer;
-        editor.on("changeSelection", ()=>{
+        const changeSelectionForCodeActions = ()=>{
             if (!actionTimer) actionTimer = setTimeout(()=>{
                 if (!this.$getSessionLanguageProvider(editor.session)) {
                     actionTimer = undefined;
@@ -22385,7 +22525,9 @@ class LanguageProvider {
                 });
                 actionTimer = undefined;
             }, 500);
-        });
+        };
+        this.$editorEventHandlers[editor.id].changeSelectionForCodeActions = changeSelectionForCodeActions;
+        editor.on("changeSelection", changeSelectionForCodeActions);
     }
     $initHoverTooltip(editor) {
         const Range = editor.getSelectionRange().constructor;
@@ -22499,8 +22641,10 @@ class LanguageProvider {
     }
     getSemanticTokens() {
         if (!this.options.functionality.semanticTokens) return;
-        let sessionLanguageProvider = this.$getSessionLanguageProvider(this.activeEditor.session);
-        sessionLanguageProvider.getSemanticTokens();
+        if (this.activeEditor) {
+            let sessionLanguageProvider = this.$getSessionLanguageProvider(this.activeEditor.session);
+            sessionLanguageProvider.getSemanticTokens();
+        }
     }
     doComplete(editor, session, callback) {
         let cursor = editor.getCursorPosition();
@@ -22514,16 +22658,27 @@ class LanguageProvider {
         this.$messageController.doResolve(item["fileName"], toCompletionItem(item), callback);
     }
     $registerCompleters(editor) {
-        var _this_options_functionality, _this_options_functionality1, _this_options_functionality2, _this_options_functionality3, _this_options_functionality4, _this_options_functionality5, _this_options_functionality6, _this_options, _this_options_functionality7;
+        var _this_options_functionality, _this_options_functionality1, _this_options_functionality2, _this_options_functionality3, _this_options_functionality4, _this_options, _this_options_functionality5;
         let completer, inlineCompleter;
         if (!((_this_options_functionality = this.options.functionality) === null || _this_options_functionality === void 0 ? void 0 : _this_options_functionality.completion) && !((_this_options_functionality1 = this.options.functionality) === null || _this_options_functionality1 === void 0 ? void 0 : _this_options_functionality1.inlineCompletion)) {
             return;
         }
-        if (((_this_options_functionality2 = this.options.functionality) === null || _this_options_functionality2 === void 0 ? void 0 : _this_options_functionality2.completion) && ((_this_options_functionality3 = this.options.functionality) === null || _this_options_functionality3 === void 0 ? void 0 : _this_options_functionality3.completion.overwriteCompleters)) {
-            editor.completers = [];
+        this.$editorOriginalState[editor.id] = {};
+        if ((_this_options_functionality2 = this.options.functionality) === null || _this_options_functionality2 === void 0 ? void 0 : _this_options_functionality2.completion) {
+            this.$editorOriginalState[editor.id].completers = editor.completers ? [
+                ...editor.completers
+            ] : [];
+            if (this.options.functionality.completion.overwriteCompleters) {
+                editor.completers = [];
+            }
         }
-        if (((_this_options_functionality4 = this.options.functionality) === null || _this_options_functionality4 === void 0 ? void 0 : _this_options_functionality4.inlineCompletion) && ((_this_options_functionality5 = this.options.functionality) === null || _this_options_functionality5 === void 0 ? void 0 : _this_options_functionality5.inlineCompletion.overwriteCompleters)) {
-            editor.inlineCompleters = [];
+        if ((_this_options_functionality3 = this.options.functionality) === null || _this_options_functionality3 === void 0 ? void 0 : _this_options_functionality3.inlineCompletion) {
+            this.$editorOriginalState[editor.id].inlineCompleters = editor.inlineCompleters ? [
+                ...editor.inlineCompleters
+            ] : [];
+            if (this.options.functionality.inlineCompletion.overwriteCompleters) {
+                editor.inlineCompleters = [];
+            }
         }
         if (this.options.functionality.completion) {
             completer = {
@@ -22569,7 +22724,7 @@ class LanguageProvider {
             };
             editor.completers.push(completer);
         }
-        if ((_this_options = this.options) === null || _this_options === void 0 ? void 0 : (_this_options_functionality6 = _this_options.functionality) === null || _this_options_functionality6 === void 0 ? void 0 : _this_options_functionality6.inlineCompletion) {
+        if ((_this_options = this.options) === null || _this_options === void 0 ? void 0 : (_this_options_functionality4 = _this_options.functionality) === null || _this_options_functionality4 === void 0 ? void 0 : _this_options_functionality4.inlineCompletion) {
             this.checkInlineCompletionAdapter(()=>{
                 if (this.completerAdapter) {
                     var _editor;
@@ -22581,7 +22736,9 @@ class LanguageProvider {
                 }
             });
         }
-        if ((_this_options_functionality7 = this.options.functionality) === null || _this_options_functionality7 === void 0 ? void 0 : _this_options_functionality7.inlineCompletion) {
+        if ((_this_options_functionality5 = this.options.functionality) === null || _this_options_functionality5 === void 0 ? void 0 : _this_options_functionality5.inlineCompletion) {
+            const existingCommand = editor.commands.commands["startInlineAutocomplete"];
+            this.$editorOriginalState[editor.id].inlineAutocompleteCommand = existingCommand || null;
             editor.commands.addCommand({
                 name: "startInlineAutocomplete",
                 exec: (editor, options)=>{
@@ -22594,6 +22751,7 @@ class LanguageProvider {
                     mac: "Option-C"
                 }
             });
+            this.$editorEventHandlers[editor.id].afterExec = this.doLiveAutocomplete;
             editor.commands.on('afterExec', this.doLiveAutocomplete);
             inlineCompleter = {
                 getCompletions: async (editor, session, pos, prefix, callback)=>{
@@ -22621,13 +22779,14 @@ class LanguageProvider {
         });
     }
     /**
-     * Removes document from all linked services by session id
-     * @param session
-     * @param [callback]
+     * Removes document from all linked services by session id and cleans up all associated resources.
+     * This includes removing event listeners, clearing marker groups, annotations, and notifying the server.
+     * @param session - The Ace EditSession to close
+     * @param [callback] - Optional callback to execute after the document is closed
      */ closeDocument(session, callback) {
         let sessionProvider = this.$getSessionLanguageProvider(session);
         if (sessionProvider) {
-            sessionProvider.closeDocument(callback);
+            sessionProvider.dispose(callback);
             delete this.$sessionLanguageProviders[session["id"]];
         }
     }
@@ -22669,6 +22828,8 @@ class LanguageProvider {
         language_provider_define_property(this, "inlineCompleter", void 0);
         language_provider_define_property(this, "doLiveAutocomplete", void 0);
         language_provider_define_property(this, "completerAdapter", void 0);
+        language_provider_define_property(this, "$editorEventHandlers", {});
+        language_provider_define_property(this, "$editorOriginalState", {});
         /**
      * Registers a new editing session with the editor and associates it with a language provider.
      * If a language provider for the specified editing session does not already exist, it initializes
@@ -22688,8 +22849,10 @@ class LanguageProvider {
         language_provider_define_property(this, "codeActionCallback", void 0);
         language_provider_define_property(this, "format", ()=>{
             if (!this.options.functionality.format) return;
-            let sessionLanguageProvider = this.$getSessionLanguageProvider(this.activeEditor.session);
-            sessionLanguageProvider.$sendDeltaQueue(sessionLanguageProvider.format);
+            if (this.activeEditor) {
+                let sessionLanguageProvider = this.$getSessionLanguageProvider(this.activeEditor.session);
+                sessionLanguageProvider.$sendDeltaQueue(sessionLanguageProvider.format);
+            }
         });
         this.$messageController = new MessageController(worker, this);
         this.setProviderOptions(options);

package/build/language-client.js

@@ -17960,11 +17960,31 @@ class LanguageClient extends base_service.BaseService {
     }
     async closeConnection() {
         if (!this.connection) return;
-        await this.dispose();
-        await this.connection.sendRequest("shutdown");
-        await this.connection.sendNotification('exit');
-        if (this.socket) this.socket.close();
-        this.isConnected = false;
+        try {
+            Object.values(this.callbacks).forEach((callback)=>{
+                if (typeof callback === 'function') {
+                    callback({
+                        error: 'Connection closed'
+                    });
+                }
+            });
+            this.callbacks = {};
+            if (this.isConnected) {
+                await this.connection.sendRequest("shutdown");
+                await this.connection.sendNotification('exit');
+            }
+            await this.dispose();
+            if (this.socket && (this.socket.readyState === WebSocket.OPEN || this.socket.readyState === WebSocket.CONNECTING)) {
+                this.socket.close();
+            }
+            this.isConnected = false;
+        } catch (error) {
+            language_client_console.error('Error closing connection:', error);
+            this.isConnected = false;
+            if (this.socket && this.socket.readyState !== WebSocket.CLOSED) {
+                this.socket.close();
+            }
+        }
     }
     sendInitialize(initializationOptions) {
         if (!this.isConnected) return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ace-linters",
   "author": "Azat Alimov <mkslanc@gmail.com>",
-  "version": "1.8.5",
+  "version": "1.8.7",
   "scripts": {
     "clean": "rimraf build",
     "postbuild": "node postbuild.js",