Make completer not leave a trace if disabled

Author: krassowski

packages/completion-theme/src/index.ts

@@ -118,7 +118,9 @@ export class CompletionThemeManager implements ILSPCompletionThemeManager {
       );
     }
     this.current_theme_id = id;
-    document.body.classList.add(this.current_theme_class);
+    if (id !== null) {
+      document.body.classList.add(this.current_theme_class);
+    }
     this.update_icons_set();
   }
 

packages/completion-theme/style/index.css

@@ -24,20 +24,20 @@
   overflow: auto;
 }
 
-.jp-Completer {
+.lsp-completer.jp-Completer {
   --lsp-completer-max-label-width: 300px;
   --lsp-completer-max-detail-width: 200px;
 }
 
-.jp-Completer-match {
+.lsp-completer .jp-Completer-match {
   max-width: var(--lsp-completer-max-label-width);
   overflow-x: hidden;
   white-space: nowrap;
   display: block;
   text-overflow: ellipsis;
 }
 
-.jp-mod-active .jp-Completer-match {
+.lsp-completer .jp-mod-active .jp-Completer-match {
   text-overflow: clip;
 }
 
@@ -81,15 +81,15 @@ body[data-lsp-completer-layout='detail-below'] .jp-Completer-match {
   height: var(--lsp-completer-label-height);
 }
 
-.jp-Completer-item .jp-Completer-typeExtended {
+.lsp-completer .jp-Completer-item .jp-Completer-typeExtended {
   max-width: var(--lsp-completer-max-detail-width);
   min-height: 50px;
   overflow-x: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
-.jp-mod-active .jp-Completer-typeExtended {
+.lsp-completer .jp-mod-active .jp-Completer-typeExtended {
   text-overflow: clip;
 }
 

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

@@ -88,6 +88,7 @@ export class CompletionLabIntegration implements IFeatureLabIntegration {
   protected current_adapter: WidgetAdapter<IDocumentWidget> | null = null;
   protected renderer: LSPCompletionRenderer;
   private _latestActiveItem: LazyCompletionItem | null = null;
+  private _signalConnected: boolean = false;
 
   constructor(
     private app: JupyterFrontEnd,
@@ -108,22 +109,36 @@ 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;
     // TODO: figure out a better way to disable lab integration elements (postpone initialization?)
     settings.ready
       .then(() => {
         if (!settings.composite.disable) {
           adapterManager.adapterChanged.connect(this.swap_adapter, this);
+          this._signalConnected = true;
         }
       })
       .catch(console.warn);
     settings.changed.connect(() => {
-      completionThemeManager.set_theme(this.settings.composite.theme);
-      completionThemeManager.set_icons_overrides(
-        this.settings.composite.typesMap
-      );
       if (!settings.composite.disable) {
         document.body.dataset.lspCompleterLayout =
           this.settings.composite.layout;
+        completionThemeManager.set_theme(this.settings.composite.theme);
+        completionThemeManager.set_icons_overrides(
+          this.settings.composite.typesMap
+        );
+        if (!this._signalConnected) {
+          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) {
         this.model.settings.caseSensitive =