Skip to content

Commit 5617883

Browse files
authored
Remove unsupported settings in ruff server (#4546)
1 parent 6447c32 commit 5617883

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

clients/lsp-ruff.el

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,10 @@ Previous ruff-lsp should change this to (\"ruff-lsp\")"
3838
:type '(repeat string)
3939
:group 'lsp-ruff)
4040

41-
(defcustom lsp-ruff-ruff-path ["ruff"]
42-
"Paths to ruff to try, in order."
43-
:risky t
44-
:type 'lsp-string-vector
45-
:group 'lsp-ruff)
46-
47-
(defcustom lsp-ruff-ruff-args []
41+
(defcustom lsp-ruff-ruff-args '()
4842
"Arguments, passed to ruff."
4943
:risky t
50-
:type 'lsp-string-vector
44+
:type '(repeat string)
5145
:group 'lsp-ruff)
5246

5347
(defcustom lsp-ruff-log-level "error"
@@ -93,18 +87,15 @@ Previous ruff-lsp should change this to (\"ruff-lsp\")"
9387
(lsp-register-client
9488
(make-lsp-client
9589
:new-connection (lsp-stdio-connection
96-
(lambda () lsp-ruff-server-command))
90+
(lambda () (append lsp-ruff-server-command lsp-ruff-ruff-args)))
9791
:activation-fn (lsp-activate-on "python")
9892
:server-id 'ruff
9993
:priority -2
10094
:add-on? t
10195
:initialization-options
10296
(lambda ()
10397
(list :settings
104-
(list :args lsp-ruff-ruff-args
105-
:logLevel lsp-ruff-log-level
106-
:path lsp-ruff-ruff-path
107-
:interpreter (vector lsp-ruff-python-path)
98+
(list :logLevel lsp-ruff-log-level
10899
:showNotifications lsp-ruff-show-notifications
109100
:organizeImports (lsp-json-bool lsp-ruff-advertize-organize-imports)
110101
:fixAll (lsp-json-bool lsp-ruff-advertize-fix-all)

0 commit comments

Comments
 (0)