Skip to content

Commit 0b38314

Browse files
authored
Merge pull request #212 from krassowski/docs/links_to_language_servers
Add documentation links in LANGUAGESERVERS & README
2 parents b059aa9 + 8df7a5b commit 0b38314

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You can contribute to the project through:
1616
- proposing parts of the architecture that can be [extended][extending]
1717
- improving [documentation](#Documentation)
1818
- tackling Big Issues from the [future roadmap][roadmap]
19-
- improving [testing](#Testing)
19+
- improving testing
2020
- reviewing pull requests
2121

2222
[license]: https://github.com/krassowski/jupyterlab-lsp/blob/master/LICENSE
@@ -164,7 +164,7 @@ is recommended to peruse the [Robot Framework User's Guide][rfug] (and the exist
164164
First, ensure you've prepared JupyterLab for `jupyterlab-lsp`
165165
[frontend](#frontend-development) and [server](#server-development) development.
166166

167-
Prepare the enviroment:
167+
Prepare the environment:
168168

169169
```bash
170170
conda env update -n jupyterlab-lsp --file requirements/atest.yml
@@ -260,7 +260,7 @@ python scripts/combine.py
260260
- If a test suite for a specific language fails it may indicate that you have no
261261
appropriate server language installed (see [LANGUAGESERVERS][])
262262

263-
[languageservers]: ./docs/Language%20Servers.ipynb
263+
[languageservers]: https://jupyterlab-lsp.readthedocs.io/en/latest/Language%20Servers.html
264264

265265
- If you are seeing errors like `Element is blocked by .jp-Dialog`, caused by
266266
the JupyterLab _Build suggested_ dialog, (likely if you have been using

LANGUAGESERVERS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
This file has moved to [docs/LANGUAGESERVERS.md](./docs/Configuring.ipynb).
1+
This file has moved to the documentation: [Language Servers](https://jupyterlab-lsp.readthedocs.io/en/latest/Language%20Servers.html) and [Configuring](https://jupyterlab-lsp.readthedocs.io/en/latest/Configuring.html) sections.

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Language Server Protocol integration for Jupyter(Lab)
22

3-
[![Build Status](https://travis-ci.org/krassowski/jupyterlab-lsp.svg?branch=master)](https://travis-ci.org/krassowski/jupyterlab-lsp) [![Build Status](https://dev.azure.com/krassowskimichal/jupyterlab-lsp/_apis/build/status/jupyterlab-lsp?branchName=master)](https://dev.azure.com/krassowskimichal/jupyterlab-lsp/_build/latest?definitionId=1&branchName=master) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/krassowski/jupyterlab-lsp/master?urlpath=lab%2Ftree%2Fexamples%2FPython.ipynb)
3+
[![Build Status](https://travis-ci.org/krassowski/jupyterlab-lsp.svg?branch=master)](https://travis-ci.org/krassowski/jupyterlab-lsp) [![Build Status](https://dev.azure.com/krassowskimichal/jupyterlab-lsp/_apis/build/status/jupyterlab-lsp?branchName=master)](https://dev.azure.com/krassowskimichal/jupyterlab-lsp/_build/latest?definitionId=1&branchName=master) [![Documentation Status](https://readthedocs.org/projects/jupyterlab-lsp/badge/?version=latest)](https://jupyterlab-lsp.readthedocs.io/en/latest/?badge=latest) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/krassowski/jupyterlab-lsp/master?urlpath=lab%2Ftree%2Fexamples%2FPython.ipynb)
44

55
> _This project is still maturing, but you are welcome to check it out, leave feedback and/or a PR_
66
77
Quick Links: **[Installation](#installation) | [Configuring](./docs/Configuring.ipynb) | [Updating](#updating) | [Changelog](./CHANGELOG.md) | [Roadmap](./docs/Roadmap.ipynb) | [Contributing](./CONTRIBUTING.md) | [Extending](./docs/Extending.ipynb)**
88

99
## Features
1010

11-
> Examples show Python code, but most features also work in R, bash, typescript, and [many other languages](./docs/Language Servers.ipynb).
11+
> Examples show Python code, but most features also work in R, bash, typescript, and [many other languages][language-servers].
1212
1313
### Hover
1414

@@ -86,7 +86,7 @@ And:
8686

8787
## Installation
8888

89-
> For more extensive installation instructions, see the [documentation](./docs/Installation.ipynb).
89+
> For more extensive installation instructions, see the [documentation][installation-documentation].
9090
9191
For the current stable version, the following steps are recommended.
9292
Use of a python `virtualenv` or a conda env is also recommended.
@@ -147,7 +147,7 @@ Use of a python `virtualenv` or a conda env is also recommended.
147147
```
148148

149149
Please see our full list of
150-
[supported language servers](./docs/LANGUAGESERVERS.md)
150+
[supported language servers][language-servers]
151151
which includes installation hints for the common package managers (npm/pip/conda).
152152
In general, any LSP server from the
153153
[Microsoft list](https://microsoft.github.io/language-server-protocol/implementors/servers/)
@@ -192,7 +192,7 @@ jupyter labextension install @krassowski/[email protected]
192192

193193
### Configuring the servers
194194

195-
We plan to provide a configuration GUI at some time ([#25](https://github.com/krassowski/jupyterlab-lsp/issues/25)), but in the meantime, you can use the instructions for the specific servers as described on their websites (see the table in [LANGUAGESERVERS.md](./docs/LANGUAGESERVERS.md) for links).
195+
We plan to provide a configuration GUI at some time ([#25](https://github.com/krassowski/jupyterlab-lsp/issues/25)), but in the meantime, you can use the instructions for the specific servers as described on their websites (see the [table of language servers][language-servers] for links).
196196

197197
#### I want to hide specific diagnostics/inspections/warnings
198198

@@ -220,3 +220,6 @@ Again, please do check the pycodestyle documentation for specific error codes, a
220220

221221
This would not be possible without the fantastic initial work at
222222
[wylieconlon/lsp-editor-adapter](https://github.com/wylieconlon/lsp-editor-adapter).
223+
224+
[language-servers]: https://jupyterlab-lsp.readthedocs.io/en/latest/Language%20Servers.html
225+
[installation-documentation]: https://jupyterlab-lsp.readthedocs.io/en/latest/Installation.html

0 commit comments

Comments
 (0)