Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds support for the basedpyright pyright fork #101

Merged
merged 16 commits into from
Aug 26, 2024
Merged

Adds support for the basedpyright pyright fork #101

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7476bf5
Convert to basedPyright test
zipy124 Aug 22, 2024
d547f24
Update lsp-pyright.el
zipy124 Aug 22, 2024
9542756
Update lsp-pyright.el
zipy124 Aug 22, 2024
bc9bb20
Update lsp-pyright.el
zipy124 Aug 22, 2024
64436eb
Option for pyright or basedpyright backend
zipy124 Aug 24, 2024
490b20c
fix concat
zipy124 Aug 25, 2024
4915dd8
Fix syntax
zipy124 Aug 25, 2024
b151a44
test
zipy124 Aug 25, 2024
0ee96fd
change default args
zipy124 Aug 25, 2024
b14be0a
Test
zipy124 Aug 25, 2024
37c7a92
Fix syntax
zipy124 Aug 25, 2024
127b7fa
Evaluate settings before passing
zipy124 Aug 25, 2024
0c0ba89
Test
zipy124 Aug 25, 2024
84465d5
Fix backquote
zipy124 Aug 25, 2024
a0eb7d4
Add link to the basedpyright fork
zipy124 Aug 25, 2024
274f247
Change version number back
zipy124 Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions lsp-pyright.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,15 @@
(defgroup lsp-pyright nil
"LSP support for python using the Pyright Language Server."
:group 'lsp-mode
:link '(url-link "https://github.com/microsoft/pyright"))
:link '(url-link "https://github.com/microsoft/pyright")
:link '(url-link "https://github.com/DetachHead/basedpyright"))

(defcustom lsp-pyright-fork "pyright"
seagle0128 marked this conversation as resolved.
Show resolved Hide resolved
"Choose whether to use Pyright or the BasedPyright fork."
:type '(choice
(const "pyright")
(const "basedpyright"))
:group 'lsp-pyright)

(defcustom lsp-pyright-langserver-command-args '("--stdio")
"Command to start pyright-langserver."
Expand Down Expand Up @@ -198,13 +206,13 @@ Current LSP WORKSPACE should be passed in."
(defun lsp-pyright-organize-imports ()
"Organize imports in current buffer."
(interactive)
(lsp-send-execute-command "pyright.organizeimports"
(lsp-send-execute-command (concat lsp-pyright-fork ".organizeimports")
(vector (concat "file://" (buffer-file-name)))))

(lsp-register-custom-settings
`(("pyright.disableLanguageServices" lsp-pyright-disable-language-services t)
("pyright.disableOrganizeImports" lsp-pyright-disable-organize-imports t)
("pyright.disableTaggedHints" lsp-pyright-disable-tagged-hints t)
`((,(concat lsp-pyright-fork ".disableLanguageServices") lsp-pyright-disable-language-services t)
(,(concat lsp-pyright-fork ".disableOrganizeImports") lsp-pyright-disable-organize-imports t)
(,(concat lsp-pyright-fork ".disableTaggedHints") lsp-pyright-disable-tagged-hints t)
("python.analysis.autoImportCompletions" lsp-pyright-auto-import-completions t)
("python.analysis.diagnosticMode" lsp-pyright-diagnostic-mode)
("python.analysis.logLevel" lsp-pyright-log-level)
Expand All @@ -215,9 +223,7 @@ Current LSP WORKSPACE should be passed in."
("python.venvPath" (lambda () (or lsp-pyright-venv-path "")))))

(lsp-dependency 'pyright
'(:system "pyright-langserver")
'(:npm :package "pyright"
:path "pyright-langserver"))
(backquote (:system ,(concat lsp-pyright-fork "-langserver"))))

(lsp-register-client
(make-lsp-client
Expand All @@ -236,15 +242,15 @@ Current LSP WORKSPACE should be passed in."
(make-hash-table :test 'equal))))
:download-server-fn (lambda (_client callback error-callback _update?)
(lsp-package-ensure 'pyright callback error-callback))
:notification-handlers (lsp-ht ("pyright/beginProgress" 'lsp-pyright--begin-progress-callback)
("pyright/reportProgress" 'lsp-pyright--report-progress-callback)
("pyright/endProgress" 'lsp-pyright--end-progress-callback))))
:notification-handlers (lsp-ht ((concat lsp-pyright-fork "/beginProgress") 'lsp-pyright--begin-progress-callback)
((concat lsp-pyright-fork "/reportProgress") 'lsp-pyright--report-progress-callback)
((concat lsp-pyright-fork "/endProgress") 'lsp-pyright--end-progress-callback))))

(lsp-register-client
(make-lsp-client
:new-connection
(lsp-tramp-connection (lambda ()
(cons (executable-find "pyright-langserver" t)
(cons (executable-find (concat lsp-pyright-fork "-langserver") t)
lsp-pyright-langserver-command-args)))
:major-modes '(python-mode python-ts-mode)
:server-id 'pyright-remote
Expand All @@ -257,9 +263,9 @@ Current LSP WORKSPACE should be passed in."
;; configuration of each workspace folder later separately
(lsp--set-configuration
(make-hash-table :test 'equal))))
:notification-handlers (lsp-ht ("pyright/beginProgress" 'lsp-pyright--begin-progress-callback)
("pyright/reportProgress" 'lsp-pyright--report-progress-callback)
("pyright/endProgress" 'lsp-pyright--end-progress-callback))))
:notification-handlers (lsp-ht ((concat lsp-pyright-fork "/beginProgress") 'lsp-pyright--begin-progress-callback)
((concat lsp-pyright-fork "/reportProgress") 'lsp-pyright--report-progress-callback)
((concat lsp-pyright-fork "/endProgress") 'lsp-pyright--end-progress-callback))))

(provide 'lsp-pyright)
;;; lsp-pyright.el ends here
Loading