Clean off all completer styles when disabling

Author: krassowski

packages/jupyterlab-lsp/src/features/completion/completion.ts

@@ -1,6 +1,10 @@
 import { JupyterFrontEnd } from '@jupyterlab/application';
 import { CodeEditor } from '@jupyterlab/codeeditor';
-import { CompletionHandler, ICompletionManager } from '@jupyterlab/completer';
+import {
+  CompletionHandler,
+  ICompletionManager,
+  CompleterModel
+} from '@jupyterlab/completer';
 import { IDocumentWidget } from '@jupyterlab/docregistry';
 import { NotebookPanel } from '@jupyterlab/notebook';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
@@ -27,6 +31,7 @@ import { ICompletionData, LSPCompletionRenderer } from './renderer';
 
 const DOC_PANEL_SELECTOR = '.jp-Completer-docpanel';
 const DOC_PANEL_PLACEHOLDER_CLASS = 'lsp-completer-placeholder';
+const LSP_COMPLETER_CLASS = 'lsp-completer';
 
 export class CompletionCM extends CodeMirrorIntegration {
   private _completionCharacters: string[];
@@ -89,6 +94,7 @@ export class CompletionLabIntegration implements IFeatureLabIntegration {
   protected renderer: LSPCompletionRenderer;
   private _latestActiveItem: LazyCompletionItem | null = null;
   private _signalConnected: boolean = false;
+  private _disabled: boolean;
 
   constructor(
     private app: JupyterFrontEnd,
@@ -110,16 +116,20 @@ export class CompletionLabIntegration implements IFeatureLabIntegration {
     this.renderer.activeChanged.connect(this.active_completion_changed, this);
     this.renderer.itemShown.connect(this.resolve_and_update, this);
     this._signalConnected = false;
+    this._disabled = false;
     // TODO: figure out a better way to disable lab integration elements (postpone initialization?)
     settings.ready
       .then(() => {
+        this._disabled = settings.composite.disable;
         if (!settings.composite.disable) {
           adapterManager.adapterChanged.connect(this.swap_adapter, this);
           this._signalConnected = true;
         }
       })
       .catch(console.warn);
+
     settings.changed.connect(() => {
+      this._disabled = settings.composite.disable;
       if (!settings.composite.disable) {
         document.body.dataset.lspCompleterLayout =
           this.settings.composite.layout;
@@ -131,16 +141,14 @@ export class CompletionLabIntegration implements IFeatureLabIntegration {
           adapterManager.adapterChanged.connect(this.swap_adapter, this);
           this._signalConnected = true;
         }
-        // TODO connect adapter if not connected
       } else {
         completionThemeManager.set_theme(null);
         delete document.body.dataset.lspCompleterLayout;
-        if (this._signalConnected) {
-          adapterManager.adapterChanged.disconnect(this.swap_adapter, this);
-          this._signalConnected = false;
-        }
       }
-      if (this.current_completion_handler) {
+      if (
+        this.current_completion_handler &&
+        this.model instanceof LSPCompleterModel
+      ) {
         this.model.settings.caseSensitive =
           this.settings.composite.caseSensitive;
         this.model.settings.includePerfectMatches =
@@ -299,21 +307,26 @@ export class CompletionLabIntegration implements IFeatureLabIntegration {
       this.renderer
     ) as CompletionHandler;
     let completer = this.completer;
-    completer.addClass('lsp-completer');
-    completer.model = new LSPCompleterModel({
-      caseSensitive: this.settings.composite.caseSensitive,
-      includePerfectMatches: this.settings.composite.includePerfectMatches,
-      preFilterMatches: this.settings.composite.preFilterMatches
-    });
+    if (this._disabled) {
+      completer.removeClass(LSP_COMPLETER_CLASS);
+      completer.model = new CompleterModel();
+    } else {
+      completer.addClass(LSP_COMPLETER_CLASS);
+      completer.model = new LSPCompleterModel({
+        caseSensitive: this.settings.composite.caseSensitive,
+        includePerfectMatches: this.settings.composite.includePerfectMatches,
+        preFilterMatches: this.settings.composite.preFilterMatches
+      });
+    }
   }
 
   protected get completer() {
     // TODO upstream: make completer public?
     return this.current_completion_handler.completer;
   }
 
-  protected get model(): LSPCompleterModel {
-    return this.completer.model as LSPCompleterModel;
+  protected get model(): LSPCompleterModel | CompleterModel {
+    return this.completer.model as LSPCompleterModel | CompleterModel;
   }
 
   invoke_completer(kind: ExtendedCompletionTriggerKind) {
@@ -351,6 +364,9 @@ export class CompletionLabIntegration implements IFeatureLabIntegration {
   private get current_items() {
     // TODO upstream: allow to get completionItems() without markup
     //   (note: not trivial as _markup() does filtering too)
+    if (!(this.model instanceof LSPCompleterModel)) {
+      return [];
+    }
     return this.model.completionItems();
   }