Skip to content

Commit 1e504f1

Browse files
Bump the magik language server to 0.11.0 (#4865)
* Bump the magik language server to 0.11.0 Release: https://github.com/StevenLooman/magik-tools/releases/tag/0.11.0 Changelog: https://github.com/StevenLooman/magik-tools/blob/be0738b81783a4d804811a50d864f46fc95e7694/CHANGES.md?plain=1#L3 CC: @StevenLooman * Update lsp-magik.el --------- Co-authored-by: Sebastiaan Speck <[email protected]>
1 parent c0cafd0 commit 1e504f1

File tree

1 file changed

+74
-30
lines changed

1 file changed

+74
-30
lines changed

clients/lsp-magik.el

Lines changed: 74 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
;;; Code:
2727

28-
(require `lsp-mode)
28+
(require 'lsp-mode)
2929

3030
(defgroup lsp-magik nil
3131
"LSP support for Magik."
@@ -34,115 +34,159 @@
3434
:tag "Lsp Magik"
3535
:package-version '(lsp-mode . "9.0.0"))
3636

37-
(defcustom lsp-magik-version "0.10.1"
37+
(defcustom lsp-magik-version "0.11.0"
3838
"Version of LSP server."
39-
:type `string
40-
:group `lsp-magik
39+
:type 'string
40+
:group 'lsp-magik
4141
:package-version '(lsp-mode . "9.0.0"))
4242

4343
(defcustom lsp-magik-download-url-lsp (format "https://github.com/StevenLooman/magik-tools/releases/download/%s/magik-language-server-%s.jar" lsp-magik-version lsp-magik-version)
4444
"URL of LSP server to download."
45-
:type `string
46-
:group `lsp-magik
45+
:type 'string
46+
:group 'lsp-magik
4747
:package-version '(lsp-mode . "9.0.0"))
4848

4949
(lsp-dependency
5050
'magik-ls
51-
`(:download :url lsp-magik-download-url-lsp
51+
'(:download :url lsp-magik-download-url-lsp
5252
:store-path ,(f-join lsp-server-install-dir "magik-ls" (format "magik-language-server-%s.jar" lsp-magik-version))))
5353

5454
(defcustom lsp-magik-ls-path
5555
(f-join lsp-server-install-dir (format "magik-ls/magik-language-server-%s.jar" lsp-magik-version))
5656
"Path of the language server."
5757
:type 'string
58-
:group `lsp-magik
58+
:group 'lsp-magik
5959
:package-version '(lsp-mode . "9.0.0"))
6060

6161
(lsp-defcustom lsp-magik-product-dirs []
6262
"Paths to (compiled, containing a libs/ directory) products."
63-
:type `lsp-string-vector
64-
:group `lsp-magik
63+
:type 'lsp-string-vector
64+
:group 'lsp-magik
6565
:package-version '(lsp-mode . "9.0.1")
6666
:lsp-path "magik.productDirs")
6767

6868
(lsp-defcustom lsp-magik-lint-override-config-file nil
6969
"Override path to magiklintrc.properties."
7070
:type 'string
71-
:group `lsp-magik
71+
:group 'lsp-magik
7272
:package-version '(lsp-mode . "9.0.0")
7373
:lsp-path "magik.lint.overrideConfigFile")
7474

7575
(lsp-defcustom lsp-magik-typing-type-database-paths []
7676
"Paths to type databases."
77-
:type `lsp-string-vector
78-
:group `lsp-magik
77+
:type 'lsp-string-vector
78+
:group 'lsp-magik
7979
:package-version '(lsp-mode . "9.0.0")
8080
:lsp-path "magik.typing.typeDatabasePaths")
8181

8282
(lsp-defcustom lsp-magik-typing-show-typing-inlay-hints nil
8383
"Show typing inlay hints."
84-
:type `boolean
85-
:group `lsp-magik
84+
:type 'boolean
85+
:group 'lsp-magik
8686
:package-version '(lsp-mode . "9.0.1")
8787
:lsp-path "magik.typing.showTypingInlayHints")
8888

8989
(lsp-defcustom lsp-magik-typing-show-argument-inlay-hints nil
9090
"Show (certain) argument name inlay hints."
91-
:type `boolean
92-
:group `lsp-magik
91+
:type 'boolean
92+
:group 'lsp-magik
9393
:package-version '(lsp-mode . "9.0.1")
9494
:lsp-path "magik.typing.showArgumentInlayHints")
9595

9696
(lsp-defcustom lsp-magik-typing-enable-checks nil
9797
"Enable typing checks."
98-
:type `boolean
99-
:group `lsp-magik
98+
:type 'boolean
99+
:group 'lsp-magik
100100
:package-version '(lsp-mode . "9.0.0")
101101
:lsp-path "magik.typing.enableChecks")
102102

103103
(lsp-defcustom lsp-magik-typing-index-global-usages t
104104
"Enable indexing of usages of globals by methods."
105-
:type `boolean
106-
:group `lsp-magik
105+
:type 'boolean
106+
:group 'lsp-magik
107107
:package-version '(lsp-mode . "9.0.1")
108108
:lsp-path "magik.typing.indexGlobalUsages")
109109

110110
(lsp-defcustom lsp-magik-typing-index-method-usages nil
111111
"Enable indexing of usages of methods by methods."
112-
:type `boolean
113-
:group `lsp-magik
112+
:type 'boolean
113+
:group 'lsp-magik
114114
:package-version '(lsp-mode . "9.0.1")
115115
:lsp-path "magik.typing.indexMethodUsages")
116116

117117
(lsp-defcustom lsp-magik-typing-index-slot-usages t
118118
"Enable indexing of usages of slots by methods."
119-
:type `boolean
120-
:group `lsp-magik
119+
:type 'boolean
120+
:group 'lsp-magik
121121
:package-version '(lsp-mode . "9.0.1")
122122
:lsp-path "magik.typing.indexSlotUsages")
123123

124124
(lsp-defcustom lsp-magik-typing-index-condition-usages t
125125
"Enable indexing of usages of conditions by methods."
126-
:type `boolean
127-
:group `lsp-magik
126+
:type 'boolean
127+
:group 'lsp-magik
128128
:package-version '(lsp-mode . "9.0.1")
129129
:lsp-path "magik.typing.indexConditionUsages")
130130

131131
(lsp-defcustom lsp-magik-typing-cache-indexed-definitions-method-usages t
132132
"Store and load the indexed definitions in the workspace folders."
133-
:type `boolean
134-
:group `lsp-magik
133+
:type 'boolean
134+
:group 'lsp-magik
135135
:package-version '(lsp-mode . "9.0.1")
136136
:lsp-path "magik.typing.cacheIndexedDefinitions")
137137

138+
(lsp-defcustom lsp-magik-formatting-indent-char "tab"
139+
"Indent character, \"tab\" or \"space\"."
140+
:type '(choice (const "tab")
141+
(const "space"))
142+
:group 'lsp-magik
143+
:package-version '(lsp-mode . "9.0.1")
144+
:lsp-path "magik.formatting.indentChar")
145+
146+
(lsp-defcustom lsp-magik-formatting-indent-width 8
147+
"Indent width (tab size or number of spaces)."
148+
:type 'integer
149+
:group 'lsp-magik
150+
:package-version '(lsp-mode . "9.0.1")
151+
:lsp-path "magik.formatting.indentWidth")
152+
153+
(lsp-defcustom lsp-magik-formatting-insert-final-newline t
154+
"Insert final newline."
155+
:type 'boolean
156+
:group 'lsp-magik
157+
:package-version '(lsp-mode . "9.0.1")
158+
:lsp-path "magik.formatting.insertFinalNewline")
159+
160+
(lsp-defcustom lsp-magik-formatting-trim-trailing-whitespace t
161+
"Trim trailing whitespace."
162+
:type 'boolean
163+
:group 'lsp-magik
164+
:package-version '(lsp-mode . "9.0.1")
165+
:lsp-path "magik.formatting.trimTrailingWhitespace")
166+
167+
(lsp-defcustom lsp-magik-formatting-trim-final-newlines t
168+
"Trim final newlines."
169+
:type 'boolean
170+
:group 'lsp-magik
171+
:package-version '(lsp-mode . "9.0.1")
172+
:lsp-path "magik.formatting.trimFinalNewlines")
173+
174+
(lsp-defcustom lsp-magik-formatting-indent-strategy "null"
175+
"The strategy used for indentation, \"null\" or \"relative\"."
176+
:type '(choice (const "null")
177+
(const "relative"))
178+
:group 'lsp-magik
179+
:package-version '(lsp-mode . "9.0.1")
180+
:lsp-path "magik.formatting.indentStrategy")
181+
138182
(defcustom lsp-magik-java-path (lambda ()
139183
(cond ((eq system-type 'windows-nt)
140184
(or (lsp-resolve-value (executable-find (expand-file-name "bin/java" (getenv "JAVA_HOME"))))
141185
(lsp-resolve-value (executable-find "java"))))
142186
(t "java")))
143187
"Path to Java Runtime, Java 11 minimum."
144188
:type 'string
145-
:group `lsp-magik
189+
:group 'lsp-magik
146190
:package-version '(lsp-mode . "9.0.1"))
147191

148192
(lsp-register-client

0 commit comments

Comments
 (0)