Merge pull request #9 from fabiodomingues/fix-settings-argument

Fixing settings argument

Author: ericdallo

Diff for: src/leiningen/clojure_lsp.clj

@@ -1,11 +1,37 @@
 (ns leiningen.clojure-lsp
   (:refer-clojure :exclude [run!])
   (:require
+   [clojure.edn :as edn]
    [clojure-lsp.main :as lsp]
    [leiningen.core.main :as lein-core]))
 
-(defn run! [command-and-options options]
-  (let [result (apply lsp/run! (concat command-and-options ["--settings" (str options)]))]
+(defn ^:private has-settings?
+  [command-and-options]
+  (let [settings-index (.indexOf command-and-options "--settings")]
+    (and (>= settings-index 0)
+         (not-empty (nth command-and-options (inc settings-index))))))
+
+(defn ^:private args-with-merged-settings
+  [command-and-options project-settings]
+  (let [settings-index (inc (.indexOf command-and-options "--settings"))
+        settings (edn/read-string (nth command-and-options settings-index))]
+    (assoc (vec command-and-options) settings-index (str (merge project-settings settings)))))
+
+(defn args
+  [command-and-options project-settings]
+  (cond
+    (and (not-empty project-settings) (has-settings? command-and-options))
+    (args-with-merged-settings command-and-options project-settings)
+
+    (not-empty project-settings)
+    (concat command-and-options ["--settings" (str project-settings)])
+
+    :else
+    command-and-options))
+
+(defn ^:private run!
+  [command-and-options project-settings]
+  (let [result (apply lsp/run! (args command-and-options project-settings))]
     (when-let [message-fn (:message-fn result)]
       (println (message-fn)))
     (when (not= 0 (:result-code result))
@@ -15,8 +41,8 @@
 (defn ^:no-project-needed clojure-lsp
   "Access clojure-lsp API features"
   [project & command-and-options]
-  (let [project-options (or (:clojure-lsp project) {})]
+  (let [project-settings (or (:clojure-lsp project) {})]
     (if lein-core/*info*
-      (run! command-and-options project-options)
+      (run! command-and-options project-settings)
       (with-out-str
-        (run! command-and-options project-options)))))
+        (run! command-and-options project-settings)))))

Diff for: test/leiningen/clojure_lsp_test.clj

@@ -0,0 +1,24 @@
+(ns leiningen.clojure-lsp-test
+  (:require [clojure.test :refer :all]
+            [leiningen.clojure-lsp :as clojure-lsp]))
+
+(deftest args-test
+  (testing "Should return the arguments when project settings is an empty map"
+    (is (= ["diagnostics"]
+           (clojure-lsp/args ["diagnostics"] {}))))
+
+  (testing "Should return the arguments when project settings is nil"
+    (is (= ["diagnostics"]
+           (clojure-lsp/args ["diagnostics"] nil))))
+
+  (testing "Should return the arguments when there is project settings"
+    (is (= ["diagnostics" "--settings" "{:foo 1}"]
+           (clojure-lsp/args ["diagnostics"] {:foo 1}))))
+
+  (testing "Should return the arguments when there is settings options and also project settings"
+    (is (= ["diagnostics" "--settings" "{:foo 1, :bar \"Test\"}"]
+           (clojure-lsp/args ["diagnostics" "--settings" "{:bar \"Test\"}"] {:foo 1}))))
+
+  (testing "Should return the arguments when there is settings options and there is no project settings"
+    (is (= ["diagnostics" "--settings" "{:bar \"Test\"}"]
+           (clojure-lsp/args ["diagnostics" "--settings" "{:bar \"Test\"}"] {})))))