Make configurations work for pyls (finally)

Author: trajamsmith

packages/jupyterlab-lsp/src/connection_manager.ts

@@ -7,7 +7,11 @@ import { sleep, until_ready } from './utils';
 
 // Name-only import so as to not trigger inclusion in main bundle
 import * as ConnectionModuleType from './connection';
-import { TLanguageServerId, ILanguageServerManager } from './tokens';
+import {
+  TLanguageServerId,
+  ILanguageServerManager,
+  ILanguageServerConfiguration
+} from './tokens';
 
 export interface IDocumentConnectionData {
   virtual_document: VirtualDocument;
@@ -26,15 +30,6 @@ export interface ISocketConnectionOptions {
   document_path: string;
 }
 
-export interface IServerConfigurationSettings {
-  /**
-   * The config params must be nested inside the settings keyword
-   */
-  settings: {
-    [k: string]: any;
-  };
-}
-
 /**
  * Each Widget with a document (whether file or a notebook) has its own DocumentConnectionManager
  * (see JupyterLabWidgetAdapter), keeping the virtual document spaces separate if a file is opened twice.
@@ -159,11 +154,12 @@ export class DocumentConnectionManager {
 
   public updateServerConfigurations(
     // TODO: define types for server configurations
-    allSettings: any
+    lsSettings: any
   ) {
-    console.log(this.language_server_manager);
-    for (let language_server_id in allSettings) {
-      const serverSettings = allSettings[language_server_id];
+    for (let language_server_id in lsSettings) {
+      const serverSettings: ILanguageServerConfiguration = {
+        settings: lsSettings
+      };
       Private.updateServerConfiguration(language_server_id, serverSettings);
     }
   }
@@ -396,7 +392,7 @@ namespace Private {
 
   export function updateServerConfiguration(
     language_server_id: TLanguageServerId,
-    settings: IServerConfigurationSettings
+    settings: ILanguageServerConfiguration
   ): void {
     const connection = _connections.get(language_server_id);
     if (connection) {

packages/jupyterlab-lsp/src/index.ts

@@ -235,7 +235,6 @@ const plugin: JupyterFrontEndPlugin<void> = {
     notebook_command_manager.add(lsp_commands);
 
     function updateOptions(settings: ISettingRegistry.ISettings): void {
-      console.log(connection_manager);
       const options = settings.composite;
 
       // Object.keys(options).forEach((key) => {
@@ -244,6 +243,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
       //    CodeMirrorExtension.modifierKey = modifier;
       //  }
       // });
+
       const languageServerSettings = options.language_servers || {};
       connection_manager.updateServerConfigurations(languageServerSettings);
     }

packages/jupyterlab-lsp/src/tokens.ts

@@ -18,6 +18,15 @@ export interface ILanguageServerManager {
   statusUrl: string;
 }
 
+export interface ILanguageServerConfiguration {
+  /**
+   * The config params must be nested inside the settings keyword
+   */
+  settings: {
+    [k: string]: any;
+  };
+}
+
 export namespace ILanguageServerManager {
   export const URL_NS = 'lsp';
   export interface IOptions {

packages/lsp-ws-connection/src/ws-connection.ts

@@ -271,7 +271,6 @@ export class LspWsConnection extends events.EventEmitter
   public sendConfigurationChange(
     settings: protocol.DidChangeConfigurationParams
   ) {
-    console.log(`Updated server configuration: ${JSON.stringify(settings)}`);
     if (!this.isReady) {
       return;
     }