Change settings key to better reflect language-server configuration messages

Author: Travis James Smith

.prettierignore

@@ -9,6 +9,7 @@
 **/lib
 **/node_modules
 **/package.json
+**/plugin.json
 **/static
 atest
 coverage

packages/jupyterlab-lsp/schema/plugin.json

@@ -25,8 +25,8 @@
       "type": "object",
       "default": {},
       "properties": {
-        "config": {
-          "title": "Language Server Configuration",
+        "settings": {
+          "title": "Language Server Settings",
           "description": "Configuration to be sent to language server over LSP when initialized: see the specific language server's documentation for more",
           "type": "object",
           "default": {}
@@ -37,23 +37,31 @@
   "jupyter.lab.shortcuts": [
     {
       "command": "lsp:jump-to-definition-notebook",
-      "keys": ["Accel B"],
+      "keys": [
+        "Accel B"
+      ],
       "selector": ".jp-Notebook .jp-CodeCell"
     },
     {
       "command": "lsp:jump-to-definition-file_editor",
-      "keys": ["Accel B"],
+      "keys": [
+        "Accel B"
+      ],
       "selector": ".jp-FileEditor"
     },
     {
       "command": "lsp:rename-symbol-notebook",
-      "keys": ["F2"],
+      "keys": [
+        "F2"
+      ],
       "selector": ".jp-Notebook .jp-CodeCell"
     },
     {
       "command": "lsp:rename-symbol-file_editor'",
-      "keys": ["F2"],
+      "keys": [
+        "F2"
+      ],
       "selector": ".jp-FileEditor"
     }
   ]
-}
+}

packages/jupyterlab-lsp/src/connection_manager.ts

@@ -150,12 +150,12 @@ export class DocumentConnectionManager {
 
   public async updateServerConfigurations(
     //TODO: define types for server configurations
-    settings: any
+    allSettings: any
   ) {
     console.log(this.language_server_manager)
-    for (let language_server_id in settings) {
-      const config = settings[language_server_id].config
-      await Private.updateServerConfiguration(language_server_id, config)
+    for (let language_server_id in allSettings) {
+      const serverSettings = allSettings[language_server_id]
+      await Private.updateServerConfiguration(language_server_id, serverSettings)
     }
   }
 

packages/jupyterlab-lsp/src/index.ts

@@ -244,7 +244,6 @@ const plugin: JupyterFrontEndPlugin<void> = {
       //    CodeMirrorExtension.modifierKey = modifier;
       //  }
       // });
-
       const languageServerSettings = options.language_servers || {};
       connection_manager.updateServerConfigurations(languageServerSettings);
     }

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

@@ -270,17 +270,19 @@ export class LspWsConnection extends events.EventEmitter
 
   public sendConfigurationChange(
     //TODO: define types for server configurations
-    options: any
+    settings: any
   ) {
-    console.log(`Updated server configuration: ${JSON.stringify(options)}`)
+    console.log(
+      `Updated server configuration: ${JSON.stringify(settings)}`
+    );
     if (!this.isReady) {
       return;
     }
 
     this.connection.sendNotification(
       'workspace/didChangeConfiguration',
-      options
-    )
+      settings
+    );
   }
 
   public async getHoverTooltip(