Skip to content

Commit 75ea28a

Browse files
committed
Merge branch 'master' into completion/cleanup-when-disabled
2 parents c56fe50 + 337cb02 commit 75ea28a

39 files changed

+5315
-2436
lines changed

.github/workflows/job.test.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
matrix:
4545
os: [ubuntu]
4646
nodejs: ['>=14,<15.0.0a0']
47-
lab: ['>=3.1.0,<4.0.0a0']
47+
lab: ['>=3.3.0,<4.0.0a0']
4848
r: ['>=4']
4949
steps:
5050
- uses: actions/checkout@v2
@@ -231,12 +231,12 @@ jobs:
231231
# Node 14 end-of-life: April 2023
232232
nodejs: '>=14,<15.0.0.a0'
233233
r: '<4'
234-
lab: '>=3.1.0,<3.2'
234+
lab: '>=3.3.0,<3.4'
235235
- python: '3.10'
236236
# Node 16 end-of-life: April 2024
237237
nodejs: '>=16,<17.0.0.a0'
238238
r: '>=4'
239-
lab: '>=3.2.0,<4'
239+
lab: '>=3.4.0,<4'
240240

241241
steps:
242242
- uses: actions/checkout@v2
@@ -374,19 +374,19 @@ jobs:
374374
include:
375375
- python: '3.7'
376376
dist: 'jupyter*lsp*.tar.gz'
377-
lab: '>=3.1,<3.2'
377+
lab: '>=3.3,<3.4'
378378
- python: '3.8'
379379
dist: 'jupyter*lsp*.whl'
380-
lab: '>=3.1,<3.2'
380+
lab: '>=3.3,<3.4'
381381
- python: '3.9'
382382
dist: 'jupyter*lsp*.tar.gz'
383-
lab: '>=3.2,<3.3'
383+
lab: '>=3.4,<4'
384384
- python: '3.10'
385385
dist: 'jupyter*lsp*.whl'
386-
lab: '>=3.2,<4'
386+
lab: '>=3.4,<4'
387387
- python: 'pypy-3.7'
388388
dist: 'jupyter*lsp*.tar.gz'
389-
lab: '>=3.2,<3.3'
389+
lab: '>=3.4,<4'
390390
- os: 'windows'
391391
py_cmd: python
392392
- os: 'macos'
@@ -432,9 +432,9 @@ jobs:
432432
nodejs: ['14']
433433
include:
434434
- python: '3.7'
435-
lab: '>=3.1,<3.2'
435+
lab: '>=3.3,<3.4'
436436
- python: '3.10'
437-
lab: '>=3.2,<4'
437+
lab: '>=3.3,<4'
438438
steps:
439439
- name: Install Python
440440
uses: actions/setup-python@v2

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
## Changelog
22

3+
### `@krassowski/jupyterlab-lsp 4.0.0` (not-yet-released)
4+
5+
- features:
6+
- implement jump target selector and jump to references ([#739])
7+
- implement settings UI using native JupyterLab 3.3 UI ([#778])
8+
- bug fixes
9+
- use correct websocket URL if configured as different from base URL ([#820], thanks @MikeSem)
10+
- refactoring:
11+
- move client capabilities to features ([#738])
12+
- documentation:
13+
- add missing `--channel` to conda instruction for texlab ([#789], thanks @justin-f-perez)
14+
- remove references to pylsp fork ([#800] and [#814], thanks @joelostblom and @nickfong)
15+
- add Robot Framework language server ([#724], thanks @bollwyvl)
16+
- add a list of third-party and community language servers ([#826], thanks @cccs-jc)
17+
- maintenance:
18+
- bump minimum required JupyterLab version to 3.3 (`>=3.3.0,<4.0.0a0`)
19+
- bump minimum required Node.js version to 14.0 (12.0 reached EOL in April)
20+
21+
[#724]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/724
22+
[#738]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/738
23+
[#778]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/778
24+
[#789]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/789
25+
[#800]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/800
26+
[#814]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/814
27+
[#820]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/820
28+
[#826]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/826
29+
330
### `@krassowski/jupyterlab-lsp 3.10.1` (2022-03-21)
431

532
- bug fixes:

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Development requires, at a minimum:
3535
- `python >=3.7,<3.11.0a0`
3636
- Python 3.7 and 3.10 are fully tested on CI
3737
- Python 3.7 to 3.10 and PyPy 3 are verified to at least install and import
38-
- `jupyterlab >=3.1.0,<4.0.0a0`
38+
- `jupyterlab >=3.3.0,<4.0.0a0`
3939

4040
It is recommended to use a virtual environment (e.g. `virtualenv` or `conda env`)
4141
for development.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Use context menu on rows in the panel to filter out diagnostics or copy their me
9090

9191
You will need to have both of the following installed:
9292

93-
- JupyterLab >=3.1.0,<4.0.0a0
93+
- JupyterLab >=3.3.0,<4.0.0a0
9494
- Python 3.7+
9595

9696
In addition, if you wish to use javascript, html, markdown or any other NodeJS-based language server you will need to have appropriate NodeJS version installed.

atest/05_Features/Completion.robot

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Force Tags feature:completion
1111
*** Variables ***
1212
${COMPLETER_BOX} css:.jp-Completer.jp-HoverBox
1313
${DOCUMENTATION_PANEL} css:.jp-Completer-docpanel
14-
${KERNEL_BUSY_INDCA_OLD} css:.jp-NotebookPanel-toolbar div[title="Kernel Busy"]
1514
${KERNEL_BUSY_INDICATOR} css:.jp-Notebook-ExecutionIndicator[data-status="busy"]
1615

1716

@@ -452,20 +451,12 @@ Should Complete While Kernel Is Busy
452451
# Lab Command Run Selected Cells And Don't Advance
453452
Press Keys None CTRL+ENTER
454453
# Confirm that the kernel is busy
455-
IF '${LAB VERSION}'.startswith('3.4')
456-
Wait Until Page Contains Element ${KERNEL_BUSY_INDICATOR} timeout=5s
457-
ELSE
458-
Wait Until Page Contains Element ${KERNEL_BUSY_INDCA_OLD} timeout=5s
459-
END
454+
Wait Until Page Contains Element ${KERNEL_BUSY_INDICATOR} timeout=5s
460455
# Enter a cell with "t"
461456
Enter Cell Editor 18
462457
# Check if completion worked
463458
Enter Cell Editor 1 line=2
464459
Trigger Completer timeout=10s
465460
Completer Should Suggest test
466461
# Confirm that the kernel indicator was busy all along
467-
IF '${LAB VERSION}'.startswith('3.4')
468-
Page Should Contain Element ${KERNEL_BUSY_INDICATOR}
469-
ELSE
470-
Page Should Contain Element ${KERNEL_BUSY_INDCA_OLD}
471-
END
462+
Page Should Contain Element ${KERNEL_BUSY_INDICATOR}

atest/07_Configuration.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ LaTeX
3838
[Tags] language:latex
3939
${needs reload} = Set Variable "${OS}" == "Windows"
4040
Settings Should Change Editor Diagnostics LaTeX example.tex texlab
41-
... {"chktex.onOpenAndSave": true}
41+
... {"chktex.onOpenAndSave": true, "chktex.onEdit": true}
4242
... ${EMPTY}
4343
... Command terminated with space. (chktex)
4444
... Save File

atest/Keywords.resource

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Lab Log Should Not Contain Known Error Messages
107107
Wait For Splash
108108
Go To ${URL}lab?reset&token=${TOKEN}
109109
Set Window Size 1024 768
110-
Wait Until Page Contains Element ${SPLASH} timeout=30s
110+
Wait Until Page Contains Element ${SPLASH} timeout=45s
111111
Wait Until Page Does Not Contain Element ${SPLASH} timeout=10s
112112
Execute Javascript window.onbeforeunload \= function (){}
113113

@@ -375,7 +375,7 @@ Open in Advanced Settings
375375
Lab Command Advanced Settings Editor
376376
END
377377
${sel} = Set Variable css:[data-id="${plugin id}"]
378-
Wait Until Page Contains Element ${sel}
378+
Wait Until Page Contains Element ${sel} timeout=10s
379379
Click Element ${sel}
380380
Wait Until Page Contains System Defaults
381381

binder/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ channels:
77
dependencies:
88
# runtime dependencies
99
- python >=3.7,<3.11.0a0
10-
- jupyterlab >=3.1.0,<4.0.0a0
10+
- jupyterlab >=3.3.0,<4.0.0a0
1111
- jupyter_server >=1.1.2
1212
- retrolab >=0.3.0,<0.4
1313
# build dependencies

docs/rtd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ channels:
77

88
dependencies:
99
- importlib_metadata
10-
- jupyterlab >=3.1.0,<4.0.0a0
10+
- jupyterlab >=3.3.0,<4.0.0a0
1111
- myst-nb
1212
- nodejs >=14,!=15,<17
1313
- pandas

packages/jupyterlab-lsp/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
},
6868
"devDependencies": {
6969
"@babel/preset-env": "^7.4.3",
70-
"@jupyterlab/application": "^3.1.0",
70+
"@jupyterlab/application": "^3.3.0",
7171
"@jupyterlab/apputils": "^3.1.0",
7272
"@jupyterlab/builder": "^3.1.0",
7373
"@jupyterlab/cells": "^3.1.0",
@@ -85,6 +85,7 @@
8585
"@jupyterlab/statusbar": "^3.1.0",
8686
"@jupyterlab/testutils": "^3.1.0",
8787
"@jupyterlab/tooltip": "^3.1.0",
88+
"@jupyterlab/ui-components": "^3.3.0",
8889
"@lumino/algorithm": "*",
8990
"@lumino/widgets": "^1.16.1",
9091
"@retrolab/application": "^0.2.0",
@@ -108,7 +109,7 @@
108109
"vscode-languageserver-protocol": "^3.16.0"
109110
},
110111
"peerDependencies": {
111-
"@jupyterlab/application": "^3.1.0",
112+
"@jupyterlab/application": "^3.3.0",
112113
"@jupyterlab/apputils": "^3.1.0",
113114
"@jupyterlab/cells": "^3.1.0",
114115
"@jupyterlab/codeeditor": "^3.1.0",

0 commit comments

Comments
 (0)