Clean up lodash import, nest serverSettings

Author: trajamsmith

package.json

@@ -1,7 +1,5 @@
 {
-  "dependencies": {
-    "lodash": "^4.17.15"
-  },
+  "dependencies": {},
   "devDependencies": {
     "bash-language-server": "^1.6.1",
     "dockerfile-language-server-nodejs": "^0.0.22",

packages/jupyterlab-lsp/package.json

@@ -37,6 +37,7 @@
   },
   "dependencies": {
     "@krassowski/jupyterlab_go_to_definition": "~1.0.0",
+    "lodash": "^4.17.15",
     "lsp-ws-connection": "~0.4.0"
   },
   "devDependencies": {

packages/jupyterlab-lsp/schema/plugin.json

@@ -24,13 +24,13 @@
       "description": "Client and server configurations for a single language server",
       "type": "object",
       "default": {},
-      "patternProperties": {
-        "^.*$": {
-          "anyOf": [
-            {"type": "string"},
-            {"type": "boolean"}
-          ]
-        }
+      "properties": {
+        "serverSettings": {
+          "title": "Language Server Configurations",
+          "description": "Configuration to be sent to language server over LSP when initialized: see the specific language server's documentation for more",
+          "type": "object",
+          "default": {}
+        } 
       }
     }
   },

packages/jupyterlab-lsp/src/utils.ts

@@ -1,5 +1,5 @@
-import _ from 'lodash';
 import { PageConfig } from '@jupyterlab/coreutils';
+import merge from 'lodash/merge';
 
 const RE_PATH_ANCHOR = /^file:\/\/([^\/]+|\/[A-Z]:)/;
 
@@ -140,7 +140,7 @@ export function uri_to_contents_path(child: string, parent?: string) {
  * as the language servers themselves don't accept that syntax.
  */
 const vscodeStyleSettingParser = (settingString: string, value: any) => {
-  const propArr: any = settingString.split('.');
+  const propArr = settingString.split('.');
   const obj: any = {};
 
   let curr = obj;
@@ -163,5 +163,5 @@ export const vscodeStyleSettingsParser = (settingsObject: any) => {
     const parsed = vscodeStyleSettingParser(setting, settingsObject[setting]);
     settings.push(parsed);
   }
-  return _.merge({}, ...settings);
+  return merge({}, ...settings);
 };