Skip to content

Commit

Permalink
Switch out unmaintained Palantir Python LS for maintained fork
Browse files Browse the repository at this point in the history
Closes emacs-lsp#47.

The "original" Python language server, `python-language-server` -- originally
authored by Palantir -- is no longer maintained; see
palantir/python-language-server#935, as well as the fact that there's been no
development activity since 2020.

This PR updates all references to point to the community-forked
`python-lsp-server` (https://github.com/python-lsp/python-lsp-server).
  • Loading branch information
jinnovation committed Dec 25, 2022
1 parent 5794202 commit 4a278f5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
| Go | [[https://golang.org/x/tools/cmd/gopls][gopls]] |
| HTML | [[https://github.com/vscode-langservers/vscode-html-languageserver][html]] |
| JavaScript/TypeScript | [[https://github.com/theia-ide/typescript-language-server][typescript-language-server]] |
| Python | [[https://github.com/palantir/python-language-server][pyls]] |
| Python | [[https://github.com/python-lsp/python-lsp-server][pylsp]] |
** Usage
There are two ways of working with containerized language servers:
- 2 containers provided by =lsp-docker=:
Expand All @@ -57,7 +57,7 @@
(require 'lsp-docker)

(defvar lsp-docker-client-packages
'(lsp-css lsp-clients lsp-bash lsp-go lsp-pyls lsp-html lsp-typescript
'(lsp-css lsp-clients lsp-bash lsp-go lsp-pylsp lsp-html lsp-typescript
lsp-terraform lsp-clangd))

(setq lsp-docker-client-configs
Expand All @@ -67,7 +67,7 @@
(:server-id dockerfile-ls :docker-server-id dockerfilels-docker :server-command "docker-langserver --stdio")
(:server-id gopls :docker-server-id gopls-docker :server-command "gopls")
(:server-id html-ls :docker-server-id htmls-docker :server-command "html-languageserver --stdio")
(:server-id pyls :docker-server-id pyls-docker :server-command "pyls")
(:server-id pylsp :docker-server-id pyls-docker :server-command "pyls")
(:server-id ts-ls :docker-server-id tsls-docker :server-command "typescript-language-server --stdio")))

(require 'lsp-docker)
Expand Down
2 changes: 1 addition & 1 deletion lsp-docker-langservers/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ RUN apt-get update \

# Python
RUN apt-get install -y python3-pip \
&& pip3 install 'python-language-server[all]'
&& pip3 install 'python-lsp-server[all]'
4 changes: 2 additions & 2 deletions lsp-docker.el
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Argument SERVER-COMMAND the command to execute inside the running container."
lsp-go
lsp-html
lsp-javascript
lsp-pyls)
lsp-pylsp)
"Default list of client packages to load.")

(defvar lsp-docker-default-client-configs
Expand All @@ -149,7 +149,7 @@ Argument SERVER-COMMAND the command to execute inside the running container."
(list :server-id 'dockerfile-ls :docker-server-id 'dockerfilels-docker :server-command "docker-langserver --stdio")
(list :server-id 'gopls :docker-server-id 'gopls-docker :server-command "gopls")
(list :server-id 'html-ls :docker-server-id 'htmls-docker :server-command "html-languageserver --stdio")
(list :server-id 'pyls :docker-server-id 'pyls-docker :server-command "pyls")
(list :server-id 'pylsp :docker-server-id 'pyls-docker :server-command "pylsp")
(list :server-id 'ts-ls :docker-server-id 'tsls-docker :server-command "typescript-language-server --stdio"))
"Default list of client configurations.")

Expand Down

0 comments on commit 4a278f5

Please sign in to comment.