Allow settings to be sent to the language servers

Author: Travis James Smith

packages/jupyterlab-lsp/src/connection.ts

@@ -30,13 +30,7 @@ export class LSPConnection extends LspWsConnection {
   }
 
   protected onServerInitialized(params: lsProtocol.InitializeResult) {
-    const settings = {
-      "yaml.schemas": {
-        "http://json.schemastore.org/composer": "/*"
-      }
-    }
-    const initParams = { ...params, settings }
-    super.onServerInitialized(initParams);
+    super.onServerInitialized(params);
     while (this.documentsToOpen.length) {
       this.sendOpen(this.documentsToOpen.pop());
     }

packages/jupyterlab-lsp/src/connection_manager.ts

@@ -8,6 +8,7 @@ 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 { ClientConfigurationSchema } from './_schema'
 
 export interface IDocumentConnectionData {
   virtual_document: VirtualDocument;
@@ -148,11 +149,17 @@ export class DocumentConnectionManager {
     return connection;
   }
 
-  public updateServerConfigurations(
-    options?: {}
+  public async updateServerConfigurations(
+    //TODO: define types for server configurations
+    options: any
   ) {
-    for (let [, connection] of this.connections) {
-      connection.sendConfigurationChange(options)
+    for (let language in options) {
+      let connection = this.connections.get(language)
+
+      if (connection) {
+        const config = options[language].config
+        await connection.sendConfigurationChange(config)
+      }
     }
   }
 

packages/jupyterlab-lsp/src/index.ts

@@ -236,14 +236,16 @@ const plugin: JupyterFrontEndPlugin<void> = {
 
     function updateOptions(settings: ISettingRegistry.ISettings): void {
       const options = settings.composite;
+
       // Object.keys(options).forEach((key) => {
       //  if (key === 'modifier') {
       //    // let modifier = options[key] as KeyModifier;
       //    CodeMirrorExtension.modifierKey = modifier;
       //  }
       // });
-      console.log(connection_manager)
-      connection_manager.updateServerConfigurations(options)
+
+      const languageServerSettings = options.language_servers || {};
+      connection_manager.updateServerConfigurations(languageServerSettings);
     }
 
     settingRegistry

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

@@ -269,7 +269,8 @@ export class LspWsConnection extends events.EventEmitter
   }
 
   public sendConfigurationChange(
-    options?: any
+    //TODO: define types for server configurations
+    options: any
   ) {
     console.log(`Updated server configuration: ${JSON.stringify(options)}`)
     if (!this.isReady) {
@@ -619,7 +620,6 @@ export class LspWsConnection extends events.EventEmitter
   }
 
   protected onServerInitialized(params: protocol.InitializeResult) {
-    console.log("MODIFIED SERVER INIT 4", params)
     this.isInitialized = true;
     this.serverCapabilities = params.capabilities;
     this.connection.sendNotification('initialized');