Skip to content

Commit

Permalink
Merge branch 'master' into fix-uncleared-hover-cache
Browse files Browse the repository at this point in the history
  • Loading branch information
krassowski committed Mar 14, 2023
2 parents 918f1fb + e9eae5d commit c1c0400
Show file tree
Hide file tree
Showing 28 changed files with 891 additions and 14,090 deletions.
42 changes: 19 additions & 23 deletions .github/workflows/job.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
matrix:
os: [ubuntu]
nodejs: ['>=14,<15.0.0a0']
lab: ['>=3.3.0,<4.0.0a0']
lab: ['>=3.6.0,<4.0.0a0']
r: ['>=4']
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
matrix:
os: [ubuntu]
nodejs: ['>=14,<15.0.0a0']
lab: ['>=3.1.0,<4.0.0a0']
lab: ['>=3.6.0,<4.0.0a0']
r: ['>=4']
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -214,19 +214,18 @@ jobs:
fail-fast: false
matrix:
os: ['ubuntu', 'macos', 'windows']
python: ['3.7', '3.10']
python: ['3.8', '3.10']
include:
# if using 3.7, use newer node, etc...
- python: '3.7'
# Node 14 end-of-life: April 2023
nodejs: '>=14,<15.0.0.a0'
r: '<4'
lab: '>=3.3.0,<3.4'
- python: '3.8'
# Node 16 end-of-life: April 2024
nodejs: '>=16,<17.0.0.a0'
r: '>=4'
lab: '>=3.6.0,<4'
- python: '3.10'
# Node 16 end-of-life: April 2024
nodejs: '>=16,<17.0.0.a0'
r: '>=4'
lab: '>=3.4.0,<4'
lab: '>=3.6.0,<4'

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -352,26 +351,23 @@ jobs:
max-parallel: 3
matrix:
os: ['ubuntu', 'macos', 'windows']
python: ['3.7', '3.8', '3.9', '3.10', 'pypy-3.7']
python: ['3.8', '3.9', '3.10', 'pypy-3.8']
exclude:
- os: windows
python: pypy-3.7
include:
- python: '3.7'
dist: 'jupyter*lsp*.tar.gz'
lab: '>=3.3,<3.4'
- python: '3.8'
dist: 'jupyter*lsp*.whl'
lab: '>=3.3,<3.4'
lab: '>=3.6,<3.7'
- python: '3.9'
dist: 'jupyter*lsp*.tar.gz'
lab: '>=3.4,<4'
lab: '>=3.6,<4'
- python: '3.10'
dist: 'jupyter*lsp*.whl'
lab: '>=3.4,<4'
- python: 'pypy-3.7'
lab: '>=3.6,<4'
- python: 'pypy-3.8'
dist: 'jupyter*lsp*.tar.gz'
lab: '>=3.4,<4'
lab: '>=3.6,<4'
- os: 'windows'
py_cmd: python
- os: 'macos'
Expand Down Expand Up @@ -413,13 +409,13 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu]
python: ['3.7', '3.10']
python: ['3.8', '3.10']
nodejs: ['14']
include:
- python: '3.7'
lab: '>=3.3,<3.4'
- python: '3.8'
lab: '>=3.6,<3.7'
- python: '3.10'
lab: '>=3.3,<4'
lab: '>=3.6,<4'
steps:
- name: Install Python
uses: actions/setup-python@v4
Expand Down
10 changes: 7 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
## Changelog

### `@jupyter-lsp/jupyterlab-lsp 4.0.0-alpha.0` (not-yet-released)
### `@jupyter-lsp/jupyterlab-lsp 4.0.0` (not-yet-released)

Requires JupyterLab `>=3.6.0,<4.0.0a0` and Python 3.8 or newer.

- features:
- implement jump target selector and jump to references ([#739])
- implement settings UI using native JupyterLab 3.3 UI ([#778])
- add option to show hover tooltip automatically ([#864], thanks @yamaton)
- implement eliding for long paths/files in completer ([#893])
- bug fixes:
- use correct websocket URL if configured as different from base URL ([#820], thanks @MikeSem)
- clean up all completer styles when completer feature is disabled ([#829]).
Expand Down Expand Up @@ -37,9 +40,9 @@
- downstreams:
- includes sourcemaps for easier debugging ([#882])
- maintenance:
- handle notifcation promises more explicitly ([#882])
- handle notification promises more explicitly ([#882])

### `jupyter-lsp 1.6.0` (not-yet-released)
### `jupyter-lsp 2.0.0` (not-yet-released)

- dependencies:
- uses `importlib_metadata` (or `importlib.metadata` on 3.10+) for `entry_points` ([#882])
Expand All @@ -63,6 +66,7 @@
[#864]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/864
[#867]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/867
[#882]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/882
[#893]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/893

### `@krassowski/jupyterlab-lsp 3.10.1` (2022-03-21)

Expand Down
8 changes: 3 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,9 @@ Thank you for all your contributions :heart:

Development requires, at a minimum:

- `nodejs >=14,!=15,<17`
- `python >=3.7,<3.11.0a0`
- Python 3.7 and 3.10 are fully tested on CI
- Python 3.7 to 3.10 and PyPy 3 are verified to at least install and import
- `jupyterlab >=3.3.0,<4.0.0a0`
- `nodejs >=16,!=17,<19`
- `python >=3.8,<3.11.0a0`
- `jupyterlab >=3.6.0,<4.0.0a0`

It is recommended to use a virtual environment (e.g. `virtualenv` or `conda env`)
for development.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ Use context menu on rows in the panel to filter out diagnostics or copy their me

You will need to have both of the following installed:

- JupyterLab >=3.3.0,<4.0.0a0
- Python 3.7+
- JupyterLab >=3.6.0,<4.0.0a0
- Python 3.8+

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.

Expand Down
5 changes: 4 additions & 1 deletion atest/Keywords.resource
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ Initialize User Settings
Create File
... ${SETTINGS DIR}${/}@jupyterlab${/}apputils-extension${/}palette.jupyterlab-settings
... {"modal": false}
Create File
... ${SETTINGS DIR}${/}@jupyterlab${/}apputils-extension${/}notification.jupyterlab-settings
... {"fetchNews": "false"}

Reset Plugin Settings
[Arguments] ${package}=jupyterlab-lsp ${plugin}=plugin
Expand Down Expand Up @@ -381,7 +384,7 @@ Open File

Open in Advanced Settings
[Arguments] ${plugin id}
IF '${LAB VERSION}'.startswith('3.3')
IF '${LAB VERSION}'.startswith('3.')
Lab Command Advanced JSON Settings Editor
ELSE
Lab Command Advanced Settings Editor
Expand Down
6 changes: 3 additions & 3 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ channels:

dependencies:
# runtime dependencies
- python >=3.7,<3.11.0a0
- jupyterlab >=3.3.0,<4.0.0a0
- python >=3.8,<3.11.0a0
- jupyterlab >=3.6.0,<4.0.0a0
- jupyter_server >=1.1.2
- retrolab >=0.3.0,<0.4
# build dependencies
- nodejs >=14,!=15,<17
- nodejs >=16,!=17,<19
# for python language server (and development)
- flake8 >=3.5
- pip
Expand Down
6 changes: 3 additions & 3 deletions docs/rtd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ channels:

dependencies:
- importlib_metadata
- jupyterlab >=3.3.0,<4.0.0a0
- jupyterlab >=3.6.0,<4.0.0a0
- myst-nb
- nodejs >=14,!=15,<17
- nodejs >=16,!=17,<19
- pandas
- pip
- pytest-check-links
- python >=3.7,<3.11.0a0
- python >=3.8,<3.11.0a0
- python-graphviz
- python-lsp-server
- robotframework-lsp
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
"**/node-gyp": "8.4.1",
"prettier": "^2.8.1",
"typescript": "~4.9.4",
"verdaccio": "file:scripts/_not-a-package",
"decode-uri-component": "^0.2.1"
},
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion packages/_example-extractor/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const esModules = [
'lib0',
'y\\-protocols',
'y\\-websocket',
'@jupyter/ydoc',
'yjs'
].join('|');

Expand All @@ -26,7 +27,7 @@ let local = {
'\\.(js|jsx)?$': './transform.js',
'\\.svg$': 'jest-raw-loader'
},
transformIgnorePatterns: [`/node_modules/(?!${esModules}).+`],
transformIgnorePatterns: [`/node_modules/(?!${esModules}).*`],
testLocationInResults: true,
reporters: [...upstream['reporters'], 'jest-github-actions-reporter']
};
Expand Down
2 changes: 1 addition & 1 deletion packages/_klingon-integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"devDependencies": {
"@babel/preset-env": "^7.4.3",
"@jupyterlab/application": "^3.3.0",
"@jupyterlab/builder": "^3.3.0",
"@jupyterlab/builder": "^3.5.0",
"typescript": "~4.9.4"
},
"jupyterlab": {
Expand Down
3 changes: 2 additions & 1 deletion packages/code-jumpers/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const esModules = [
'lib0',
'y\\-protocols',
'y\\-websocket',
'@jupyter/ydoc',
'yjs'
].join('|');

Expand All @@ -25,7 +26,7 @@ let local = {
'\\.(js|jsx)?$': './transform.js',
'\\.svg$': 'jest-raw-loader'
},
transformIgnorePatterns: [`/node_modules/(?!${esModules}).+`]
transformIgnorePatterns: [`/node_modules/(?!${esModules}).*`]
};

for (const option of reuseFromUpstream) {
Expand Down
2 changes: 1 addition & 1 deletion packages/completion-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"clean": "rimraf lib"
},
"devDependencies": {
"@jupyterlab/builder": "^3.3.0",
"@jupyterlab/builder": "^3.5.0",
"@jupyterlab/ui-components": "^3.3.0",
"react": "^17.0.1",
"rimraf": "^3.0.2",
Expand Down
18 changes: 17 additions & 1 deletion packages/completion-theme/style/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}

.lsp-completer.jp-Completer {
--lsp-completer-max-label-width: 300px;
--lsp-completer-max-label-width: 350px;
--lsp-completer-max-detail-width: 200px;
}

Expand Down Expand Up @@ -93,6 +93,22 @@ body[data-lsp-completer-layout='detail-below'] .jp-Completer-match {
text-overflow: clip;
}

.lsp-completer mark.lsp-elide:first-child {
display: inline-block;
overflow-x: clip;
text-overflow: ellipsis;
white-space: nowrap;
direction: rtl;
/* stretch to as much space as possible */
flex-shrink: 1;
/* always reserve small space to fit the ellipsis */
min-width: 20px;
}

.lsp-completer .lsp-elide-wrapper {
display: flex;
}

body[data-lsp-completer-layout='detail-below'] .jp-Completer-typeExtended {
grid-area: detail;
text-align: left;
Expand Down
3 changes: 2 additions & 1 deletion packages/jupyterlab-lsp/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const esModules = [
'lib0',
'y\\-protocols',
'y\\-websocket',
'@jupyter/ydoc',
'yjs'
].join('|');

Expand All @@ -25,7 +26,7 @@ let local = {
'\\.(js|jsx)?$': './transform.js',
'\\.svg$': 'jest-raw-loader'
},
transformIgnorePatterns: [`/node_modules/(?!${esModules}).+`],
transformIgnorePatterns: [`/node_modules/(?!${esModules}).*`],
testLocationInResults: true,
reporters: [...upstream['reporters'], 'jest-github-actions-reporter'],
setupFiles: [
Expand Down
Loading

0 comments on commit c1c0400

Please sign in to comment.