Merge pull request #262 from BetterThanTomorrow:218-evaluate-selection-stack-overflow

218-evaluate-selection-stack-overflow

* Fixes #218

Author: PEZ

CHANGELOG.md

@@ -4,6 +4,8 @@ Changes to Joyride
 
 ## [Unreleased]
 
+- Fix: [Hitting maximum stack size error when Evaluating Selection](https://github.com/BetterThanTomorrow/joyride/pull/218) (Works around a yet unfigured-out Promesa issue.)
+
 ## [0.0.70] - 2025-11-02
 
 - **BREAKING CHANGE** - Fix: [Namespaces of namespaced keys don't survive flare/post-message!+](https://github.com/BetterThanTomorrow/joyride/pull/260)

src/joyride/extension.cljs

@@ -51,21 +51,19 @@
 (defn evaluate-selection+
   "Evaluates the selection by first copying it to the clipboard and reading it from there.
    Restores the original clipboard content after reading it from the clipboard.
-   The reason to do it like this is that it will work regardless of where text i selected.
+   The reason to do it like this is that it will work regardless of where text is selected.
    Also in Markdown previews or terminal, or QuickPick prompts, or anywhere."
   []
-  ; Delay needed when run from the command palette
-  ; lest the command palette is active when the copy is performed
   (p/do
-    (p/create
-     (fn [resolve _reject]
-       (js/setTimeout resolve 200)))
-    (p/let [original-clipboard-text (vscode/env.clipboard.readText)
+    (p/delay 200)
+    ; We use native JS promises for clipboard reading to avoid stack overflow issues
+    ; https://github.com/BetterThanTomorrow/joyride/issues/218
+    (p/let [before-clipboard (.then (vscode/env.clipboard.readText) identity)
             _ (vscode/commands.executeCommand "editor.action.clipboardCopyAction")
-            selected-text (vscode/env.clipboard.readText)
-            _ (vscode/env.clipboard.writeText original-clipboard-text)]
-      (when (not-empty selected-text)
-        (run-code+ selected-text)))))
+            selection (.then (vscode/env.clipboard.readText) identity)
+            _ (vscode/env.clipboard.writeText before-clipboard)]
+      (when (not= selection before-clipboard)
+        (run-code+ selection)))))
 
 (defn reveal-output-terminal
   "Reveal the Joyride output terminal without taking focus."

vscode-test-runner/workspace-1/.joyride/src/integration_test/commands_test.cljs

@@ -0,0 +1,45 @@
+(ns integration-test.commands-test
+  (:require
+   [cljs.test :refer [is testing]]
+   [integration-test.macros :refer [deftest-async]]
+   [promesa.core :as p]
+   ["vscode" :as vscode]))
+
+(deftest-async evaluate-selection-without-crash
+  (testing "Evaluate selection command completes without stack overflow"
+    (p/let [doc (vscode/workspace.openTextDocument #js {:content "(+ 1 2)"
+                                                        :language "clojure"})
+            editor (vscode/window.showTextDocument doc)
+            _ (set! (.-selection editor)
+                    (vscode/Selection. 0 0 0 7))
+            _ (vscode/env.clipboard.writeText "original-clipboard-content")
+            _ (vscode/commands.executeCommand "joyride.evaluateSelection")
+            _ (p/delay 500)
+            clipboard-after (.then (vscode/env.clipboard.readText) identity)]
+      (is (= "original-clipboard-content" clipboard-after)
+          "Clipboard content is restored after evaluation"))))
+
+(deftest-async evaluate-selection-with-empty-selection
+  (testing "Evaluate selection handles empty selection gracefully"
+    (p/let [doc (vscode/workspace.openTextDocument #js {:content "(+ 1 2)"
+                                                        :language "clojure"})
+            editor (vscode/window.showTextDocument doc)
+            _ (set! (.-selection editor)
+                    (vscode/Selection. 0 0 0 0))
+            _ (vscode/commands.executeCommand "joyride.evaluateSelection")
+            _ (p/delay 300)]
+      (is true "Command handles empty selection without error"))))
+
+(deftest-async evaluate-selection-preserves-different-clipboard
+  (testing "Evaluate selection preserves clipboard when selection differs from clipboard"
+    (p/let [doc (vscode/workspace.openTextDocument #js {:content "(println \"test\")"
+                                                        :language "clojure"})
+            editor (vscode/window.showTextDocument doc)
+            _ (set! (.-selection editor)
+                    (vscode/Selection. 0 0 0 17))
+            _ (vscode/env.clipboard.writeText "different-content")
+            _ (vscode/commands.executeCommand "joyride.evaluateSelection")
+            _ (p/delay 500)
+            clipboard-after (.then (vscode/env.clipboard.readText) identity)]
+      (is (= "different-content" clipboard-after)
+          "Clipboard is restored even when different from selection"))))

vscode-test-runner/workspace-1/.joyride/src/integration_test/flare_test.cljs

@@ -31,7 +31,7 @@
                   :message-handler message-handler})
               _ ready?
               ;; We need to wait a tiny bit to be be ready for realz
-              _ (p/delay 32)
+              _ (p/delay 200)
               _ (flare/post-message!+ :test/namespaced-keywords message)
               ;; We need to wait a tick before closing the flare
               _ (p/delay 0)

vscode-test-runner/workspace-1/.joyride/src/integration_test/runner.cljs

@@ -63,7 +63,8 @@
                     'integration-test.joyride-core-test
                     'integration-test.rewrite-clj-test
                     'integration-test.reader-conditionals
-                    'integration-test.flare-test]]
+                    'integration-test.flare-test
+                    'integration-test.commands-test]]
       (println "Runner: Workspace activated, running tests...")
       (try
         (doseq [test-ns test-nss]