Skip to content

Workaround file URI matching issue for now #599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 17, 2021
Merged

Workaround file URI matching issue for now #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3e7288
Workaround file URI matching issue for now
krassowski May 16, 2021
cb1b908
Move the workaround to the root of the issue
krassowski May 17, 2021
3a8105c
Special case for MacOS
krassowski May 17, 2021
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
### (unreleased)

- Add ability to deactivate Kernel completions or LSP completion through the settings.
- workaround url-parse issue causing problems when using JupyterLab 3.0.15 [#599]

[#599]: https://github.com/krassowski/jupyterlab-lsp/pull/599

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

Expand Down
17 changes: 16 additions & 1 deletion packages/jupyterlab-lsp/src/connection_manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,24 @@ export namespace DocumentConnectionManager {
throw `No language server installed for language ${language}`;
}

// workaround url-parse bug(s) (see https://github.com/krassowski/jupyterlab-lsp/issues/595)
let documentUri = URLExt.join(baseUri, virtual_document.uri);
if (
!documentUri.startsWith('file:///') &&
documentUri.startsWith('file://')
) {
documentUri = documentUri.replace('file://', 'file:///');
if (
documentUri.startsWith('file:///users/') &&
baseUri.startsWith('file:///Users/')
) {
documentUri = documentUri.replace('file:///users/', 'file:///Users/');
}
}

return {
base: baseUri,
document: URLExt.join(baseUri, virtual_document.uri),
document: documentUri,
server: URLExt.join('ws://jupyter-lsp', language),
socket: URLExt.join(
wsBase,
Expand Down