Eval previous form at current level #118

Author: tonsky

.gitignore

@@ -4,4 +4,5 @@ __pycache__
 .cpcache
 TODO.md
 .repl-port
-.nrepl-port
+.nrepl-port
+.clj-kondo

CHANGELOG.md

@@ -1,3 +1,7 @@
+### WIP
+
+- Eval previous form at current level #118
+
 ### 4.0.0 - Aug 23, 2024
 
 Syntax has been significantly reworked.
@@ -9,7 +13,7 @@ Syntax has been significantly reworked.
 - Properly highlight `entity.name` in `def*` forms only at second position, skipping all meta/comments
 - Quote & syntax quote highlight following form as `meta.quoted` and `meta.quoted.syntax`
 - Metadata highlights following form as `meta.metadata`
-- Octal & arbitrary radix integers
+- Octal & arbitrary radix integers #71
 - Better keyword detection
 
 Other changes:
@@ -18,8 +22,8 @@ Other changes:
 - Allow using `cljfmt` for formatting (requires `cljfmt` binary on `$PATH`)
 - Removed separate EDN syntax, merged with main Clojure (Sublimed)
 - Settings can now be specified in main `Preferences.sublime-settings` as well. Just prepend `clojure_sublimed_` to each setting’s name.
-- REPL can detect namespaces with meta on ns form
-- Detect `.shadow-cljs/nrepl.port` and `.shadow-cljs/socket-repl.port`
+- REPL can detect namespaces with meta on ns form #116
+- Detect `.shadow-cljs/nrepl.port` and `.shadow-cljs/socket-repl.port` #114
 - Connect commands now accept `timeout` argument for automation scenarios like “start clojure, start trying to connect to REPL until port is available”
 
 ### 3.8.0 - Aug 8, 2024

Clojure Sublimed Light.sublime-color-scheme

@@ -13,7 +13,7 @@
         "magenta":    "#7A3E9D",
         "yellow":     "#FFFABC",
         "orange":     "#FFBC5D",
-        "gray":       "#808080",
+        "gray":       "#A0A0A0",
     },
     "globals":
     {

Default.sublime-commands

@@ -36,6 +36,10 @@
         "caption": "Clojure Sublimed: Evaluate Buffer",
         "command": "clojure_sublimed_eval_buffer"
     },
+    {
+        "caption": "Clojure Sublimed: Evaluate Previous Form at Current Level",
+        "command": "clojure_sublimed_eval_previous_form"
+    },
     {
         "caption": "Clojure Sublimed: Interrupt Pending Evaluations",
         "command": "clojure_sublimed_interrupt_eval"

cs_eval.py

@@ -284,7 +284,7 @@ class ClojureSublimedEvalCommand(sublime_plugin.WindowCommand):
     """
     Eval selected code or topmost form is selection is collapsed
     """
-    def run(self, print_quota = None, transform = None, expand = False):
+    def run(self, regions = None, print_quota = None, transform = None, expand = False):
         view = self.window.active_view()
         state = cs_common.get_state(self.window)
 
@@ -295,8 +295,26 @@ def run(self, print_quota = None, transform = None, expand = False):
         on_finish = None
         if expand:
             on_finish = lambda _: view.run_command("clojure_sublimed_toggle_info", {})
+
+        regions = [sublime.Region(a, b) for (a, b) in regions]
+        state.conn.eval(view, regions or view.sel(), transform_fn = transform_fn, print_quota = print_quota, on_finish = on_finish)
+
+    def is_enabled(self):    
+        return self.window.active_view() and cs_conn.ready(self.window)
+
+class ClojureSublimedEvalPreviousFormCommand(sublime_plugin.WindowCommand):
+    def run(self, print_quota = None, transform = None, expand = False):
+        view = self.window.active_view()
+        regions = []
+        
+        for sel in view.sel():
+            if sel.empty():
+                if form := cs_parser.previous_form_at_level(view, sel.begin()):
+                    regions.append((form.start, form.end))
 
-        state.conn.eval(view, view.sel(), transform_fn = transform_fn, print_quota = print_quota, on_finish = on_finish)
+        if regions:
+            args = {"regions": regions, "print_quota": print_quota, "transform": transform, "expand": expand}
+            self.window.run_command("clojure_sublimed_eval", args)
 
     def is_enabled(self):    
         return self.window.active_view() and cs_conn.ready(self.window)

cs_parser.py

@@ -419,6 +419,28 @@ def topmost_form(view, point):
                         node = inner
         return sublime.Region(node.start, node.end)
 
+def previous_form_at_level(view, point):
+    """
+    Finds last form before cursor on the same level. E.g.
+
+    (+ 1 (* 2 3) 3)
+                ^ cursor
+         ^^^^^^^ result
+    """
+    parsed = parse_tree(view)
+    def find_previous(node):
+        if not node:
+            return
+        children = node.body.children if node.body else node.children
+        if not children:
+            return
+        for child in reversed(children):
+            if child.end <= point:
+                return child
+            if child.start < point < child.end:
+                return find_previous(child)
+    return find_previous(parsed)
+
 def namespace(view, point):
     """
     Finds name of last namespace defined in buffer up to the point