Skip to content

Commit ef0b4b0

Browse files
committed
Address lodash dependency, update settings schema with example settings
1 parent 6dcde0a commit ef0b4b0

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

packages/jupyterlab-lsp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
"dependencies": {
3939
"@krassowski/jupyterlab_go_to_definition": "~1.0.0",
40-
"lodash": "^4.17.15",
40+
"lodash.mergewith": "^4.6.1",
4141
"lsp-ws-connection": "~0.4.0"
4242
},
4343
"devDependencies": {

packages/jupyterlab-lsp/schema/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"properties": {
66
"language_servers": {
77
"title": "Language Server",
8-
"description": "Language-server specific configuration, keyed by implementation",
8+
"description": "Language-server specific configuration, keyed by implementation, e.g: \n\npyls: {\n serverSettings: {\n pyls: {\n plugins: {\n pydocstyle: {\n enabled: true\n },\n pyflakes: {\n enabled: false\n },\n flake8: {\n enabled: true\n }\n }\n }\n }\n}\n\nAlternatively, using VSCode's naming convention:\n\npyls: {\n serverSettings: {\n pyls.plugins.pydocstyle.enabled: true,\n pyls.plugins.pyflakes.enabled: false,\n pyls.plugins.flake8.enabled: true\n }\n}",
99
"type": "object",
1010
"default": {},
1111
"patternProperties": {

packages/jupyterlab-lsp/src/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { PageConfig } from '@jupyterlab/coreutils';
2-
import merge from 'lodash/merge';
2+
import mergeWith from 'lodash/mergewith';
33

44
const RE_PATH_ANCHOR = /^file:\/\/([^\/]+|\/[A-Z]:)/;
55

@@ -163,5 +163,5 @@ export const vscodeStyleSettingsParser = (settingsObject: any) => {
163163
const parsed = vscodeStyleSettingParser(setting, settingsObject[setting]);
164164
settings.push(parsed);
165165
}
166-
return merge({}, ...settings);
166+
return mergeWith({}, ...settings);
167167
};

yarn.lock

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1373,6 +1373,7 @@
13731373
version "1.0.0"
13741374
dependencies:
13751375
"@krassowski/jupyterlab_go_to_definition" "~1.0.0"
1376+
lodash.mergewith "^4.6.1"
13761377
lsp-ws-connection "~0.4.0"
13771378

13781379
"@krassowski/jupyterlab_go_to_definition@file:packages/jupyterlab-go-to-definition":
@@ -7078,7 +7079,12 @@ jsonc-parser@^1.0.0, jsonc-parser@^1.0.3:
70787079
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.3.tgz#1d53d7160e401a783dbceabaad82473f80e6ad7e"
70797080
integrity sha512-hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g==
70807081

7081-
jsonc-parser@^2.0.0-next.1, jsonc-parser@^2.2.0:
7082+
jsonc-parser@^2.0.0-next.1:
7083+
version "2.2.1"
7084+
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.1.tgz#db73cd59d78cce28723199466b2a03d1be1df2bc"
7085+
integrity sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==
7086+
7087+
jsonc-parser@^2.2.0:
70827088
version "2.2.0"
70837089
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.0.tgz#f206f87f9d49d644b7502052c04e82dd6392e9ef"
70847090
integrity sha512-4fLQxW1j/5fWj6p78vAlAafoCKtuBm6ghv+Ij5W2DrDx0qE+ZdEl2c6Ko1mgJNF5ftX1iEWQQ4Ap7+3GlhjkOA==

0 commit comments

Comments
 (0)