Skip to content

Commit 168bf21

Browse files
feat: use lsp-defcustom to declare settings for lsp-magik (#4525)
* [lsp-magik] Use lsp-defcustom to declare settings * [lsp-magik] Mark new settings for the next-release --------- Co-authored-by: Sebastiaan Speck <[email protected]>
1 parent 99e4c30 commit 168bf21

File tree

1 file changed

+37
-39
lines changed

1 file changed

+37
-39
lines changed

clients/lsp-magik.el

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -58,77 +58,89 @@
5858
:group `lsp-magik
5959
:package-version '(lsp-mode . "9.0.0"))
6060

61-
(defcustom lsp-magik-java-home nil
61+
(lsp-defcustom lsp-magik-java-home nil
6262
"Path to Java Runtime, Java 17 minimum."
6363
:type `string
6464
:group `lsp-magik
65-
:package-version '(lsp-mode . "9.0.0"))
65+
:package-version '(lsp-mode . "9.0.0")
66+
:lsp-path "magik.javaHome")
6667

67-
(defcustom lsp-magik-product-dirs []
68+
(lsp-defcustom lsp-magik-product-dirs []
6869
"Paths to (compiled, containing a libs/ directory) products."
6970
:type `lsp-string-vector
7071
:group `lsp-magik
71-
:package-version '(lsp-mode . "9.0.0"))
72+
:package-version '(lsp-mode . "9.0.1")
73+
:lsp-path "magik.productDirs")
7274

73-
(defcustom lsp-magik-lint-override-config-file nil
75+
(lsp-defcustom lsp-magik-lint-override-config-file nil
7476
"Override path to magiklintrc.properties."
7577
:type 'string
7678
:group `lsp-magik
77-
:package-version '(lsp-mode . "9.0.0"))
79+
:package-version '(lsp-mode . "9.0.0")
80+
:lsp-path "magik.lint.overrideConfigFile")
7881

79-
(defcustom lsp-magik-typing-type-database-paths []
82+
(lsp-defcustom lsp-magik-typing-type-database-paths []
8083
"Paths to type databases."
8184
:type `lsp-string-vector
8285
:group `lsp-magik
83-
:package-version '(lsp-mode . "9.0.0"))
86+
:package-version '(lsp-mode . "9.0.0")
87+
:lsp-path "magik.typing.typeDatabasePaths")
8488

85-
(defcustom lsp-magik-typing-show-typing-inlay-hints nil
89+
(lsp-defcustom lsp-magik-typing-show-typing-inlay-hints nil
8690
"Show typing inlay hints."
8791
:type `boolean
8892
:group `lsp-magik
89-
:package-version '(lsp-mode . "9.0.0"))
93+
:package-version '(lsp-mode . "9.0.1")
94+
:lsp-path "magik.typing.showTypingInlayHints")
9095

91-
(defcustom lsp-magik-typing-show-argument-inlay-hints nil
96+
(lsp-defcustom lsp-magik-typing-show-argument-inlay-hints nil
9297
"Show (certain) argument name inlay hints."
9398
:type `boolean
9499
:group `lsp-magik
95-
:package-version '(lsp-mode . "9.0.0"))
100+
:package-version '(lsp-mode . "9.0.1")
101+
:lsp-path "magik.typing.showArgumentInlayHints")
96102

97-
(defcustom lsp-magik-typing-enable-checks nil
103+
(lsp-defcustom lsp-magik-typing-enable-checks nil
98104
"Enable typing checks."
99105
:type `boolean
100106
:group `lsp-magik
101-
:package-version '(lsp-mode . "9.0.0"))
107+
:package-version '(lsp-mode . "9.0.0")
108+
:lsp-path "magik.typing.enableChecks")
102109

103-
(defcustom lsp-magik-typing-index-global-usages t
110+
(lsp-defcustom lsp-magik-typing-index-global-usages t
104111
"Enable indexing of usages of globals by methods."
105112
:type `boolean
106113
:group `lsp-magik
107-
:package-version '(lsp-mode . "9.0.0"))
114+
:package-version '(lsp-mode . "9.0.1")
115+
:lsp-path "magik.typing.indexGlobalUsages")
108116

109-
(defcustom lsp-magik-typing-index-method-usages nil
117+
(lsp-defcustom lsp-magik-typing-index-method-usages nil
110118
"Enable indexing of usages of methods by methods."
111119
:type `boolean
112120
:group `lsp-magik
113-
:package-version '(lsp-mode . "9.0.0"))
121+
:package-version '(lsp-mode . "9.0.1")
122+
:lsp-path "magik.typing.indexMethodUsages")
114123

115-
(defcustom lsp-magik-typing-index-slot-usages t
124+
(lsp-defcustom lsp-magik-typing-index-slot-usages t
116125
"Enable indexing of usages of slots by methods."
117126
:type `boolean
118127
:group `lsp-magik
119-
:package-version '(lsp-mode . "9.0.0"))
128+
:package-version '(lsp-mode . "9.0.1")
129+
:lsp-path "magik.typing.indexSlotUsages")
120130

121-
(defcustom lsp-magik-typing-index-condition-usages t
131+
(lsp-defcustom lsp-magik-typing-index-condition-usages t
122132
"Enable indexing of usages of conditions by methods."
123133
:type `boolean
124134
:group `lsp-magik
125-
:package-version '(lsp-mode . "9.0.0"))
135+
:package-version '(lsp-mode . "9.0.1")
136+
:lsp-path "magik.typing.indexConditionUsages")
126137

127-
(defcustom lsp-magik-typing-cache-indexed-definitions-method-usages t
138+
(lsp-defcustom lsp-magik-typing-cache-indexed-definitions-method-usages t
128139
"Store and load the indexed definitions in the workspace folders."
129140
:type `boolean
130141
:group `lsp-magik
131-
:package-version '(lsp-mode . "9.0.0"))
142+
:package-version '(lsp-mode . "9.0.1")
143+
:lsp-path "magik.typing.cacheIndexedDefinitions")
132144

133145
(defcustom lsp-magik-java-path (lambda ()
134146
(cond ((eq system-type 'windows-nt)
@@ -138,7 +150,7 @@
138150
"Path to Java Runtime, Java 11 minimum."
139151
:type 'string
140152
:group `lsp-magik
141-
:package-version '(lsp-mode . "9.0.0"))
153+
:package-version '(lsp-mode . "9.0.1"))
142154

143155
(lsp-register-client
144156
(make-lsp-client
@@ -157,20 +169,6 @@
157169
(lsp--set-configuration (lsp-configuration-section "magik"))))
158170
:server-id 'magik))
159171

160-
(lsp-register-custom-settings
161-
`(("magik.javaHome" lsp-magik-java-home)
162-
("magik.productDirs" lsp-magik-product-dirs)
163-
("magik.lint.overrideConfigFile" lsp-magik-lint-override-config-file)
164-
("magik.typing.typeDatabasePaths" lsp-magik-typing-type-database-paths)
165-
("magik.typing.showTypingInlayHints" lsp-magik-typing-show-typing-inlay-hints)
166-
("magik.typing.showArgumentInlayHints" lsp-magik-typing-show-argument-inlay-hints)
167-
("magik.typing.enableChecks" lsp-magik-typing-enable-checks)
168-
("magik.typing.indexGlobalUsages" lsp-magik-typing-index-global-usages)
169-
("magik.typing.indexMethodUsages" lsp-magik-typing-index-method-usages)
170-
("magik.typing.indexSlotUsages" lsp-magik-typing-index-slot-usages)
171-
("magik.typing.indexConditionUsages" lsp-magik-typing-index-condition-usages)
172-
("magik.typing.cacheIndexedDefinitions" lsp-magik-typing-cache-indexed-definitions)))
173-
174172
(lsp-consistency-check lsp-magik)
175173

176174
(provide 'lsp-magik)

0 commit comments

Comments
 (0)