Support custom serverInfo request

Author: ericdallo

src/main/clojure/com/github/clojure_lsp/intellij/client.clj

@@ -1,7 +1,10 @@
 (ns com.github.clojure-lsp.intellij.client
+  (:require
+   [clojure.walk :as walk])
   (:import
+   [com.github.clojure_lsp.intellij ClojureLanguageServer]
    [com.intellij.openapi.project Project]
-   [com.redhat.devtools.lsp4ij LanguageServerManager]
+   [com.redhat.devtools.lsp4ij LanguageServerItem LanguageServerManager]
    [com.redhat.devtools.lsp4ij.commands CommandExecutor LSPCommandContext]
    [java.util List]
    [org.eclipse.lsp4j Command]))
@@ -12,6 +15,14 @@
   (when-let [manager (LanguageServerManager/getInstance project)]
     (keyword (.toString (.getServerStatus manager "clojure-lsp")))))
 
+(defn server-info [^Project project]
+  (when-let [manager (LanguageServerManager/getInstance project)]
+    (when-let [server (.getServer ^LanguageServerItem @(.getLanguageServer manager "clojure-lsp"))]
+      (some->> (.serverInfo ^ClojureLanguageServer server)
+               deref
+               (into {})
+               walk/keywordize-keys))))
+
 (defn execute-command [^String name ^String text ^List args ^Project project]
   (-> (CommandExecutor/executeCommand
        (doto (LSPCommandContext. (Command. text name args) project)

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

@@ -5,6 +5,7 @@
   (:require
    [clojure.pprint :as pprint]
    [clojure.string :as str]
+   [com.github.clojure-lsp.intellij.client :as lsp-client]
    [com.github.clojure-lsp.intellij.config :as config]
    [com.github.clojure-lsp.intellij.db :as db]
    [com.github.clojure-lsp.intellij.server :as server]
@@ -14,7 +15,6 @@
    [seesaw.mig :as s.mig])
   (:import
    [com.github.clojure_lsp.intellij.extension SettingsState]
-   [com.intellij.openapi.project Project]
    [com.intellij.ui IdeBorderFactory]
    [java.awt Toolkit]
    [java.awt.datatransfer StringSelection]))
@@ -93,12 +93,9 @@
                             :foreground (s.color/color 110 110 110)) "wrap"]]
                  (remove nil?)))))
 
-;; TODO
-(defn ^:private server-info! [^Project project])
-
 (defn -createComponent [_]
   (let [project (first (db/all-projects))
-        server-info (server-info! project)
+        server-info (lsp-client/server-info project)
         component (build-component server-info (db/get-in project [:settings]))]
     (reset! component* component)
     component))

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

@@ -18,8 +18,7 @@
    [com.redhat.devtools.lsp4ij.server OSProcessStreamConnectionProvider]
    [java.io File]
    [java.util List]
-   [org.eclipse.lsp4j InitializeParams]
-   [org.eclipse.lsp4j.services LanguageServer]))
+   [org.eclipse.lsp4j InitializeParams]))
 
 (set! *warn-on-reflection* true)
 
@@ -40,8 +39,8 @@
 (defn -createLanguageClient [_ ^Project project]
   (LanguageClientImpl. project))
 
-;; TODO custom server methods
-(defn -getServerInterface [_] LanguageServer)
+(defn -getServerInterface [_]
+  com.github.clojure_lsp.intellij.ClojureLanguageServer)
 
 (defn ^:private install-server [project]
   (swap! server assoc :status :installing)

src/main/kotlin/clojure_language_server.kt

@@ -0,0 +1,11 @@
+package com.github.clojure_lsp.intellij
+
+import org.eclipse.lsp4j.jsonrpc.services.JsonRequest
+import org.eclipse.lsp4j.services.LanguageServer
+import java.util.concurrent.CompletableFuture
+
+interface ClojureLanguageServer : LanguageServer {
+
+    @JsonRequest("clojure/serverInfo/raw")
+    fun serverInfo(): CompletableFuture<Object>
+}