From 485672fc481bf8730d22d2792fbbccf0793d0e50 Mon Sep 17 00:00:00 2001 From: Nicolas Karolak Date: Wed, 4 Sep 2024 16:46:46 +0200 Subject: [PATCH 1/3] chore: add ruff lsp server Ruff provide a `server` command that starts a LSP server: https://docs.astral.sh/ruff/editors/#language-server-protocol --- languages.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/languages.toml b/languages.toml index cc437f78c1db..e3ffbfffbcb0 100644 --- a/languages.toml +++ b/languages.toml @@ -84,6 +84,7 @@ racket = { command = "racket", args = ["-l", "racket-langserver"] } regols = { command = "regols" } rescript-language-server = { command = "rescript-language-server", args = ["--stdio"] } robotframework_ls = { command = "robotframework_ls" } +ruff = { command = "ruff", args = ["server"] } serve-d = { command = "serve-d" } slint-lsp = { command = "slint-lsp", args = [] } solargraph = { command = "solargraph", args = ["stdio"] } @@ -852,7 +853,7 @@ file-types = ["py", "pyi", "py3", "pyw", "ptl", "rpy", "cpy", "ipy", "pyt", { gl shebangs = ["python"] roots = ["pyproject.toml", "setup.py", "poetry.lock", "pyrightconfig.json"] comment-token = "#" -language-servers = [ "pylsp" ] +language-servers = ["ruff", "pylsp"] # TODO: pyls needs utf-8 offsets indent = { tab-width = 4, unit = " " } @@ -3785,4 +3786,4 @@ indent = { tab-width = 2, unit = " " } [[grammar]] name = "thrift" -source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-thrift" , rev = "68fd0d80943a828d9e6f49c58a74be1e9ca142cf" } \ No newline at end of file +source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-thrift" , rev = "68fd0d80943a828d9e6f49c58a74be1e9ca142cf" } From e57020cc2fd46aa47b9881a6b465ec1957b9adfc Mon Sep 17 00:00:00 2001 From: Nicolas Karolak Date: Fri, 6 Sep 2024 22:44:48 +0200 Subject: [PATCH 2/3] chore: add jedi lsp server [jedi-language-server](https://github.com/pappasam/jedi-language-server) is a Python LSP server based the popular [jedi](https://jedi.readthedocs.io/en/latest/) library. --- languages.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/languages.toml b/languages.toml index e3ffbfffbcb0..3d7095dccdbe 100644 --- a/languages.toml +++ b/languages.toml @@ -44,6 +44,7 @@ haskell-language-server = { command = "haskell-language-server-wrapper", args = idris2-lsp = { command = "idris2-lsp" } intelephense = { command = "intelephense", args = ["--stdio"] } jdtls = { command = "jdtls" } +jedi = { command = "jedi-language-server" } jq-lsp = { command = "jq-lsp" } jsonnet-language-server = { command = "jsonnet-language-server", args= ["-t", "--lint"] } julia = { command = "julia", timeout = 60, args = [ "--startup-file=no", "--history-file=no", "--quiet", "-e", "using LanguageServer; runserver()", ] } @@ -853,7 +854,7 @@ file-types = ["py", "pyi", "py3", "pyw", "ptl", "rpy", "cpy", "ipy", "pyt", { gl shebangs = ["python"] roots = ["pyproject.toml", "setup.py", "poetry.lock", "pyrightconfig.json"] comment-token = "#" -language-servers = ["ruff", "pylsp"] +language-servers = ["ruff", "jedi", "pylsp"] # TODO: pyls needs utf-8 offsets indent = { tab-width = 4, unit = " " } From 51a7d92a0b7d227825b6bc1738f639a6fdb633f5 Mon Sep 17 00:00:00 2001 From: Nicolas Karolak Date: Fri, 6 Sep 2024 22:53:44 +0200 Subject: [PATCH 3/3] docs: add ruff and jedi as python lsp servers --- book/src/generated/lang-support.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md index cb1c815f2150..f223c8b2289b 100644 --- a/book/src/generated/lang-support.md +++ b/book/src/generated/lang-support.md @@ -163,7 +163,7 @@ | protobuf | ✓ | ✓ | ✓ | `bufls`, `pb` | | prql | ✓ | | | | | purescript | ✓ | ✓ | | `purescript-language-server` | -| python | ✓ | ✓ | ✓ | `pylsp` | +| python | ✓ | ✓ | ✓ | `ruff`, `jedi-language-server`, `pylsp` | | qml | ✓ | | ✓ | `qmlls` | | r | ✓ | | | `R` | | racket | ✓ | | ✓ | `racket` |