3.2.1 Socket: Report number of reflection warnings in status bar

Author: tonsky

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 3.2.1 - Sep 10, 2023
+
+- Socket: Report number of reflection warnings in status bar
+
 ### 3.2.0 - Sep 10, 2023
 
 - Socket REPL: handle exceptions in lookup

cs_conn.py

@@ -1,5 +1,5 @@
 import os, re, sublime, sublime_plugin
-from . import cs_common, cs_eval, cs_eval_status, cs_parser
+from . import cs_common, cs_eval, cs_eval_status, cs_parser, cs_warn
 
 # Global connection instance
 conn = None
@@ -114,6 +114,7 @@ def disconnect(self):
         conn = None
         cs_common.set_status(status_key, None)
         cs_eval.erase_evals()
+        cs_warn.reset_warnings()
 
     def set_status(self, phase, message, *args):
         status = phases[phase] + ' ' + message.format(*args)

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_eval_status, cs_parser
+from . import cs_common, cs_conn, cs_eval, cs_eval_status, cs_parser, cs_warn
 
 def lines(socket):
     buffer = b''
@@ -82,6 +82,7 @@ def eval_impl(self, form):
         self.send(msg)
 
     def eval(self, view, sel):
+        cs_warn.reset_warnings()
         for region in sel:
             # find regions to eval
             if region.empty():
@@ -113,6 +114,7 @@ def eval(self, view, sel):
             self.eval_impl(form)
 
     def eval_status(self, code, ns):
+        cs_warn.reset_warnings()
         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)
@@ -164,12 +166,19 @@ def handle_lookup(self, msg):
             cs_eval.on_lookup(id, val)
             return True
 
+    def handle_err(self, msg):
+        if 'err' == msg['tag']:
+            if msg['val'].startswith("Reflection warning"):
+                cs_warn.add_warning()
+            return True
+
     def handle_msg(self, msg):
         # cs_common.debug('MSG {}', msg)
         self.handle_value(msg) \
         or self.handle_exception(msg) \
         or self.handle_done(msg) \
-        or self.handle_lookup(msg)
+        or self.handle_lookup(msg) \
+        or self.handle_err(msg)
 
 class ClojureSublimedConnectSocketReplCommand(sublime_plugin.ApplicationCommand):
     def run(self, address):

cs_warn.py

@@ -0,0 +1,16 @@
+import sublime, sublime_plugin
+from . import cs_common
+
+status_key = 'clojure-sublimed-warn-status'
+warnings = 0
+
+def add_warning():
+    global warnings
+    warnings += 1
+    suffix = 's' if warnings > 0 else ''
+    cs_common.set_status(status_key, f'⚠️ {warnings} warning{suffix}')
+
+def reset_warnings():
+    global warnings
+    warnings = 0
+    cs_common.set_status(status_key, None)

src_clojure/clojure_sublimed/core.clj

@@ -4,7 +4,7 @@
     [clojure.string :as str])
   (:import
     [clojure.lang Compiler Compiler$CompilerException ExceptionInfo LispReader$ReaderException]
-    [java.io Writer]))
+    [java.io BufferedWriter OutputStream OutputStreamWriter PrintWriter Writer]))
 
 (def ^:dynamic *print-quota*
   1024)
@@ -33,7 +33,7 @@
         ([x off len]
          (locking total
            (let [cbuf (to-char-array x)
-                 rem (- quota @total)]
+                 rem  (- quota @total)]
              (vswap! total + len)
              (.write writer cbuf ^int off ^int (min len rem))
              (when (neg? (- rem len))
@@ -54,6 +54,28 @@
           (str writer "...")
           (throw e))))))
 
+(defn duplicate-writer ^Writer [^Writer writer tag out-fn]
+  (let [sb    (StringBuffer.)
+        proxy (proxy [Writer] []
+                (flush []
+                  (.flush writer)
+                  (let [len (.length sb)]
+                    (when (pos? len)
+                      (out-fn {"tag" tag, "val" (str sb)})
+                      (.delete sb 0 len))))
+                (close []
+                  (.close writer))
+                (write
+                  ([x]
+                   (let [cbuf (to-char-array x)]
+                     (.write writer cbuf)
+                     (.append sb cbuf)))
+                  ([x off len]
+                   (let [cbuf (to-char-array x)]
+                     (.write writer cbuf ^int off ^int len)
+                     (.append sb cbuf ^int off ^int len)))))]
+    (PrintWriter. proxy true)))
+
 ;; CompilerException has location info, but its cause RuntimeException has the message ¯\_(ツ)_/¯
 (defn root-cause [^Throwable t]
   (loop [t t

src_clojure/clojure_sublimed/socket_repl.clj

@@ -3,7 +3,7 @@
     [clojure.string :as str]
     [clojure-sublimed.core :as core])
   (:import
-    [java.io Reader StringReader]
+    [java.io FilterWriter Reader StringReader Writer]
     [java.lang.reflect Field]
     [clojure.lang Compiler Compiler$CompilerException LineNumberingPushbackReader LispReader LispReader$ReaderException RT]))
 
@@ -197,33 +197,35 @@
 (defn out-fn [out]
   (let [lock (Object.)]
     #(locking lock
-       (binding [*out* out]
+       (binding [*out*            out
+                 *print-readably* true]
          (prn (merge (some-> *context* deref) %))))))
 
 (defn repl []
-  (binding [*out-fn* (out-fn *out*)
-            *out*    (.getRawRoot #'*out*)
-            *err*    (.getRawRoot #'*err*)
-            core/*changed-vars (atom {})]
-    (*out-fn* {"tag" "started"})
-    (loop []
-      (when
-        (binding [*context* (volatile! {})]
-          (try
-            (let [form (read-command *in*)]
-              (core/set-changed-vars!)
-              (when-some [id (form "id")]
-                (vswap! *context* assoc "id" id))
-              (case (get form "op")
-                "eval"      (fork-eval form)
-                "interrupt" (interrupt form)
-                "lookup"    (lookup-symbol form)
-                (throw (Exception. (str "Unknown op: " (get form "op")))))
-              true)
-            (catch Throwable t
-              (when-not (-> t ex-data ::stop)
-                (report-throwable t)
-                true))))
-        (recur)))
-    (doseq [[id f] @*evals]
-      (future-cancel f))))
+  (let [out-fn (out-fn *out*)]
+    (binding [*out-fn* out-fn
+              *out*    (core/duplicate-writer (.getRawRoot #'*out*) "out" out-fn)
+              *err*    (core/duplicate-writer (.getRawRoot #'*err*) "err" out-fn)
+              core/*changed-vars (atom {})]
+      (out-fn {"tag" "started"})
+      (loop []
+        (when
+          (binding [*context* (volatile! {})]
+            (try
+              (let [form (read-command *in*)]
+                (core/set-changed-vars!)
+                (when-some [id (form "id")]
+                  (vswap! *context* assoc "id" id))
+                (case (get form "op")
+                  "eval"      (fork-eval form)
+                  "interrupt" (interrupt form)
+                  "lookup"    (lookup-symbol form)
+                  (throw (Exception. (str "Unknown op: " (get form "op")))))
+                true)
+              (catch Throwable t
+                (when-not (-> t ex-data ::stop)
+                  (report-throwable t)
+                  true))))
+          (recur)))
+      (doseq [[id f] @*evals]
+        (future-cancel f)))))