Correctly quote allowAttachSelf argument for Leiningen (#3739)

clojure-emacs · Sep 9, 2024 · 87b836f · 87b836f
1 parent 8fdb53e
commit 87b836f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 ### Bugs fixed
 
 - [#3722](https://github.com/clojure-emacs/cider/pull/3722): Call `cider-docstring--format` after checking argument is not nil.
+- [#3739](https://github.com/clojure-emacs/cider/pull/3739): Leiningen jack in fails when `cider-enable-nrepl-jvmti-agent` is enabled.
 
 ## 1.15.1 (2024-07-01)
 

diff --git a/cider.el b/cider.el
@@ -823,7 +823,7 @@ removed, LEIN-PLUGINS, LEIN-MIDDLEWARES and finally PARAMS."
                                          middleware))
                                lein-middlewares)
                       (when cider-enable-nrepl-jvmti-agent
-                        `(,(concat "update-in :jvm-opts conj -Djdk.attach.allowAttachSelf"))))
+                        `(,(concat "update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"))))
               " -- ")
    " -- "
    (if (not cider-enrich-classpath)

diff --git a/test/cider-tests.el b/test/cider-tests.el
@@ -158,7 +158,7 @@
                                 (shell-quote-argument "[cider/cider-nrepl \"0.50.2\"]")
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]")
-                                " -- update-in :jvm-opts conj -Djdk.attach.allowAttachSelf"
+                                " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
                                 " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
                                 " -- repl :headless")))
 
@@ -172,7 +172,7 @@
                          (shell-quote-argument "[cider/cider-nrepl \"0.50.2\"]")
                          " -- update-in :plugins conj "
                          (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]")
-                         " -- update-in :jvm-opts conj -Djdk.attach.allowAttachSelf"
+                         " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
                          " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
                          " -- repl :headless")))
 
@@ -185,7 +185,7 @@
                                 (shell-quote-argument "[cider/cider-nrepl \"0.50.2\"]")
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]")
-                                " -- update-in :jvm-opts conj -Djdk.attach.allowAttachSelf"
+                                " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
                                 " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
                                 " -- repl :headless")))
 
@@ -226,7 +226,7 @@
                                 (shell-quote-argument "[cider/cider-nrepl \"0.50.2\"]")
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]")
-                                " -- update-in :jvm-opts conj -Djdk.attach.allowAttachSelf"
+                                " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
                                 " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
                                 " -- repl :headless")))
 
@@ -262,7 +262,7 @@
                                 (shell-quote-argument "[cider/cider-nrepl \"0.50.2\"]")
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]")
-                                " -- update-in :jvm-opts conj -Djdk.attach.allowAttachSelf"
+                                " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
                                 " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
                                 " -- repl :headless")))
     (it "can concat in a boot project"
@@ -345,7 +345,7 @@
                                 (shell-quote-argument "[cider/cider-nrepl \"0.50.2\"]")
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]")
-                                " -- update-in :jvm-opts conj -Djdk.attach.allowAttachSelf"
+                                " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
                                 " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
                                 " -- repl :headless"))))