Skip to content

Commit 1a97329

Browse files
committed
Merge branch 'pr-add-spec-pyright' of ssh://github.com/yuntan/jupyterlab-lsp into yuntan-pr-add-spec-pyright
2 parents a9e080b + a6cb56f commit 1a97329

File tree

4 files changed

+31
-1
lines changed

4 files changed

+31
-1
lines changed

packages/jupyterlab-lsp/schema/plugin.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,13 @@
3131
"language_servers": {
3232
"title": "Language Server",
3333
"description": "Language-server specific configuration, keyed by implementation, e.g: \n\npyls: {\n serverSettings: {\n pyls: {\n plugins: {\n pydocstyle: {\n enabled: true\n },\n pyflakes: {\n enabled: false\n },\n flake8: {\n enabled: true\n }\n }\n }\n }\n}\n\nAlternatively, using VSCode's naming convention:\n\npyls: {\n serverSettings: {\n \"pyls.plugins.pydocstyle.enabled\": true,\n \"pyls.plugins.pyflakes.enabled\": false,\n \"pyls.plugins.flake8.enabled\": true\n }\n}",
34-
"default": {},
34+
"default": {
35+
"pyright": {
36+
"serverSettings": {
37+
"python.analysis.useLibraryCodeForTypes": true
38+
}
39+
}
40+
},
3541
"patternProperties": {
3642
".*": {
3743
"$ref": "#/definitions/language-server"

python_packages/jupyter_lsp/jupyter_lsp/specs/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from .jedi_language_server import JediLanguageServer
99
from .julia_language_server import JuliaLanguageServer
1010
from .pyls import PalantirPythonLanguageServer
11+
from .pyright import PyrightLanguageServer
1112
from .python_lsp_server import PythonLSPServer
1213
from .r_languageserver import RLanguageServer
1314
from .sql_language_server import SQLLanguageServer
@@ -28,6 +29,7 @@
2829
md = UnifiedLanguageServer()
2930
py_palantir = PalantirPythonLanguageServer()
3031
py_lsp_server = PythonLSPServer()
32+
pyright = PyrightLanguageServer()
3133
r = RLanguageServer()
3234
tex = Texlab()
3335
ts = JavascriptTypescriptLanguageServer()
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
from .utils import NodeModuleSpec
2+
3+
4+
class PyrightLanguageServer(NodeModuleSpec):
5+
node_module = key = "pyright"
6+
script = ["langserver.index.js"]
7+
args = ["--stdio"]
8+
languages = ["python"]
9+
spec = dict(
10+
display_name=key,
11+
mime_types=["text/python", "text/x-ipython"],
12+
urls=dict(
13+
home="https://github.com/microsoft/pyright",
14+
issues="https://github.com/microsoft/pyright/issues",
15+
),
16+
install=dict(
17+
npm="npm install --save-dev {}".format(key),
18+
yarn="yarn add --dev {}".format(key),
19+
jlpm="jlpm add --dev {}".format(key),
20+
),
21+
)

python_packages/jupyter_lsp/setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jupyter_lsp_spec_v1 =
4141
julia-language-server = jupyter_lsp.specs:julia
4242
python-language-server = jupyter_lsp.specs:py_palantir
4343
python-lsp-server = jupyter_lsp.specs:py_lsp_server
44+
pyright = jupyter_lsp.specs:pyright
4445
r-languageserver = jupyter_lsp.specs:r
4546
texlab = jupyter_lsp.specs:tex
4647
sql-language-server = jupyter_lsp.specs:sql

0 commit comments

Comments
 (0)