on_finish_callback -> on_finish #105

Author: tonsky

cs_conn.py

@@ -64,13 +64,13 @@ def code(self, view, selected_region, eval_region, transform_fn = None):
         return (code, ns, forms)
 
 
-    def eval(self, view, sel, transform_fn = None, on_finish_callback = None):
+    def eval(self, view, sel, transform_fn = None, on_finish = None):
         """
         Eval code and call `cs_eval.on_success(id, value)` or `cs_eval.on_exception(id, value, trace)`
         """
         for selected_region in sel:
             eval_region = self.eval_region(selected_region, view)
-            eval = cs_eval.Eval(view, eval_region, on_finish_callback=on_finish_callback)
+            eval = cs_eval.Eval(view, eval_region, on_finish = on_finish)
             (line, column) = view.rowcol_utf16(eval_region.begin())
             line = line + 1
 

cs_conn_socket_repl.py

@@ -84,7 +84,7 @@ def eval_impl(self, form):
         msg += '}'
         self.send(msg)
 
-    def eval(self, view, sel, transform_fn = None, on_finish_callback = None):
+    def eval(self, view, sel, transform_fn = None, on_finish = None):
         cs_warn.reset_warnings(self.window)
         for selected_region in sel:
             # find regions to eval
@@ -98,7 +98,7 @@ def eval(self, view, sel, transform_fn = None, on_finish_callback = None):
             batch_id = cs_eval.Eval.next_id()
             for idx, form in enumerate(forms):
                 region = sublime.Region(start + form.start, start + form.end)
-                eval = cs_eval.Eval(view, region, id = f'{batch_id}.{idx}', batch_id = batch_id, on_finish_callback=on_finish_callback)
+                eval = cs_eval.Eval(view, region, id = f'{batch_id}.{idx}', batch_id = batch_id, on_finish=on_finish)
 
             # send msg
             (line, column) = view.rowcol_utf16(eval_region.begin())

cs_eval.py

@@ -29,7 +29,7 @@ def next_id():
         Eval.last_id += 1
         return Eval.last_id
 
-    def __init__(self, view, region, id = None, batch_id = None, on_finish_callback = None):
+    def __init__(self, view, region, id = None, batch_id = None, on_finish = None):
         extended_region = view.line(region)
         erase_evals(lambda eval: eval.region() and eval.region().intersects(extended_region), view)
 
@@ -46,7 +46,7 @@ def __init__(self, view, region, id = None, batch_id = None, on_finish_callback
         self.trace = None
         self.phantom_id = None
         self.value = None
-        self.on_finish_callback = on_finish_callback
+        self.on_finish = on_finish
 
         evals[id] = self
         evals_by_view[view.id()][id] = self
@@ -224,8 +224,8 @@ def on_success(id, value, time = None):
         failure = re.search(r":fail\s+[1-9]\d*", value) \
                or re.search(r":error\s+[1-9]\d*", value)
         eval.update("failure" if failure else "success", value, time_taken = time)
-        if on_finish_callback := eval.on_finish_callback:
-            on_finish_callback(eval)
+        if eval.on_finish:
+            eval.on_finish(eval)
 
 def on_exception(id, value, source = None, line = None, column = None, trace = None):
     """
@@ -237,8 +237,8 @@ def on_exception(id, value, source = None, line = None, column = None, trace = N
         eval.ex_column = column
         eval.trace = trace
         eval.update('exception', value)
-        if on_finish_callback := eval.on_finish_callback:
-            on_finish_callback(eval)
+        if eval.on_finish:
+            eval.on_finish(eval)
 
 def on_done(id):
     if (eval := by_id(id)):

cs_eval_status.py

@@ -22,7 +22,7 @@ def __init__(self, code, id = None, batch_id = None):
         self.ex_line   = None
         self.ex_column = None
         self.trace     = None
-        self.on_finish_callback = None
+        self.on_finish = None
 
         state.status_eval = self