Socket: Fixed status_eval, bind *1/*2/*3/*e for e.g. tools.namespace

Author: tonsky

cs_conn.py

@@ -1,5 +1,5 @@
 import os, re, sublime, sublime_plugin
-from . import cs_common, cs_eval, cs_parser
+from . import cs_common, cs_eval, cs_eval_status, cs_parser
 
 # Global connection instance
 conn = None
@@ -61,6 +61,11 @@ def eval(self, view, sel):
                     file   = view.file_name())
             self.eval_impl(form)
 
+    def eval_status(self, code, ns):
+        eval = cs_eval_status.StatusEval(code)
+        form = cs_common.Form(id = eval.id, code = code, ns = ns)
+        self.eval_impl(form)
+
     def load_file_impl(self, id, file, path):
         pass
 

cs_conn_socket_repl.py

@@ -1,5 +1,5 @@
 import json, os, re, sublime, sublime_plugin, threading
-from . import cs_common, cs_conn, cs_eval, cs_parser
+from . import cs_common, cs_conn, cs_eval, cs_eval_status, cs_parser
 
 def lines(socket):
     buffer = b''
@@ -63,6 +63,24 @@ def send(self, msg):
         cs_common.debug('SND {}', msg)
         self.socket.sendall(msg.encode())
 
+    def eval_impl(self, form):
+        msg = ('{' +
+              f'"id" {form.id}, ' +
+              f'"op" "eval", ' +
+              f'"code" "{form.code}", ' +
+              f'"ns" "{form.ns}"')
+        if form.file:
+            msg += f', "file" "{form.file}"'
+
+        if form.line is not None:
+            msg += f', "line" {form.line}'
+
+        if form.column is not None:
+            msg += f', "column" {form.column}'
+
+        msg += '}'
+        self.send(msg)
+
     def eval(self, view, sel):
         for region in sel:
             # find regions to eval
@@ -84,20 +102,21 @@ def eval(self, view, sel):
 
             # send msg
             (line, column) = view.rowcol_utf16(region.begin())
-            line = line + 1
-            code = view.substr(region).replace('\\', '\\\\').replace('"', '\\"')
-            ns     = cs_parser.namespace(view, region.begin()) or 'user'
-            file   = view.file_name()
-            msg = ('{' +
-              f'"id" {batch_id}, ' +
-              f'"op" "eval", ' +
-              f'"code" "{code}", ' +
-              f'"ns" "{ns}", ' +
-              f'"file" "{file}", ' +
-              f'"line" {line}, ' +
-              f'"column" {column}' +
-            '}')
-            self.send(msg)
+            form = cs_common.Form(
+                id   = batch_id,
+                code = view.substr(region).replace('\\', '\\\\').replace('"', '\\"'),
+                ns   = cs_parser.namespace(view, region.begin()) or 'user',
+                line = line + 1,
+                column = column,
+                file = view.file_name()
+            )
+            self.eval_impl(form)
+
+    def eval_status(self, code, ns):
+        batch_id = cs_eval.Eval.next_id()
+        eval = cs_eval_status.StatusEval(code, id = f'{batch_id}.0', batch_id = batch_id)
+        form = cs_common.Form(id = batch_id, code = code, ns = ns)
+        self.eval_impl(form)
 
     def load_file(self, view):
         self.eval(view, [sublime.Region(0, view.size())])

cs_eval_status.py

@@ -8,14 +8,13 @@ class StatusEval:
     """
     Displays 'eval_code' command results in status bar
     """
-    def __init__(self, code):
+    def __init__(self, code, id = None, batch_id = None):
         global status_eval
         if status_eval:
             status_eval.erase()
 
-        id            = cs_eval.Eval.next_id()
-        self.id       = id
-        self.batch_id = id
+        self.id       = id or cs_eval.Eval.next_id()
+        self.batch_id = batch_id or self.id
         self.code     = code
         self.session  = None
 
@@ -38,20 +37,18 @@ def update(self, status, value, time_taken = None):
                 value = time + ' ' + value
             cs_common.set_status(status_key, "❌ " + value)
 
-    def erase(self):
+    def erase(self, interrupt = True):
         global status_eval
         cs_common.set_status(status_key, None)
         status_eval = None
-        if self.status == "pending" and self.session:
+        if interrupt and self.status == "pending" and self.session:
             cs_conn.conn.interrupt(self.id)
 
 class ClojureSublimedEvalCodeCommand(sublime_plugin.ApplicationCommand):
-    def run(self, code, ns = None):        
-        eval = StatusEval(code)
-        if (not ns) and (view := eval.active_view()):
+    def run(self, code, ns = None):
+        if (not ns) and (view := cs_common.active_view()):
             ns = cs_parser.namespace(view, view.size())
-        form = cs_common.Form(id = eval.id, code = code, ns = ns or 'user')
-        cs_conn.conn.eval_impl(form)
+        cs_conn.conn.eval_status(code, ns or 'user')
 
     def is_enabled(self):
         if not cs_conn.ready():

src_clojure/clojure_sublimed/socket_repl.clj

@@ -97,7 +97,11 @@
                   Compiler/LINE_BEFORE    (.getLineNumber reader)
                   Compiler/COLUMN_BEFORE  (.getColumnNumber reader)
                   Compiler/LINE_AFTER     (.getLineNumber reader)
-                  Compiler/COLUMN_AFTER   (.getColumnNumber reader)})
+                  Compiler/COLUMN_AFTER   (.getColumnNumber reader)
+                  #'*e                    nil
+                  #'*1                    nil
+                  #'*2                    nil
+                  #'*3                    nil})
         ret    (try
                  (loop [idx 0]
                    (vswap! *context* assoc "idx" idx)

test_repl/forms.clj

@@ -27,7 +27,6 @@
 
 ; delayed eval
 (do (Thread/sleep 1400) :first)
-*e
 (do (Thread/sleep 1300) :second)
 (do (Thread/sleep 1200) :third)
 (do (Thread/sleep 1100) :fourth)