Address review comments

Author: krassowski

packages/completion-theme/src/index.ts

@@ -11,7 +11,8 @@ import {
   ICompletionTheme,
   ILSPCompletionThemeManager,
   PLUGIN_ID,
-  COMPLETER_THEME_PREFIX
+  COMPLETER_THEME_PREFIX,
+  KernelKind
 } from './types';
 import { render_themes_list } from './about';
 import '../style/index.css';
@@ -37,9 +38,7 @@ export class CompletionThemeManager implements ILSPCompletionThemeManager {
     return this.themeManager.isLight(current);
   }
 
-  get_icons_set(
-    theme: ICompletionTheme
-  ): Map<keyof ICompletionIconSet, LabIcon> {
+  get_iconset(theme: ICompletionTheme): Map<keyof ICompletionIconSet, LabIcon> {
     const icons_sets = theme.icons;
     const dark_mode_and_dark_supported =
       !this.is_theme_light() && typeof icons_sets.dark !== 'undefined';
@@ -70,7 +69,7 @@ export class CompletionThemeManager implements ILSPCompletionThemeManager {
     if (this.current_theme === null) {
       return;
     }
-    this.current_icons = this.get_icons_set(this.current_theme);
+    this.current_icons = this.get_iconset(this.current_theme);
   }
 
   get_icon(type: string): LabIcon {
@@ -85,7 +84,7 @@ export class CompletionThemeManager implements ILSPCompletionThemeManager {
     if (this.current_icons.has(type)) {
       return this.current_icons.get(type).bindprops(options);
     }
-    if (type === 'Kernel') {
+    if (type === KernelKind) {
       return kernelIcon;
     }
     return null;
@@ -140,7 +139,7 @@ export class CompletionThemeManager implements ILSPCompletionThemeManager {
       body: render_themes_list({
         themes: [...this.themes.values()],
         current: this.current_theme,
-        get_set: this.get_icons_set.bind(this)
+        get_set: this.get_iconset.bind(this)
       }),
       buttons: [Dialog.okButton()]
     }).catch(console.warn);
@@ -158,15 +157,16 @@ export const COMPLETION_THEME_MANAGER: JupyterFrontEndPlugin<ILSPCompletionTheme
     commandPalette: ICommandPalette
   ) => {
     let manager = new CompletionThemeManager(themeManager);
-    app.commands.addCommand('lsp-completer-about-themes', {
+    const command_id = 'lsp:completer-about-themes';
+    app.commands.addCommand(command_id, {
       label: 'Display the completer themes',
       execute: () => {
         manager.display_themes();
       }
     });
     commandPalette.addItem({
       category: LSP_CATEGORY,
-      command: 'lsp-completer-about-themes'
+      command: command_id
     });
     return manager;
   },

packages/completion-theme/src/types.ts

@@ -43,8 +43,10 @@ type requiredIcons = {
   [key in CompletionItemKindStrings]: SvgString;
 };
 
+export const KernelKind = 'Kernel';
+
 export interface ICompletionIconSet extends requiredIcons {
-  Kernel?: SvgString;
+  [KernelKind]?: SvgString;
 }
 
 export interface ILicenseInfo {
@@ -111,7 +113,7 @@ export interface ILSPCompletionThemeManager {
 
   register_theme(theme: ICompletionTheme): void;
 
-  get_icons_set(
+  get_iconset(
     theme: ICompletionTheme
   ): Map<keyof ICompletionIconSet, LabIcon.ILabIcon>;
 }

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

@@ -85,7 +85,6 @@ export class CompletionLabIntegration implements IFeatureLabIntegration {
     manager: ILSPAdapterManager,
     adapter: WidgetAdapter<IDocumentWidget>
   ) {
-    console.log('ADAPTER CHANGED TO ', adapter);
     if (this.current_adapter) {
       // disconnect signals from the old adapter
       this.current_adapter.activeEditorChanged.disconnect(

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

@@ -22,7 +22,10 @@ import ICompletionItemsResponseType = CompletionHandler.ICompletionItemsResponse
 import { CodeCompletion as LSPCompletionSettings } from '../../_completion';
 import { FeatureSettings } from '../../feature';
 import { PositionConverter } from '../../converter';
-import { ILSPCompletionThemeManager } from '@krassowski/completion-theme/lib/types';
+import {
+  ILSPCompletionThemeManager,
+  KernelKind
+} from '@krassowski/completion-theme/lib/types';
 import { LabIcon } from '@jupyterlab/ui-components';
 
 /**
@@ -291,7 +294,7 @@ export class LSPConnector
       return undefined;
     }
     if (typeof type === 'undefined' || type == '<unknown>') {
-      type = 'Kernel';
+      type = KernelKind;
     }
     return (this.options.icons_manager.get_icon(type) as LabIcon) || undefined;
   }

packages/theme-material/src/index.ts

@@ -80,8 +80,8 @@ export const plugin: JupyterFrontEndPlugin<void> = {
   // components, reusing these plugins.
   id: '@krassowski/theme-material',
   requires: [ILSPCompletionThemeManager],
-  activate: (app, iconsManager: ILSPCompletionThemeManager) => {
-    iconsManager.register_theme(completionTheme);
+  activate: (app, completionThemeManager: ILSPCompletionThemeManager) => {
+    completionThemeManager.register_theme(completionTheme);
   },
   autoStart: true
 };

packages/theme-vscode/src/index.ts

@@ -134,8 +134,8 @@ const completionTheme: ICompletionTheme = {
 export const plugin: JupyterFrontEndPlugin<void> = {
   id: '@krassowski/theme-vscode',
   requires: [ILSPCompletionThemeManager],
-  activate: (app, iconsManager: ILSPCompletionThemeManager) => {
-    iconsManager.register_theme(completionTheme);
+  activate: (app, completionThemeManager: ILSPCompletionThemeManager) => {
+    completionThemeManager.register_theme(completionTheme);
   },
   autoStart: true
 };