Fix status bar

ericdallo · ericdallo · commit 46a3235caece · 2025-01-20T15:26:04.000-03:00
diff --git a/.lsp/config.edn b/.lsp/config.edn
@@ -1 +1,5 @@
-{:cljfmt {:indents {proxy+ [[:block 2] [:inner 1]]}}}
+{:cljfmt {:indents {proxy+ [[:block 2] [:inner 1]]}}
+ :project-specs [{:classpath-cmd ["./gradlew" "-q" "classpath"]
+                  :project-path "build.gradle.kts"}
+                 {:classpath-cmd ["clojure" "-Spath"]
+                  :project-path "deps.edn"}]}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -74,6 +74,12 @@ java {
     sourceCompatibility = JavaVersion.VERSION_17
 }
 
+tasks.register("classpath") {
+    doFirst {
+        println(sourceSets["main"].compileClasspath.asPath)
+    }
+}
+
 tasks {
     compileKotlin {
         kotlinOptions {
diff --git a/deps.edn b/deps.edn
@@ -1,26 +1,5 @@
 {:paths ["src/main/clojure"]
- :mvn/repos {"intellij-1" {:url "https://cache-redirector.jetbrains.com/intellij-dependencies"}
-             "intellij-2" {:url "https://www.jetbrains.com/intellij-repository/releases"}}
- :deps {org.clojure/clojure {:mvn/version "1.11.1"}
-        com.github.ericdallo/clj4intellij {:mvn/version "0.5.4"}
-        seesaw/seesaw {:mvn/version "1.5.0"}
-        camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"}
-        com.github.clojure-lsp/clojure-lsp {:mvn/version "2024.03.01-11.37.51"}
-        markdown-clj/markdown-clj {:mvn/version "1.12.1"}
-        com.rpl/proxy-plus {:mvn/version "0.0.9"}}
- :aliases {:dev {:deps {nrepl/nrepl {:mvn/version "1.0.0"}
-                        com.jetbrains.intellij.platform/ide-impl {:mvn/version "213.7172.48"
-                                                                  :exclusions [org.jetbrains.kotlin/kotlin-stdlib-jdk8
-                                                                               org.jetbrains.kotlin/kotlin-reflect
-                                                                               org.jetbrains.kotlinx/kotlinx-coroutines-jdk8
-                                                                               org.jetbrains.kotlinx/kotlinx-serialization-json-jvm
-                                                                               org.jetbrains.kotlinx/kotlinx-serialization-core-jvm
-
-                                                                               com.jetbrains.intellij.platform/external-system-impl
-                                                                               com.jetbrains.intellij.platform/service-container
-                                                                               com.jetbrains.intellij.platform/statistics-devkit
-                                                                               com.jetbrains.infra/download-pgp-verifier]}}}
-           :build {:extra-paths ["src/main/resources"]
+ :aliases {:build {:extra-paths ["src/main/resources"]
                    :deps {io.github.clojure/tools.build {:git/tag "v0.8.1"
                                                          :git/sha "7d40500"}
                           slipset/deps-deploy {:mvn/version "0.2.0"}}
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/action/implementations.clj b/src/main/clojure/com/github/clojure_lsp/intellij/action/implementations.clj
@@ -24,7 +24,7 @@
 (set! *warn-on-reflection* true)
 
 (defn show-implementations [^Editor editor line character]
-  (if-let [client (lsp-client/connected-client (.getProject editor))]
+  (if-let [client (lsp-client/connected-server (.getProject editor))]
     (let [implementations @(lsp-client/request! client [:textDocument/implementation
                                                         {:text-document {:uri (editor/editor->uri editor)}
                                                          :position {:line line
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/action/refactors.clj b/src/main/clojure/com/github/clojure_lsp/intellij/action/refactors.clj
@@ -14,7 +14,7 @@
 
 (defn execute-refactor-action [command-name ^AnActionEvent event]
   (when-let [editor ^Editor (.getData event CommonDataKeys/EDITOR)]
-    (if-let [client (lsp-client/connected-client (.getProject editor))]
+    (if-let [client (lsp-client/connected-server (.getProject editor))]
       (let [[line character] (util/editor->cursor-position editor)]
         (tasks/run-background-task!
          (.getProject editor)
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/action/references.clj b/src/main/clojure/com/github/clojure_lsp/intellij/action/references.clj
@@ -57,7 +57,7 @@
 
 (defn find-references-action [^AnActionEvent event]
   (when-let [editor ^Editor (.getData event CommonDataKeys/EDITOR)]
-    (if-let [client (lsp-client/connected-client (.getProject editor))]
+    (if-let [client (lsp-client/connected-server (.getProject editor))]
       (let [[line character] (util/editor->cursor-position editor)]
         (show-references editor line character client))
       (.showErrorHint (HintManager/getInstance) ^Editor editor "LSP not connected" HintManager/RIGHT))))
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/client.clj b/src/main/clojure/com/github/clojure_lsp/intellij/client.clj
@@ -10,7 +10,8 @@
    [lsp4clj.lsp.responses :as lsp.responses]
    [lsp4clj.protocols.endpoint :as protocols.endpoint])
   (:import
-   [com.intellij.openapi.project Project]))
+   [com.intellij.openapi.project Project]
+   [com.redhat.devtools.lsp4ij LanguageServerManager]))
 
 (set! *warn-on-reflection* true)
 
@@ -145,6 +146,10 @@
 (defn notify! [client [method body]]
   (protocols.endpoint/send-notification client (subs (str method) 1) body))
 
-(defn connected-client [^Project project]
-  (when (identical? :connected (db/get-in project [:status]))
-    (db/get-in project [:client])))
+(defn connected-server [^Project project]
+  (when-let [manager (LanguageServerManager/getInstance project)]
+    @(.getLanguageServer manager "clojure-lsp")))
+
+(defn server-status [^Project project]
+  (when-let [manager (LanguageServerManager/getInstance project)]
+    (keyword (.toString (.getServerStatus manager "clojure-lsp")))))
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/db.clj b/src/main/clojure/com/github/clojure_lsp/intellij/db.clj
@@ -11,15 +11,15 @@
 (def ^:private empty-project
   {:status :disconnected
    :downloaded-server-path nil
-   :client nil
    :server-process nil
+   :server nil
    :project nil
    :diagnostics {}
    :settings {:trace-level "off"
-              :server-path nil}})
+              :server-path nil}
+   :on-status-changed-fns []})
 
-(defonce db* (atom {:projects {}
-                    :on-status-changed-fns []}))
+(defonce db* (atom {:projects {}}))
 
 (defn empty-db? []
   (empty? (:projects @db*)))
@@ -38,9 +38,9 @@
 
 (defn init-db-for-project [^Project project]
   (swap! db* update :projects (fn [projects]
-                                (if (clojure.core/get projects (.getBasePath project))
+                                (if (clojure.core/get-in projects [(.getBasePath project) :project])
                                   projects
-                                  (assoc projects (.getBasePath project) (assoc empty-project :project project))))))
+                                  (update projects (.getBasePath project) #(merge (assoc empty-project :project project) %))))))
 
 (defn await-field [project field fn]
   (async/thread
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/code_action.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/code_action.clj
@@ -15,7 +15,7 @@
 (defonce code-action-name->title* (atom {}))
 
 (defn ^:private req-code-actions [project uri [line character]]
-  (when-let [client (lsp-client/connected-client project)]
+  (when-let [client (lsp-client/connected-server project)]
     (let [diagnostics (->> (db/get-in project [:diagnostics uri])
                            (filterv (fn [{{:keys [start end]} :range}]
                                       (and (<= (:line start) line (:line end))
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/code_lens.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/code_lens.clj
@@ -95,7 +95,7 @@
 
 (defn -getCollectorFor [_ _file ^Editor editor _settings ^InlayHintsSink sink]
   (let [uri (editor/editor->uri editor)]
-    (when-let [client (lsp-client/connected-client (.getProject editor))]
+    (when-let [client (lsp-client/connected-server (.getProject editor))]
       ;; For some reason `(PresentationFactory. editor)` does not work
       (proxy+ [editor] FactoryInlayHintsCollector
         (collect [^FactoryInlayHintsCollector this _ _ _]
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/completion.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/completion.clj
@@ -86,7 +86,7 @@
        (.withAutoCompletionPolicy AutoCompletionPolicy/SETTINGS_DEPENDENT)))))
 
 (defn -fillCompletionVariants [_ ^CompletionParameters params ^CompletionResultSet result]
-  (when-let [client (lsp-client/connected-client (.getProject (.getEditor params)))]
+  (when-let [client (lsp-client/connected-server (.getProject (.getEditor params)))]
     (try
       (let [file (.getOriginalFile params)
             uri (.getUrl (.getVirtualFile file))
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/definition.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/definition.clj
@@ -51,7 +51,7 @@
   (let [[line character] (:start (editor/text-range->range (.getTextRange element) editor))
         project ^Project (.getProject editor)
         current-v-file (some-> element .getContainingFile .getVirtualFile)]
-    (when-let [client (lsp-client/connected-client project)]
+    (when-let [client (lsp-client/connected-server project)]
       (when-let [definition @(lsp-client/request! client [:textDocument/definition
                                                           {:text-document {:uri (editor/editor->uri editor)}
                                                            :position {:line line
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/file_manager.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/file_manager.clj
@@ -21,6 +21,6 @@
 
 (defn -beforeDocumentSaving [_ ^Document document]
   (let [vfile (.getFile (FileDocumentManager/getInstance) document)]
-    (when-let [client (some-> vfile editor/v-file->project lsp-client/connected-client)]
+    (when-let [client (some-> vfile editor/v-file->project lsp-client/connected-server)]
       (lsp-client/notify! client [:textDocument/didSave
                                   {:textDocument {:uri (.getUrl vfile)}}]))))
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/formatting.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/formatting.clj
@@ -17,7 +17,7 @@
 
 (defn -canFormat [_ ^PsiFile psi-file]
   (and (instance? ClojureFileType (.getFileType psi-file))
-       (boolean (lsp-client/connected-client (.getProject psi-file)))))
+       (boolean (lsp-client/connected-server (.getProject psi-file)))))
 
 (defn -getName [_]
   "LSP format")
@@ -29,7 +29,7 @@
   (let [context (.getContext request)
         file (.getContainingFile context)
         uri (.getUrl (.getVirtualFile file))]
-    (when-let [client (lsp-client/connected-client (.getProject file))]
+    (when-let [client (lsp-client/connected-server (.getProject file))]
       (reify AsyncDocumentFormattingService$FormattingTask
         (run [_]
           (try
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/general_settings.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/general_settings.clj
@@ -89,14 +89,14 @@
                                                        :listen [:action (fn [_]
                                                                           (doseq [project (db/all-projects)]
                                                                             (server/shutdown! project)
-                                                                            #_(server/start-server! project)))]) "wrap"]]) "span"]
+                                                                            (server/start-server! project)))]) "wrap"]]) "span"]
                   [(s/label :text "*  requires LSP restart"
                             :font (s.font/font  :size 14)
                             :foreground (s.color/color 110 110 110)) "wrap"]]
                  (remove nil?)))))
 
 (defn ^:private server-info! [^Project project]
-  (some-> (lsp-client/connected-client project)
+  (some-> (lsp-client/connected-server project)
           (lsp-client/request! [":clojure/serverInfo/raw" {}])
           deref
           walk/keywordize-keys))
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/init_db_startup.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/init_db_startup.clj
@@ -5,16 +5,30 @@
                 com.intellij.openapi.project.DumbAware])
   (:require
    [com.github.clojure-lsp.intellij.db :as db]
-   [com.github.ericdallo.clj4intellij.logger :as logger])
+   [com.github.ericdallo.clj4intellij.logger :as logger]
+   [com.rpl.proxy-plus :refer [proxy+]])
   (:import
    [com.github.clojure_lsp.intellij.extension SettingsState]
    [com.intellij.openapi.project Project]
-   [com.redhat.devtools.lsp4ij LanguageServerManager LanguageServerManager$StartOptions]))
+   [com.redhat.devtools.lsp4ij LanguageServerManager LanguageServerWrapper]
+   [com.redhat.devtools.lsp4ij.lifecycle LanguageServerLifecycleListener LanguageServerLifecycleManager]))
 
 (set! *warn-on-reflection* true)
 
 (defn -runActivity [_this ^Project project]
   (db/init-db-for-project project)
   (db/load-settings-from-state! project (SettingsState/get))
-  #_(.start (LanguageServerManager/getInstance (first (db/all-projects))) "clojure-lsp" )
-  (logger/info "Loaded settings to memory:" (db/get-in project [:settings])))
+  (logger/info "Loaded settings to memory:" (db/get-in project [:settings]))
+  (.addLanguageServerLifecycleListener
+   (LanguageServerLifecycleManager/getInstance project)
+   (proxy+ [] LanguageServerLifecycleListener
+     (handleStatusChanged [_ ^LanguageServerWrapper server-wrapper]
+       (let [status (keyword (.toString (.getServerStatus server-wrapper)))]
+         (db/assoc-in project [:status] status)
+         (when (= :started status)
+           (db/assoc-in project [:server] (.getLanguageServer (LanguageServerManager/getInstance project)
+                                                              "clojure-lsp")))
+         (run! #(% status) (db/get-in project [:on-status-changed-fns]))))
+     (handleLSPMessage [_ _ _ _])
+     (handleError [_ _ _])
+     (dispose [_]))))
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/language_server_factory.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/language_server_factory.clj
@@ -3,24 +3,28 @@
    :name com.github.clojure_lsp.intellij.extension.LanguageServerFactory
    :implements [com.redhat.devtools.lsp4ij.LanguageServerFactory])
   (:require
-   [com.github.ericdallo.clj4intellij.logger :as logger]
    [com.rpl.proxy-plus :refer [proxy+]])
   (:import
    [com.intellij.execution.configurations GeneralCommandLine]
    [com.intellij.openapi.project Project]
-   [com.redhat.devtools.lsp4ij.server OSProcessStreamConnectionProvider]))
+   [com.redhat.devtools.lsp4ij.client LanguageClientImpl]
+   [com.redhat.devtools.lsp4ij.client.features LSPClientFeatures]
+   [com.redhat.devtools.lsp4ij.server OSProcessStreamConnectionProvider]
+   [org.eclipse.lsp4j.services LanguageServer]))
 
 (defn -createConnectionProvider [_ ^Project project]
-  (logger/info "------->")
   (doto (proxy+
-          []
-          OSProcessStreamConnectionProvider)
+         []
+         OSProcessStreamConnectionProvider)
     (.setCommandLine (GeneralCommandLine. ["/home/greg/dev/clojure-lsp/clojure-lsp" "listen"]))))
 
 ;; TODO custom commands
-;; (defn -createLanguageClient [_ ^Project project]
-;;   )
+(defn -createLanguageClient [_ ^Project project]
+  (LanguageClientImpl. project))
 
-;; TODO customer server methods
-;; (defn -getServerInterface [_]
-;;   )
+;; TODO custom server methods
+(defn -getServerInterface [_] LanguageServer)
+
+;; TODO client features
+(defn -createClientFeatures [_]
+  (LSPClientFeatures.))
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/rename.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/rename.clj
@@ -45,7 +45,7 @@
   ([_this ^Project _project ^"[Lcom.intellij.psi.PsiElement;" _elements ^DataContext _data-context])
   ;; rename a element in a editor
   ([_ ^Project project ^Editor editor ^PsiFile _psi-file ^DataContext _data-context]
-   (when-let [client (lsp-client/connected-client project)]
+   (when-let [client (lsp-client/connected-server project)]
      (let [[line character] (util/editor->cursor-position editor)]
        (when-let [current-name ^String (prepare-rename-current-name client editor line character)]
          (when-let [new-name (Messages/showInputDialog project "Enter new name: " "Rename" (Messages/getQuestionIcon) current-name (NonEmptyInputValidator.))]
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/status_bar_factory.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/status_bar_factory.clj
@@ -1,6 +1,5 @@
 (ns com.github.clojure-lsp.intellij.extension.status-bar-factory
   (:gen-class
-   :post-init post-init
    :name com.github.clojure_lsp.intellij.extension.StatusBarFactory
    :implements [com.intellij.openapi.wm.StatusBarWidgetFactory])
   (:require
@@ -24,7 +23,8 @@
    [com.intellij.ui.awt RelativePoint]
    [com.intellij.util Consumer]
    [java.awt Point]
-   [java.awt.event MouseEvent]))
+   [java.awt.event MouseEvent]
+   [kotlinx.coroutines CoroutineScope]))
 
 (set! *warn-on-reflection* true)
 
@@ -50,46 +50,47 @@
     (.updateWidget status-bar widget-id)
     (.updateWidget ^StatusBarWidgetsManager (.getService project StatusBarWidgetsManager) factory)))
 
-(defn -post-init [this]
-  (swap! db/db* update :on-status-changed-fns conj (fn [project _status]
-                                                     (refresh-status-bar this project))))
-
 (defn ^:private restart-lsp-action [^Project project]
   (proxy+
    ["Restart server"]
    DumbAwareAction
     (actionPerformed [_ _event]
       (server/shutdown! project)
-      #_(server/start-server! project))))
+      (server/start-server! project))))
 
 (defn ^:private status-bar-title [project]
-  (str "Clojure LSP: " (name (db/get-in project [:status] "disconnected"))))
+  (str "Clojure LSP: " (name (lsp-client/server-status project))))
 
-(defn -createWidget ^StatusBarWidget [_this ^Project project]
-  (proxy+
-   []
-   StatusBarWidget
-    (ID [_] widget-id)
-    (dispose [_])
-    (install [_ _])
-    (getPresentation [this] this)
-    StatusBarWidget$IconPresentation
-    (getClickConsumer [_]
-      (reify Consumer
-        (consume [_ e]
-          (let [component (.getComponent ^MouseEvent e)
-                popup (.createActionGroupPopup
-                       (JBPopupFactory/getInstance)
-                       (status-bar-title project)
-                       (doto (DefaultActionGroup.)
-                         (.add (restart-lsp-action project)))
-                       (.getDataContext (DataManager/getInstance) component)
-                       JBPopupFactory$ActionSelectionAid/SPEEDSEARCH
-                       true)]
-            (.show popup (RelativePoint. component (Point. 0 (-> popup .getContent .getPreferredSize .getHeight -)))))
-          true)))
-    (getTooltipText [_] (status-bar-title project))
-    (getIcon [_]
-      (if (lsp-client/connected-client project)
-        Icons/STATUS_CONNECTED
-        Icons/STATUS_DISCONNECTED))))
+(defn -createWidget ^StatusBarWidget
+  ([this ^Project project ^CoroutineScope _]
+   (-createWidget this project))
+  ([this ^Project project]
+   (db/update-in project [:on-status-changed-fns] #(conj % (fn [_status]
+                                                             (refresh-status-bar this project))))
+   (proxy+
+    []
+    StatusBarWidget
+     (ID [_] widget-id)
+     (dispose [_])
+     (install [_ _])
+     (getPresentation [this] this)
+     StatusBarWidget$IconPresentation
+     (getClickConsumer [_]
+       (reify Consumer
+         (consume [_ e]
+           (let [component (.getComponent ^MouseEvent e)
+                 popup (.createActionGroupPopup
+                        (JBPopupFactory/getInstance)
+                        (status-bar-title project)
+                        (doto (DefaultActionGroup.)
+                          (.add (restart-lsp-action project)))
+                        (.getDataContext (DataManager/getInstance) component)
+                        JBPopupFactory$ActionSelectionAid/SPEEDSEARCH
+                        true)]
+             (.show popup (RelativePoint. component (Point. 0 (-> popup .getContent .getPreferredSize .getHeight -)))))
+           true)))
+     (getTooltipText [_] (status-bar-title project))
+     (getIcon [_]
+       (if (= :started (lsp-client/server-status project))
+         Icons/STATUS_CONNECTED
+         Icons/STATUS_DISCONNECTED)))))
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/file_system.clj b/src/main/clojure/com/github/clojure_lsp/intellij/file_system.clj
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/listener/file.clj b/src/main/clojure/com/github/clojure_lsp/intellij/listener/file.clj
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/project_lsp.clj b/src/main/clojure/com/github/clojure_lsp/intellij/project_lsp.clj
diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/server.clj b/src/main/clojure/com/github/clojure_lsp/intellij/server.clj
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
