3.3.0

Author: tonsky

CHANGELOG.md

@@ -1,3 +1,8 @@
+### 3.3.0 - Oct 26, 2023
+
+- Eval inside already evaled region re-evals same region instead of going to top form
+- Printer can display newlines
+
 ### 3.2.1 - Sep 10, 2023
 
 - Socket: Report number of reflection warnings in status bar

cs_conn.py

@@ -42,13 +42,19 @@ def ready(self):
     def eval_impl(self, form):
         pass
 
+    def eval_region(self, region, view):
+        if region.empty():
+            if eval := cs_eval.by_region(view, region):
+                return eval.region()
+            return cs_parser.topmost_form(view, region.begin())
+        return region
+
     def eval(self, view, sel):
         """
         Eval code and call `cs_eval.on_success(id, value)` or `cs_eval.on_exception(id, value, trace)`
         """
         for region in sel:
-            if region.empty():
-                region = cs_parser.topmost_form(view, region.begin())
+            region = self.eval_region(region, view)
             eval = cs_eval.Eval(view, region)
             (line, column) = view.rowcol_utf16(region.begin())
             line = line + 1

cs_conn_socket_repl.py

@@ -85,8 +85,7 @@ def eval(self, view, sel):
         cs_warn.reset_warnings()
         for region in sel:
             # find regions to eval
-            if region.empty():
-                region = cs_parser.topmost_form(view, region.begin())
+            region = self.eval_region(region, view)
 
             start = region.begin()
             parsed = cs_parser.parse(view.substr(region))

cs_printer.py

@@ -1,3 +1,5 @@
+import re
+
 def safe_get(l, i, default = None):
     """
     Like dict.get(), but for lists
@@ -117,4 +119,7 @@ def format(text, node, indent = '', limit = 80):
     elif node.name == 'tagged':
         return format_tagged(text, node, indent, limit)
     else:
-        return wrap_string(text[node.start:node.end], limit = limit, indent = indent)
+        str = text[node.start:node.end]
+        str = re.sub("(?<!\\\\)\\\\n", "\n", str)
+        str = "\n".join(wrap_string(s, limit = limit, indent = indent) for s in str.split("\n"))
+        return str