Skip to content

Commit 6a9ff59

Browse files
committed
Merge branch 'master' into tcp_mode
# Conflicts: # python_packages/jupyter_lsp/jupyter_lsp/connection.py # python_packages/jupyter_lsp/jupyter_lsp/manager.py
2 parents e83b716 + 3417de4 commit 6a9ff59

28 files changed

+160
-77
lines changed

.github/workflows/job.test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ jobs:
228228
include:
229229
# if using 3.7, use newer node, etc...
230230
- python: '3.7'
231-
# Node 12 end-of-life: April 2022
232-
nodejs: '>=12,<13.0.0.a0'
231+
# Node 14 end-of-life: April 2023
232+
nodejs: '>=14,<15.0.0.a0'
233233
r: '<4'
234234
lab: '>=3.1.0,<3.2'
235235
- python: '3.10'

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Thank you for all your contributions :heart:
3131

3232
Development requires, at a minimum:
3333

34-
- `nodejs >=12,!=13,!=15,<17`
34+
- `nodejs >=14,!=15,<17`
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

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ Use of a python `virtualenv` or a conda env is also recommended.
128128
R ([languageserver](https://github.com/REditorSupport/languageserver)) servers:
129129

130130
```bash
131-
# note: you may want to use our fork of python-language-server instead (see below)
132131
pip install 'python-lsp-server[all]'
133132
R -e 'install.packages("languageserver")'
134133
```
@@ -164,8 +163,6 @@ Use of a python `virtualenv` or a conda env is also recommended.
164163

165164
or permanently by setting `c.Completer.use_jedi = False` in your
166165
[`ipython_config.py` file](https://ipython.readthedocs.io/en/stable/config/intro.html?highlight=ipython_config.py#systemwide-configuration).
167-
You will also benefit from using experimental version of python-language-server
168-
as described in the Note 2 (above).
169166

170167
1. (Optional, Linux/OSX-only) to enable opening files outside of the root
171168
directory (the place where you start JupyterLab), create `.lsp_symlink` and

atest/00_Smoke.robot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Resource Keywords.resource
33

44
Suite Setup Set Screenshot Directory ${SCREENSHOTS DIR}${/}smoke
55

6+
67
*** Test Cases ***
78
Lab Version
89
Capture Page Screenshot 00-smoke.png

atest/01_Editor.robot

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Suite Setup Setup Suite For Screenshots editor
66

77
Force Tags ui:editor aspect:ls:features
88

9+
910
*** Test Cases ***
1011
Bash
1112
Editor Shows Features for Language Bash example.sh Diagnostics=Failed to parse expression
@@ -54,8 +55,13 @@ Markdown
5455

5556
Python (pylsp)
5657
${def} = Set Variable xpath:(//span[contains(@class, 'cm-variable')][contains(text(), 'fib')])[last()]
57-
Editor Shows Features for Server pylsp Python example.py Diagnostics=undefined name 'result' (pyflakes)
58-
... Jump to Definition=${def} Rename=${def}
58+
Editor Shows Features for Server
59+
... pylsp
60+
... Python
61+
... example.py
62+
... Diagnostics=undefined name 'result' (pyflakes)
63+
... Jump to Definition=${def}
64+
... Rename=${def}
5965

6066
Python (pyright)
6167
${def} = Set Variable xpath:(//span[contains(@class, 'cm-variable')][contains(text(), 'fib')])[last()]
@@ -69,7 +75,8 @@ R
6975

7076
Robot Framework
7177
[Tags] gh:332
72-
${def} = Set Variable xpath:(//span[contains(@class, 'cm-keyword')][contains(text(), 'Special Log')])[last()]
78+
${def} = Set Variable
79+
... xpath:(//span[contains(@class, 'cm-keyword')][contains(text(), 'Special Log')])[last()]
7380
Editor Shows Features for Language Robot Framework example.robot Diagnostics=Undefined keyword
7481
... Jump to Definition=${def}
7582

@@ -95,6 +102,7 @@ SQL
95102
YAML
96103
Editor Shows Features for Language YAML example.yaml Diagnostics=Map keys must be unique
97104

105+
98106
*** Keywords ***
99107
Editor Shows Features for Server
100108
[Arguments] ${server} ${Language} ${file} &{features}
@@ -138,7 +146,7 @@ Editor Content Changed
138146
[Arguments] ${old_content}
139147
${new_content} = Get Editor Content
140148
Should Not Be Equal ${old_content} ${new_content}
141-
[Return] ${new_content}
149+
RETURN ${new_content}
142150

143151
Editor Should Rename
144152
[Arguments] ${symbol}

atest/02_Settings.robot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Resource Keywords.resource
33

44
Suite Setup Setup Suite For Screenshots settings
55

6+
67
*** Test Cases ***
78
Settings
89
Open in Advanced Settings ${LSP PLUGIN ID}

atest/03_Notebook.robot

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Resource Keywords.resource
44
Suite Setup Setup Suite For Screenshots notebook
55
Test Setup Try to Close All Tabs
66

7+
78
*** Test Cases ***
89
Python
910
[Setup] Setup Notebook Python Python.ipynb
@@ -101,6 +102,7 @@ Adding Text To Cells After Kernel Restart
101102
Wait Until Keyword Succeeds 3x 1s File Content Should Be Equal ${virtual_path} \n\n\ntext\n
102103
[Teardown] Clean Up After Working With File Empty.ipynb
103104

105+
104106
*** Keywords ***
105107
File Content Should Be Equal
106108
[Arguments] ${file} ${text}

atest/04_Interface/BackendFailure.robot

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ Resource ../Keywords.resource
44
Suite Setup Setup Server and Browser server_extension_enabled=${False}
55
Suite Teardown Setup Server and Browser server_extension_enabled=${True}
66

7+
78
*** Variables ***
89
${STATUSBAR} css:div.lsp-statusbar-item
910
${POPOVER} css:.lsp-popover
1011

12+
1113
*** Test Cases ***
1214
Handles Server Extension Failure
1315
Setup Notebook Python Python.ipynb wait=${False}

atest/04_Interface/DiagnosticsPanel.robot

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Test Teardown Clean Up
77

88
Force Tags ui:notebook aspect:ls:features
99

10+
1011
*** Variables ***
1112
${DIAGNOSTIC MESSAGE R} Closing curly-braces should always be on their own line
1213
${DIAGNOSTIC MESSAGE} trailing whitespace
@@ -15,6 +16,7 @@ ${EXPECTED_COUNT} 4
1516
${MENU COLUMNS} xpath://div[contains(@class, 'lm-Menu-itemLabel')][contains(text(), "columns")]
1617
${R CELL} %%R\n{}
1718

19+
1820
*** Test Cases ***
1921
Diagnostics Panel Opens
2022
Capture Page Screenshot 03-panel-opens.png
@@ -121,6 +123,7 @@ Diagnostics Panel Works After Removing Foreign Document
121123
Wait Until Keyword Succeeds 10 x 1s Element Should Not Contain ${DIAGNOSTICS PANEL}
122124
... ${DIAGNOSTIC MESSAGE R}
123125

126+
124127
*** Keywords ***
125128
Open Context Menu Over W291
126129
Click Element css:.lsp-diagnostics-listing th[data-id="Code"]

atest/04_Interface/Statusbar.robot

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ Resource ../Keywords.resource
33

44
Suite Setup Setup Suite For Screenshots statusbar
55

6+
67
*** Variables ***
78
${STATUSBAR} css:div.lsp-statusbar-item
89
${DIAGNOSTIC} W291 trailing whitespace (pycodestyle)
910
${POPOVER} css:.lsp-popover
1011
${HELP_BUTTON} css:.lsp-popover .lsp-help-button
1112

13+
1214
*** Test Cases ***
1315
Statusbar Popup Opens
1416
Setup Notebook Python Python.ipynb
@@ -68,6 +70,7 @@ Status Changes Correctly Between Editors
6870
Wait Until Element Contains ${STATUSBAR} Initialized (additional servers needed) timeout=60s
6971
[Teardown] Clean Up After Working With File example.plain
7072

73+
7174
*** Keywords ***
7275
Switch To Tab
7376
[Arguments] ${file}

0 commit comments

Comments
 (0)