Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- 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 ([#603])

- bug fixes:

Expand All @@ -19,6 +20,7 @@
[#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

### `jupyter-lsp 1.2.0` (2021-04-26)

Expand Down
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions packages/_example-extractor/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']
};
Expand Down
4 changes: 1 addition & 3 deletions packages/jupyterlab-lsp/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']
};
Expand Down
2 changes: 1 addition & 1 deletion packages/jupyterlab-lsp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
},
"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",
Expand All @@ -86,6 +85,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",
Expand Down
6 changes: 3 additions & 3 deletions packages/jupyterlab-lsp/src/adapter_manager.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IClassicShell } from '@jupyterlab-classic/application';
import { ILabShell, JupyterFrontEndPlugin } from '@jupyterlab/application';
import { IDocumentWidget } from '@jupyterlab/docregistry';
import { Signal } from '@lumino/signaling';
import type { IRetroShell } from '@retrolab/application';

import { WidgetAdapter } from './adapters/adapter';
import {
Expand Down Expand Up @@ -29,7 +29,7 @@ export class WidgetAdapterManager implements ILSPAdapterManager {
return this.adapterTypes;
}

constructor(protected shell: ILabShell | IClassicShell) {
constructor(protected shell: ILabShell | IRetroShell) {
this.adapterChanged = new Signal(this);
this.adapterDisposed = new Signal(this);
this.adapterTypeAdded = new Signal(this);
Expand Down Expand Up @@ -146,7 +146,7 @@ export class WidgetAdapterManager implements ILSPAdapterManager {
export const WIDGET_ADAPTER_MANAGER: JupyterFrontEndPlugin<ILSPAdapterManager> = {
id: PLUGIN_ID + ':ILSPAdapterManager',
activate: app => {
let shell = app.shell as ILabShell | IClassicShell;
let shell = app.shell as ILabShell | IRetroShell;
return new WidgetAdapterManager(shell);
},
provides: ILSPAdapterManager,
Expand Down
36 changes: 18 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1193,23 +1193,6 @@
resolved "https://registry.yarnpkg.com/@joe-re/sql-parser/-/sql-parser-0.11.5.tgz#8382dac1aaec3ebd1acd245bbbab1825e96e0648"
integrity sha512-0WL/ibfrcY00MoDS/zffNTQqnvxpeWVwslODCLgMr96A6bC8huEzQh3byk1gEkSIjClCb1TLOjwr37mSbei6Fw==

"@jupyterlab-classic/application@^0.1.2":
version "0.1.2"
resolved "https://registry.yarnpkg.com/@jupyterlab-classic/application/-/application-0.1.2.tgz#6b5946e13c705a1142ae9bb06e16b00658c237be"
integrity sha512-9XP3G35QI5hKpG09+51Kl5jDIXbbPkaVQwZiILYbao198LLlSzW6aYHJFjl9JNr2zEXOn4KmLA995BDraSNnIw==
dependencies:
"@jupyterlab/application" "^3.0.0"
"@jupyterlab/coreutils" "^5.0.0"
"@jupyterlab/docregistry" "^3.0.0"
"@jupyterlab/ui-components" "^3.0.0"
"@lumino/algorithm" "^1.3.3"
"@lumino/coreutils" "^1.5.3"
"@lumino/messaging" "^1.4.3"
"@lumino/polling" "^1.3.3"
"@lumino/signaling" "^1.4.3"
"@lumino/widgets" "^1.14.0"
es6-promise "~4.2.8"

"@jupyterlab/application@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@jupyterlab/application/-/application-3.0.0.tgz#791dacd18c6353333a675d9f6ca457c7da3216b6"
Expand Down Expand Up @@ -2730,6 +2713,23 @@
dependencies:
"@types/node" ">= 8"

"@retrolab/application@^0.2.0":
version "0.2.1"
resolved "https://registry.yarnpkg.com/@retrolab/application/-/application-0.2.1.tgz#8194a4e0b5ab284e327014a2d3c1c5a1daa4732f"
integrity sha512-5mi1rvPvwUFhbZH5ESdSxW7mL//pbFqHGBysvLa7S5muWllRe4KsVm0EgZSU8XOlEwGuDtnyGguBjc5P8CFfIg==
dependencies:
"@jupyterlab/application" "^3.0.0"
"@jupyterlab/coreutils" "^5.0.0"
"@jupyterlab/docregistry" "^3.0.0"
"@jupyterlab/rendermime-interfaces" "^3.0.0"
"@jupyterlab/ui-components" "^3.0.0"
"@lumino/algorithm" "^1.3.3"
"@lumino/coreutils" "^1.5.3"
"@lumino/messaging" "^1.4.3"
"@lumino/polling" "^1.3.3"
"@lumino/signaling" "^1.4.3"
"@lumino/widgets" "^1.14.0"

"@sindresorhus/is@^0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
Expand Down Expand Up @@ -5967,7 +5967,7 @@ es6-iterator@^2.0.3, es6-iterator@~2.0.3:
es5-ext "^0.10.35"
es6-symbol "^3.1.1"

es6-promise@^4.0.3, es6-promise@~4.2.8:
es6-promise@^4.0.3:
version "4.2.8"
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
Expand Down