Merge pull request #11 from clojure-lsp/clojure-lsp-native

Use Clojure lsp native

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- Fix --settings flag
+- Replace clojure-lsp JVM with native binary for way better performance.
+
 ## 1.4.21
 
 ## 1.4.20

project.clj

@@ -9,21 +9,4 @@
                                     :username      :env/clojars_username
                                     :password      :env/clojars_password
                                     :sign-releases false}]]
-  :managed-dependencies [[com.fasterxml.jackson.core/jackson-core "2.18.0"]
-                         [org.clojure/tools.cli "1.1.230"]]
-  :dependencies [[com.github.clojure-lsp/clojure-lsp-server "2025.03.27-20.21.36" :exclusions [babashka/fs
-                                                                                               cheshire
-                                                                                               org.jetbrains.kotlin/kotlin-stdlib-jdk7
-                                                                                               com.fasterxml.jackson.dataformat/jackson-dataformat-smile
-                                                                                               com.fasterxml.jackson.dataformat/jackson-dataformat-cbor
-                                                                                               org.jetbrains.kotlin/kotlin-stdlib
-                                                                                               org.jetbrains.kotlin/kotlin-stdlib-jdk8
-                                                                                               org.jetbrains.kotlin/kotlin-stdlib-jdk7
-                                                                                               io.opentelemetry/opentelemetry-context
-                                                                                               io.opentelemetry/opentelemetry-api
-                                                                                               org.clojure/tools.reader]]
-                 [cheshire/cheshire "5.13.0"]
-                 [babashka/fs "0.5.21"]
-                 [com.fasterxml.jackson.dataformat/jackson-dataformat-smile "2.18.0"]
-                 [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.18.0"]
-                 [org.clojure/tools.reader "1.5.0"]])
+  :dependencies [[babashka/process "0.6.23"]])

resources/CLOJURE_LSP_VERSION

@@ -0,0 +1 @@
+2025.03.27-20.21.36

scripts/lein_clojure_lsp/ci.clj

@@ -46,9 +46,7 @@
 (defn tag-patch-for-version [& [version]]
   (shell "git fetch origin")
   (shell "git pull origin HEAD")
-  (replace-in-file "project.clj"
-                   #"com.github.clojure-lsp/clojure-lsp-server \".*\""
-                   (format "com.github.clojure-lsp/clojure-lsp-server \"%s\"" version))
+  (spit "resources/CLOJURE_LSP_VERSION" version)
   (let [new-tag (get-patched-tag)]
     (replace-tag new-tag)
     (add-changelog-entry new-tag (str "Bump clojure-lsp to " version))

src/leiningen/clojure_lsp.clj

@@ -2,8 +2,8 @@
   (:refer-clojure :exclude [run!])
   (:require
    [clojure.edn :as edn]
-   [clojure-lsp.main :as lsp]
-   [leiningen.core.main :as lein-core]))
+   [leiningen.core.main :as lein-core]
+   [leiningen.clojure-lsp.binary :as lsp-binary]))
 
 (defn ^:private has-settings?
   [command-and-options]
@@ -20,24 +20,22 @@
 (defn args
   [command-and-options project-settings]
   (cond
-    (and (not-empty project-settings) (has-settings? command-and-options))
+    (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)])
+    (concat command-and-options ["--settings" (str (:settings 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))
-      (lein-core/exit (:result-code result) "clojure-lsp found issues"))))
+  (let [{:keys [exit]} (lsp-binary/run! (args command-and-options project-settings))]
+    (when (not= 0 exit)
+      (lein-core/exit exit "clojure-lsp found issues"))))
 
-#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
 (defn ^:no-project-needed clojure-lsp
   "Access clojure-lsp API features"
   [project & command-and-options]

src/leiningen/clojure_lsp/binary.clj

@@ -0,0 +1,95 @@
+(ns leiningen.clojure-lsp.binary
+  (:refer-clojure :exclude [run!])
+  (:require
+   [babashka.process :as process]
+   [clojure.java.io :as io]
+   [clojure.string :as string])
+  (:import
+   [java.io BufferedReader File]
+   [java.util.zip ZipInputStream]))
+
+(set! *warn-on-reflection* true)
+
+(defn ^:private global-cache-dir []
+  (let [cache-home (or (System/getenv "XDG_CACHE_HOME")
+                       (io/file (System/getProperty "user.home") ".cache"))]
+    (io/file cache-home "lein-clojure-lsp")))
+
+(def ^:private download-artifact-uri
+  "https://github.com/clojure-lsp/clojure-lsp/releases/download/%s/%s")
+
+(defn ^:private os-name []
+  (let [os-name (string/lower-case (System/getProperty "os.name" "generic"))]
+    (cond
+      (string/includes? os-name "win") :windows
+      (string/includes? os-name "mac") :macos
+      :else :linux)))
+
+(defn ^:private os-arch []
+  (if (= "aarch64" (System/getProperty "os.arch"))
+    :aarch64
+    :amd64))
+
+(def ^:private artifacts
+  {:linux {:amd64 "clojure-lsp-native-static-linux-amd64.zip"
+           :aarch64 "clojure-lsp-native-linux-aarch64.zip"}
+   :macos {:amd64 "clojure-lsp-native-macos-amd64.zip"
+           :aarch64 "clojure-lsp-native-macos-aarch64.zip"}
+   :windows {:amd64 "clojure-lsp-native-windows-amd64.zip"}})
+
+(defn ^:private unzip-file [input ^File dest-file]
+  (with-open [stream (-> input io/input-stream ZipInputStream.)]
+    (loop [entry (.getNextEntry stream)]
+      (when entry
+        (if (.isDirectory entry)
+          (when-not (.exists dest-file)
+            (.mkdirs dest-file))
+          (clojure.java.io/copy stream dest-file))
+        (recur (.getNextEntry stream))))))
+
+(defn ^:private download! [^File download-path version]
+  (let [platform (os-name)
+        arch (os-arch)
+        artifact-name (get-in artifacts [platform arch])
+        uri (format download-artifact-uri version artifact-name)]
+    (io/make-parents download-path)
+    (unzip-file (io/input-stream uri) download-path)
+    (doto download-path
+      (.setWritable true)
+      (.setReadable true)
+      (.setExecutable true))))
+
+(defn ^:private server-version []
+  (string/trim (slurp (io/resource "CLOJURE_LSP_VERSION"))))
+
+(defn ^:private server-path ^File []
+  (io/file (global-cache-dir) "clojure-lsp"))
+
+(defn ^:private run-lsp! [^File path args]
+  (let [p (process/process {:cmd (concat [(.getAbsolutePath path)] args)})]
+    (future
+      (with-open [out-rdr ^BufferedReader (io/reader (:out p))]
+        (loop []
+          (when-let [line (.readLine out-rdr)]
+            (println line)
+            (recur)))))
+    (future
+      (with-open [out-rdr ^BufferedReader (io/reader (:err p))]
+        (binding [*out* *err*]
+          (loop []
+            (when-let [line (.readLine out-rdr)]
+              (println line)
+              (recur))))))
+    @p))
+
+(defn run! [args]
+  (let [server-path (server-path)
+        server-version (server-version)]
+    (when-not (.exists server-path)
+      (binding [*out* *err*]
+        (println "Downloading and caching clojure-lsp to" (str server-path)))
+      (let [t (System/currentTimeMillis)]
+        (download! server-path server-version)
+        (binding [*out* *err*]
+          (println (format "Downloaded clojure-lsp took %sms" (- (System/currentTimeMillis) t))))))
+    (run-lsp! server-path args)))

test/leiningen/clojure_lsp_test.clj

@@ -1,6 +1,7 @@
 (ns leiningen.clojure-lsp-test
-  (:require [clojure.test :refer :all]
-            [leiningen.clojure-lsp :as clojure-lsp]))
+  (: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"
@@ -13,7 +14,7 @@
 
   (testing "Should return the arguments when there is project settings"
     (is (= ["diagnostics" "--settings" "{:foo 1}"]
-           (clojure-lsp/args ["diagnostics"] {:foo 1}))))
+           (clojure-lsp/args ["diagnostics"] {:settings {:foo 1}}))))
 
   (testing "Should return the arguments when there is settings options and also project settings"
     (is (= ["diagnostics" "--settings" "{:foo 1, :bar \"Test\"}"]