Reworking coloring logic for repl and CLI interface.

This commit is contained in:
Calvin Rose
2026-01-10 13:15:46 -06:00
parent 70fb13eb48
commit 10954fe0d7
2 changed files with 13 additions and 8 deletions
+13 -7
View File
@@ -3093,7 +3093,7 @@
(os/exit 1))
(put env :exit true)
(def buf @"")
(with-dyns [*err* buf *err-color* false]
(with-dyns [*err* buf]
(bad-parse x y))
(set exit-error (string/slice buf 0 -2)))
(defn bc [&opt x y z a b]
@@ -3102,7 +3102,7 @@
(os/exit 1))
(put env :exit true)
(def buf @"")
(with-dyns [*err* buf *err-color* false]
(with-dyns [*err* buf]
(bad-compile x nil z a b))
(set exit-error (string/slice buf 0 -2))
(set exit-fiber y))
@@ -4837,6 +4837,9 @@
(put env *args* subargs)
(put env *lint-error* error-level)
(put env *lint-warn* warn-level)
(put env *pretty-format* (if colorize "%.20Q" "%.20q"))
(put env *err-color* (if colorize true))
(put env *doc-color* (if colorize true))
(when debug-flag
(put env *debug* true)
(put env *redef* true))
@@ -4846,6 +4849,9 @@
(put env *args* subargs)
(put env *lint-error* error-level)
(put env *lint-warn* warn-level)
(put env *pretty-format* (if colorize "%.20Q" "%.20q"))
(put env *err-color* (if colorize true))
(put env *doc-color* (if colorize true))
(when debug-flag
(put env *debug* true)
(put env *redef* true))
@@ -4878,11 +4884,11 @@
(def getter (if raw-stdin getstdin getline))
(defn getchunk [buf p]
(getter (getprompt p) buf env))
(setdyn *pretty-format* (if colorize "%.20Q" "%.20q"))
(setdyn *err-color* (if colorize true))
(setdyn *doc-color* (if colorize true))
(setdyn *lint-error* error-level)
(setdyn *lint-warn* warn-level)
(put env *pretty-format* (if colorize "%.20Q" "%.20q"))
(put env *err-color* (if colorize true))
(put env *doc-color* (if colorize true))
(put env *lint-error* error-level)
(put env *lint-warn* warn-level)
(when-let [profile.janet (dyn *profilepath*)]
(dofile profile.janet :exit true :env env)
(put env *current-file* nil))
-1
View File
@@ -76,4 +76,3 @@
10)
(end-suite)