Fix settings state

Author: ericdallo

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

@@ -1,7 +1,6 @@
 (ns com.github.clojure-lsp.intellij.db
   (:refer-clojure :exclude [get-in assoc-in update-in])
   (:import
-   [com.github.clojure_lsp.intellij.extension SettingsState]
    [com.intellij.openapi.project Project]))
 
 (set! *warn-on-reflection* true)
@@ -12,8 +11,6 @@
    :server-process nil
    :project nil
    :diagnostics {}
-   :settings {:trace-level "off"
-              :server-path nil}
    :on-status-changed-fns []})
 
 (defonce db* (atom {:projects {}}))
@@ -36,33 +33,6 @@
                                   projects
                                   (update projects (.getBasePath project) #(merge (assoc empty-project :project project) %))))))
 
-(defn load-settings-from-state! [^Project project ^SettingsState settings-state]
-  (update-in project [:settings] (fn [settings]
-                                   (if-not (:loaded-settings? settings)
-                                     (-> settings
-                                         (assoc :loaded-settings? true)
-                                         (update :server-path #(or (.getServerPath settings-state) %))
-                                         (update :trace-level #(or (.getTraceLevel settings-state) %))
-                                         (update :log-path #(or (.getServerLogPath settings-state) %)))
-                                     settings))))
-
-(defn set-trace-level-setting! [^SettingsState settings-state trace-level]
-  (doseq [project-path (keys (:projects @db*))]
-    (.setTraceLevel settings-state trace-level)
-    (swap! db* clojure.core/assoc-in [:projects project-path :settings :trace-level] trace-level)))
-
-(defn set-server-log-path-setting! [^SettingsState settings-state log-path]
-  (doseq [project-path (keys (:projects @db*))]
-    (let [log-path (not-empty log-path)]
-      (.setServerLogPath settings-state log-path)
-      (swap! db* clojure.core/assoc-in [:projects project-path :settings :log-path] log-path))))
-
-(defn set-server-path-setting! [^SettingsState settings-state server-path]
-  (doseq [project-path (keys (:projects @db*))]
-    (let [server-path (not-empty server-path)]
-      (.setServerPath settings-state server-path)
-      (swap! db* clojure.core/assoc-in [:projects project-path :settings :server-path] server-path))))
-
 (defn all-projects []
   (remove nil?
           (mapv :project (vals (:projects @db*)))))

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

@@ -9,12 +9,12 @@
    [com.github.clojure-lsp.intellij.config :as config]
    [com.github.clojure-lsp.intellij.db :as db]
    [com.github.clojure-lsp.intellij.server :as server]
+   [com.github.clojure-lsp.intellij.settings :as settings]
    [seesaw.color :as s.color]
    [seesaw.core :as s]
    [seesaw.font :as s.font]
    [seesaw.mig :as s.mig])
   (:import
-   [com.github.clojure_lsp.intellij.extension SettingsState]
    [com.intellij.ui IdeBorderFactory]
    [java.awt Toolkit]
    [java.awt.datatransfer StringSelection]))
@@ -25,11 +25,11 @@
 
 (def ^:private server-not-started-message "Server not started")
 
-(defn ^:private build-component [{:keys [server-version log-path] :as server-info} settings]
+(defn ^:private build-component [{:keys [server-version log-path] :as server-info}]
   (let [server-running? (boolean server-info)
-        custom-server-path (:server-path settings)
+        custom-server-path (settings/server-path)
         server-path (or custom-server-path (.getCanonicalPath (config/download-server-path)))
-        custom-server-log-path (:log-path settings)
+        custom-server-log-path (settings/server-log-path)
         server-log-path (or custom-server-log-path log-path)]
     (s.mig/mig-panel
      :items (->> [(when-not server-running?
@@ -96,32 +96,30 @@
 (defn -createComponent [_]
   (let [project (first (db/all-projects))
         server-info (lsp-client/server-info project)
-        component (build-component server-info (db/get-in project [:settings]))]
+        component (build-component server-info)]
     (reset! component* component)
     component))
 
 (defn -getPreferredFocusedComponent [_]
   (s/select @component* [:#copy-server-info]))
 
 (defn -isModified [_]
-  (let [project (first (db/all-projects))
-        settings-state (SettingsState/get)
-        server-path (s/config (s/select @component* [:#server-path]) :text)
+  (let [server-path (s/config (s/select @component* [:#server-path]) :text)
         trace-level-combo-box (s/config (s/select @component* [:#trace-level]) :selected-item)
         server-log-path (s/config (s/select @component* [:#server-log]) :text)]
     (boolean
-     (or (not= server-path (or (.getServerPath settings-state) ""))
-         (not= trace-level-combo-box (.getTraceLevel settings-state))
-         (not= server-log-path (or (.getServerLogPath settings-state) ""))
+     (or (not= server-path (or (settings/server-path) ""))
+         (not= trace-level-combo-box (settings/server-trace-level))
+         (not= server-log-path (or (settings/server-log-path) ""))
          (and (str/blank? server-log-path)
-              (db/get-in project [:settings :log-path]))))))
+              (settings/server-log-path))))))
 
 (defn -reset [_]
   (let [project (first (db/all-projects))
         server-info (lsp-client/server-info project)
-        trace-level-combo-box (db/get-in project [:settings :trace-level])
-        server-log-path (or (db/get-in project [:settings :log-path]) (:log-path server-info))
-        server-path (or (db/get-in project [:settings :server-path]) (.getCanonicalPath (config/download-server-path)))]
+        trace-level-combo-box (settings/server-trace-level)
+        server-log-path (or (settings/server-log-path) (:log-path server-info))
+        server-path (or (settings/server-path) (.getCanonicalPath (config/download-server-path)))]
     (s/config! (s/select @component* [:#trace-level]) :selected-item trace-level-combo-box)
     (s/config! (s/select @component* [:#server-log]) :text server-log-path)
     (s/config! (s/select @component* [:#server-path]) :text server-path)))
@@ -130,14 +128,13 @@
   (reset! component* nil))
 
 (defn -apply [_]
-  (let [settings-state (SettingsState/get)
-        trace-level (s/config (s/select @component* [:#trace-level]) :selected-item)
+  (let [trace-level (s/config (s/select @component* [:#trace-level]) :selected-item)
         server-log-path (when (s/config (s/select @component* [:#custom-server-log?]) :selected?)
                           (s/config (s/select @component* [:#server-log]) :text))
         server-path (when (s/config (s/select @component* [:#custom-server-path?]) :selected?)
                       (s/config (s/select @component* [:#server-path]) :text))]
-    (db/set-server-path-setting! settings-state server-path)
-    (db/set-server-log-path-setting! settings-state server-log-path)
-    (db/set-trace-level-setting! settings-state trace-level)))
+    (settings/set-server-path! server-path)
+    (settings/set-server-log-path! server-log-path)
+    (settings/set-server-trace-level! trace-level)))
 
 (defn -cancel [_])

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

@@ -5,10 +5,8 @@
                 com.intellij.openapi.project.DumbAware])
   (:require
    [com.github.clojure-lsp.intellij.db :as db]
-   [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 LanguageServerWrapper]
    [com.redhat.devtools.lsp4ij.lifecycle LanguageServerLifecycleListener LanguageServerLifecycleManager]))
@@ -17,8 +15,6 @@
 
 (defn -runActivity [_this ^Project project]
   (db/init-db-for-project project)
-  (db/load-settings-from-state! project (SettingsState/get))
-  (logger/info "Loaded settings to memory:" (db/get-in project [:settings]))
   (.addLanguageServerLifecycleListener
    (LanguageServerLifecycleManager/getInstance project)
    (proxy+ [] LanguageServerLifecycleListener

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

@@ -9,6 +9,7 @@
    [com.github.clojure-lsp.intellij.config :as config]
    [com.github.clojure-lsp.intellij.editor :as editor]
    [com.github.clojure-lsp.intellij.server :as server]
+   [com.github.clojure-lsp.intellij.settings :as settings]
    [com.rpl.proxy-plus :refer [proxy+]])
   (:import
    [com.intellij.execution.configurations GeneralCommandLine]
@@ -31,7 +32,8 @@
 (defn -createConnectionProvider [_ ^Project _project]
   (let [server-path (loop []
                       (Thread/sleep 100)
-                      (or (some-> ^File (:path @server) .getCanonicalPath)
+                      (or (settings/server-path)
+                          (some-> ^File (:path @server) .getCanonicalPath)
                           (recur)))
         command [server-path "listen"]]
     (doto (proxy+

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

@@ -6,6 +6,7 @@
    [com.github.clojure-lsp.intellij.db :as db]
    [com.github.clojure-lsp.intellij.notification :as notification]
    [com.github.clojure-lsp.intellij.server :as server]
+   [com.github.clojure-lsp.intellij.settings :as settings]
    [com.github.ericdallo.clj4intellij.logger :as logger]
    [com.github.ericdallo.clj4intellij.tasks :as tasks])
   (:import
@@ -78,7 +79,7 @@
      (let [download-path (config/download-server-path)
            server-version-path (config/download-server-version-path)
            latest-version* (delay (try (string/trim (slurp latest-version-uri)) (catch Exception _ nil)))
-           custom-server-path (db/get-in project [:settings :server-path])]
+           custom-server-path (settings/server-path)]
        (cond
          custom-server-path
          (installed-fn {:status :installed :path custom-server-path})

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

@@ -0,0 +1,23 @@
+(ns com.github.clojure-lsp.intellij.settings
+  (:import
+   [com.github.clojure_lsp.intellij.extension SettingsState]))
+
+(set! *warn-on-reflection* true)
+
+(defn server-path []
+  (.getServerPath (SettingsState/get)))
+
+(defn server-trace-level []
+  (or (.getTraceLevel (SettingsState/get)) "off"))
+
+(defn server-log-path []
+  (.getServerLogPath (SettingsState/get)))
+
+(defn set-server-trace-level! [^String trace-level]
+  (.setTraceLevel (SettingsState/get) trace-level))
+
+(defn set-server-log-path! [^String log-path]
+  (.setServerLogPath (SettingsState/get) (not-empty log-path)))
+
+(defn set-server-path! [^String server-path]
+  (.setServerPath (SettingsState/get) (not-empty server-path)))