Fix issue

nextjournal · Dec 12, 2023 · 5a7a6f9 · 5a7a6f9
1 parent 5ce26e5
commit 5a7a6f9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/public/squint/js/demo.mjs b/public/squint/js/demo.mjs
@@ -120,6 +120,8 @@ let doc = `(comment
   (+ 1 2 3))
 `  ;
 
+// doc = `(do #_#_1 (+ 1 2 3) )`
+
 evalCode(doc);
 
 let state = EditorState.create( {doc: doc,

diff --git a/src-shared/nextjournal/clojure_mode/extensions/eval_region.cljc b/src-shared/nextjournal/clojure_mode/extensions/eval_region.cljc
@@ -12,12 +12,15 @@
 (defn uppermost-edge-here
   "Returns node or its highest ancestor that starts or ends at the cursor position."
   [pos node]
-  (or (->> (iterate n/up node)
-           (take-while (every-pred (complement n/top?)
-                                   #(or (= pos (n/end %) (n/end node))
-                                        (= pos (n/start %) (n/start node)))))
-           (last))
-      node))
+  (let [node (or (->> (iterate n/up node)
+                      (take-while (every-pred (complement n/top?)
+                                              #(or (= pos (n/end %) (n/end node))
+                                                   (= pos (n/start %) (n/start node)))))
+                      (last))
+                 node)]
+    (if (= "Discard" (n/name node))
+      (last (n/children node))
+      node)))
 
 (defn main-selection [state]
   (->
@@ -37,7 +40,7 @@
                    (and (not (n/terminal-type? (n/type %)))
                         (< (n/start %) from (n/end %))))
                   (-> (n/children from -1) first))))
-            #_(uppermost-edge-here from)
+            (uppermost-edge-here from)
             (n/balanced-range state))))
 
 (defn top-level-node [state]

diff --git a/test/nextjournal/clojure_mode_tests.cljc b/test/nextjournal/clojure_mode_tests.cljc
@@ -331,7 +331,9 @@
         (= (f (test-utils/make-state extensions input)) expected)
       "(+ |1 2 3)" eval-region/cursor-node-string "1"
       "(+ |(+ 1 2) 2 3)" eval-region/cursor-node-string "(+ 1 2)"
-      "(+ (+ 1 2)| 2 3)" eval-region/cursor-node-string "(+ 1 2)")
+      "(+ (+ 1 2)| 2 3)" eval-region/cursor-node-string "(+ 1 2)"
+      "(+ #_(+ 1 2)| 2 3)" eval-region/cursor-node-string "(+ 1 2)"
+      "(+ #_#_1 (+ 1 2)| 2 3)" eval-region/cursor-node-string "(+ 1 2)")
     (let [state (test-utils/make-state extensions ";; dude\n|{:a 1}")]
       (is (= "{:a 1}" (->> (eval-region/top-level-node state)
                            (util/range-str state)))))))