Skip to content

Commit 83eeacf

Browse files
committed
orverride isEnableSemanticTokensFileViewProvider
1 parent b5fbcfd commit 83eeacf

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

src/main/clojure/com/github/clojure_lsp/intellij/extension/language_server_factory.clj

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
[com.intellij.openapi.vfs LocalFileSystem VirtualFile]
2121
[com.redhat.devtools.lsp4ij LSPIJUtils ServerStatus]
2222
[com.redhat.devtools.lsp4ij.client LanguageClientImpl]
23-
[com.redhat.devtools.lsp4ij.client.features LSPClientFeatures LSPProgressFeature]
23+
[com.redhat.devtools.lsp4ij.client.features EditorBehaviorFeature LSPClientFeatures LSPProgressFeature]
2424
[com.redhat.devtools.lsp4ij.installation LanguageServerInstallerBase]
2525
[com.redhat.devtools.lsp4ij.server OSProcessStreamConnectionProvider]
2626
[java.io File]
@@ -88,23 +88,24 @@
8888
(LSPIJUtils/findResourceFor uri)))
8989

9090
(defn -createClientFeatures [_]
91-
(doto
92-
(proxy+ [] LSPClientFeatures
93-
(keepServerAlive [_] true)
94-
(initializeParams [_ ^InitializeParams params]
95-
(.setWorkDoneToken params "clojure-lsp-startup")
96-
(.setInitializationOptions params {"dependency-scheme" "jar"
97-
"hover" {"arity-on-same-line?" true}}))
98-
(findFileByUri ^VirtualFile [_ ^String uri]
99-
(find-file-by-uri uri))
100-
(handleServerStatusChanged [^LSPClientFeatures this ^ServerStatus server-status]
101-
(let [status (keyword (.toString server-status))]
102-
(db/assoc-in (.getProject this) [:status] status)
103-
(run! #(% status) (db/get-in (.getProject this) [:on-status-changed-fns])))))
104-
(.setProgressFeature (proxy+ [] LSPProgressFeature
91+
(let [lsp-client-features (proxy+ [] LSPClientFeatures
92+
(keepServerAlive [_] true)
93+
(initializeParams [_ ^InitializeParams params]
94+
(.setWorkDoneToken params "clojure-lsp-startup")
95+
(.setInitializationOptions params {"dependency-scheme" "jar"
96+
"hover" {"arity-on-same-line?" true}}))
97+
(findFileByUri ^VirtualFile [_ ^String uri]
98+
(find-file-by-uri uri))
99+
(handleServerStatusChanged [^LSPClientFeatures this ^ServerStatus server-status]
100+
(let [status (keyword (.toString server-status))]
101+
(db/assoc-in (.getProject this) [:status] status)
102+
(run! #(% status) (db/get-in (.getProject this) [:on-status-changed-fns])))))]
103+
(.setProgressFeature lsp-client-features
104+
(proxy+ [] LSPProgressFeature
105105
(updateMessage [_ ^String message ^ProgressIndicator indicator]
106106
(.setText indicator (str "LSP: " message)))))
107-
(.setServerInstaller (proxy+ [] LanguageServerInstallerBase
107+
(.setServerInstaller lsp-client-features
108+
(proxy+ [] LanguageServerInstallerBase
108109
(getInstallationTaskTitle [_] "LSP: installing clojure-lsp")
109110
(progressCheckingServerInstalled [_ indicator] (tasks/set-progress indicator "LSP: checking for clojure-lsp"))
110111
(progressInstallingServer [_ indicator] (tasks/set-progress indicator "LSP: downloading clojure-lsp"))
@@ -119,4 +120,8 @@
119120
(when-not @server-installing*
120121
(reset! server-installing* true)
121122
(reset! server-path* (server/install-server! (.getProject (.getClientFeatures this))))
122-
(reset! server-installing* false)))))))
123+
(reset! server-installing* false)))))
124+
(.setEditorBehaviorFeature lsp-client-features
125+
(proxy+ [lsp-client-features] EditorBehaviorFeature
126+
(isEnableSemanticTokensFileViewProvider [_ _] true)))
127+
lsp-client-features))

0 commit comments

Comments
 (0)