Merge branch 'krassowski:master' into master

Author: FlyingSamson

CHANGELOG.md

@@ -1,24 +1,52 @@
 ## Changelog
 
-### `@krassowski/jupyterlab-lsp 3.7.0` (unreleased)
+### `@krassowski/jupyterlab-lsp 3.7.1` (unreleased)
+
+- improvements:
+
+  - add a note on manually enabling backend extension ([#621], thanks @icankeep)
+
+- bug fixes:
+  - fix rename shortcut registration in file editor ([#614])
+  - improve performance of icon rendering in completer ([#625])
+  - fix cache misses and concurrency issues for hover ([#630])
+
+[#614]: https://github.com/krassowski/jupyterlab-lsp/pull/614
+[#621]: https://github.com/krassowski/jupyterlab-lsp/pull/621
+[#625]: https://github.com/krassowski/jupyterlab-lsp/pull/625
+[#630]: https://github.com/krassowski/jupyterlab-lsp/pull/630
+
+### `jupyter-lsp 1.3.0` (2021-06-02)
+
+- features:
+  - add auto-detection of pyright server ([#587], thanks @yuntan)
+
+[#587]: https://github.com/krassowski/jupyterlab-lsp/pull/587
+
+### `@krassowski/jupyterlab-lsp 3.7.0` (2021-05-31)
 
 - features:
 
   - add ability to deactivate Kernel completions or LSP completion through the settings ([#586], thanks @Carreau)
   - allow to set a priority for LSP server, allowing to choose which server to use when multiple servers are installed ([#588])
   - add auto-detection of pyright server ([#587], thanks @yuntan)
+  - update from JupyterLab Classic to RetroLab ([#602])
+  - log server messages in user-accessible console ([#606])
 
 - bug fixes:
 
   - workaround url-parse issue causing problems when using JupyterLab 3.0.15 ([#599])
 
 - other changes:
   - drop Node 10 (EOL 2 weeks ago) testing on CI, add Node 15 ([#587])
+  - update lsp-ws-connection dependencies ([#606])
+  - old emit-based API of lsp-ws-connection is new deprecated and will be removed in the next major version; please use `serverNotifications`, `clientNotifications`, `clientRequests` and `serverRequests` instead ([#606])
 
 [#586]: https://github.com/krassowski/jupyterlab-lsp/pull/586
-[#587]: https://github.com/krassowski/jupyterlab-lsp/pull/587
 [#588]: https://github.com/krassowski/jupyterlab-lsp/pull/588
 [#599]: https://github.com/krassowski/jupyterlab-lsp/pull/599
+[#602]: https://github.com/krassowski/jupyterlab-lsp/pull/602
+[#606]: https://github.com/krassowski/jupyterlab-lsp/pull/606
 
 ### `jupyter-lsp 1.2.0` (2021-04-26)
 

README.md

@@ -192,7 +192,7 @@ Use of a python `virtualenv` or a conda env is also recommended.
 
 Server configurations can be edited using the Advanced Settings editor in JupyterLab (_Settings > Advanced Settings Editor_). For settings specific to each server, please see the [table of language servers][language-servers]. Example settings might include:
 
-> Note: for the new (currently recommended) python-lsp-server replace `pyls` occurrences with `pyslp`
+> Note: for the new (currently recommended) python-lsp-server replace `pyls` occurrences with `pylsp`
 
 ```json
 {

binder/environment.yml

@@ -8,8 +8,8 @@ dependencies:
   # runtime dependencies
   - python >=3.6,<3.9.0a0
   - jupyterlab >=3.0.0,<4.0.0a0
-  - jupyterlab-classic >=0.1.3,<0.2
   - jupyter_server >=1.1.2
+  - retrolab >=0.2.0,<0.3
   # build dependencies
   - nodejs >=12,<15
   # for python language server (and development)
@@ -30,5 +30,3 @@ dependencies:
   - tectonic
   - texlab
   - chktex
-  # TODO: remove when jedi vs IPython is resolved
-  - jedi <0.18

binder/postBuild

@@ -17,7 +17,6 @@ python setup.py sdist bdist_wheel
 python -m pip install -e . --ignore-installed --no-deps -vv
 jupyter labextension develop . --overwrite
 popd
-
 # List extensions
 jupyter serverextension list
 jupyter server extension list

packages/_example-extractor/jest.config.js

@@ -17,9 +17,7 @@ let local = {
     '\\.(js|jsx)?$': './transform.js',
     '\\.svg$': 'jest-raw-loader'
   },
-  transformIgnorePatterns: [
-    '/node_modules/(?!(@jupyterlab/.*|@jupyterlab-classic/.*)/)'
-  ],
+  transformIgnorePatterns: ['/node_modules/(?!(@jupyterlab/.*|@retrolab/.*)/)'],
   testLocationInResults: true,
   reporters: [...upstream['reporters'], 'jest-github-actions-reporter']
 };

packages/completion-theme/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/completion-theme",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Completion theme manager for JupyterLab-LSP",
   "keywords": [
     "jupyter",

packages/completion-theme/src/index.ts

@@ -53,6 +53,7 @@ export class CompletionThemeManager implements ILSPCompletionThemeManager {
       ? icons_sets.dark
       : icons_sets.light;
     const icons: Map<keyof ICompletionIconSet, LabIcon> = new Map();
+    let options = this.current_theme.icons.options || {};
     const mode = this.is_theme_light() ? 'light' : 'dark';
     for (let [completion_kind, svg] of Object.entries(set)) {
       let name =
@@ -67,7 +68,10 @@ export class CompletionThemeManager implements ILSPCompletionThemeManager {
         });
         this.icons_cache.set(name, icon);
       }
-      icons.set(completion_kind as keyof ICompletionIconSet, icon);
+      icons.set(
+        completion_kind as keyof ICompletionIconSet,
+        icon.bindprops(options)
+      );
     }
     return icons;
   }
@@ -83,7 +87,6 @@ export class CompletionThemeManager implements ILSPCompletionThemeManager {
     if (this.current_theme === null) {
       return null;
     }
-    let options = this.current_theme.icons.options || {};
     if (type) {
       if (this.icon_overrides.has(type.toLowerCase())) {
         type = this.icon_overrides.get(type.toLowerCase());
@@ -92,7 +95,7 @@ export class CompletionThemeManager implements ILSPCompletionThemeManager {
         type.substring(0, 1).toUpperCase() + type.substring(1).toLowerCase();
     }
     if (this.current_icons.has(type)) {
-      return this.current_icons.get(type).bindprops(options);
+      return this.current_icons.get(type);
     }
 
     if (type === KernelKind) {

packages/jupyterlab-lsp/jest.config.js

@@ -17,9 +17,7 @@ let local = {
     '\\.(js|jsx)?$': './transform.js',
     '\\.svg$': 'jest-raw-loader'
   },
-  transformIgnorePatterns: [
-    '/node_modules/(?!(@jupyterlab/.*|@jupyterlab-classic/.*)/)'
-  ],
+  transformIgnorePatterns: ['/node_modules/(?!(@jupyterlab/.*|@retrolab/.*)/)'],
   testLocationInResults: true,
   reporters: [...upstream['reporters'], 'jest-github-actions-reporter']
 };

packages/jupyterlab-lsp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/jupyterlab-lsp",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "Language Server Protocol integration for JupyterLab",
   "keywords": [
     "jupyter",
@@ -58,15 +58,14 @@
   },
   "dependencies": {
     "@krassowski/code-jumpers": "~1.1.0",
-    "@krassowski/completion-theme": "~3.0.0",
-    "@krassowski/theme-material": "~2.1.0",
-    "@krassowski/theme-vscode": "~2.1.0",
+    "@krassowski/completion-theme": "~3.1.0",
+    "@krassowski/theme-material": "~2.1.1",
+    "@krassowski/theme-vscode": "~2.1.1",
     "lodash.mergewith": "^4.6.1",
-    "lsp-ws-connection": "~0.5.1"
+    "lsp-ws-connection": "~0.6.0"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.4.3",
-    "@jupyterlab-classic/application": "^0.1.2",
     "@jupyterlab/application": "^3.0.0",
     "@jupyterlab/apputils": "^3.0.0",
     "@jupyterlab/builder": "^3.0.0",
@@ -78,6 +77,7 @@
     "@jupyterlab/docmanager": "^3.0.0",
     "@jupyterlab/docregistry": "^3.0.0",
     "@jupyterlab/fileeditor": "^3.0.0",
+    "@jupyterlab/logconsole": "^3.0.0",
     "@jupyterlab/notebook": "^3.0.0",
     "@jupyterlab/rendermime": "^3.0.0",
     "@jupyterlab/services": "^6.0.0",
@@ -86,6 +86,7 @@
     "@jupyterlab/tooltip": "^3.0.0",
     "@lumino/algorithm": "*",
     "@lumino/widgets": "^1.16.1",
+    "@retrolab/application": "^0.2.0",
     "@types/chai": "^4.1.7",
     "@types/codemirror": "^0.0.74",
     "@types/events": "^3.0.0",
@@ -102,7 +103,8 @@
     "react": "^17.0.1",
     "rimraf": "^3.0.2",
     "ts-jest": "^26.4.3",
-    "typescript": "~4.1.3"
+    "typescript": "~4.1.3",
+    "vscode-languageserver-protocol": "^3.16.0"
   },
   "peerDependencies": {
     "@jupyterlab/application": "^3.0.0",

packages/jupyterlab-lsp/schema/plugin.json

@@ -60,6 +60,19 @@
       "enum": ["debug", "log", "warn", "error"],
       "default": "warn",
       "description": "The verbosity of the console for debugging problems with this extension. Allowed values are: debug, log, warn, error."
+    },
+    "logAllCommunication": {
+      "title": "Log all LSP communication with the LSP servers",
+      "type": "boolean",
+      "default": false,
+      "description": "Whether all messages sent to and received from LSP servers should be logged into the console. To see these messages, set loggingLevel to debug or log. Note: Only messages handled by the new API will be shown."
+    },
+    "setTrace": {
+      "title": "Ask servers to send trace notifications",
+      "type": ["string", "null"],
+      "enum": ["off", "messages", "verbose", null],
+      "default": null,
+      "description": "Whether to ask server to send logs with execution trace (for debugging). To see these messages, set loggingLevel to debug or log. Accepted values are: \"off\", \"messages\", \"verbose\". Servers are allowed to ignore this request."
     }
   },
   "jupyter.lab.shortcuts": []