|
15 | 15 | "\n",
|
16 | 16 | "Delivering LSP features to your JupyterLab **requires** three pieces:\n",
|
17 | 17 | "\n",
|
18 |
| -<<<<<<< HEAD |
19 |
| - "- `jupyter_lsp`\n", |
20 |
| - " - runs in your `notebook` web application on your server\n", |
21 |
| - " - to run, you need:\n", |
22 |
| - " - `python >=3.5`\n", |
23 |
| - " - `notebook >=4.3`\n", |
24 |
| - "- `@krassowski/jupyterlab-lsp`\n", |
25 |
| - " - runs in your browser\n", |
26 |
| - " - to install it, you need:\n", |
27 |
| - " - `nodejs >=10`\n", |
28 |
| - " - `jupyterlab >=2,<2.1.0a0`\n", |
29 |
| - "- one or more language servers\n", |
30 |
| - " - run on your server\n", |
31 |
| - " - some can be automatically [detected](./Language%20Servers.ipynb) if\n", |
32 |
| - " installed\n", |
33 |
| - " - others also need to be [configured](./Configuring.ipynb#language_servers)" |
34 |
| -======= |
35 | 18 | "#### `jupyter-lsp`\n",
|
36 | 19 | "\n",
|
37 | 20 | "- runs in your `notebook` web application on your server to handle requests from\n",
|
|
53 | 36 | " - probably in another language runtime than python\n",
|
54 | 37 | "- some can be automatically [detected](./Language%20Servers.ipynb) if installed\n",
|
55 | 38 | "- others also need to be [configured](./Configuring.ipynb#language_servers)"
|
56 |
| ->>>>>>> upstream/master |
57 | 39 | ]
|
58 | 40 | },
|
59 | 41 | {
|
|
77 | 59 | "# Also consider: r-languageserver [*]\n",
|
78 | 60 | "source activate lsp\n",
|
79 | 61 | "python -m pip install 'jupyter-lsp=0.8.0' --no-deps\n",
|
80 |
| - "jupyter labextension install '@krassowski/jupyterlab-lsp@0.8.0'\n", |
| 62 | + "jupyter labextension install '@krassowski/jupyterlab-lsp@1.0.0'\n", |
81 | 63 | "```\n",
|
82 | 64 | "\n",
|
83 | 65 | "Then run\n",
|
|
118 | 100 | " && python3 -m pip install --no-cache-dir --no-deps \\\n",
|
119 | 101 | " 'jupyter-lsp=0.8.0' \\\n",
|
120 | 102 | " && jupyter labextension install --no-build \\\n",
|
121 |
| - " '@krassowski/jupyterlab-lsp@0.8.0' \\\n", |
| 103 | + " '@krassowski/jupyterlab-lsp@1.0.0' \\\n", |
122 | 104 | " && jupyter lab build --dev-build=False --minimize=True \\\n",
|
123 | 105 | " && conda clean --all -f -y \\\n",
|
124 | 106 | " && rm -rf \\\n",
|
|
227 | 209 | "\n",
|
228 | 210 | "```bash\n",
|
229 | 211 | "pip install jupyter-lsp=0.8.0\n",
|
230 |
| - "jupyter labextension install @krassowski/jupyterlab-lsp@0.8.0\n", |
| 212 | + "jupyter labextension install @krassowski/jupyterlab-lsp@1.0.0\n", |
231 | 213 | "```"
|
232 | 214 | ]
|
233 | 215 | },
|
|
0 commit comments