Solarized compatibility, use faint instead of bright black for secondary text

Author: JarrodCTaylor

client/src/clojure_cli/repl/client.clj

@@ -182,7 +182,7 @@
         (when-let [code (reader/form-at-cursor (.toString buf) (.cursor buf))]
           (let [{:keys [value err]} (api/eval-code code)]
             (api/print-above [{:text (str "=> " (or value err) "\n")
-                               :style {:fg :bright-black}}])))))))
+                               :style {:faint true}}])))))))
 
 (defn doc-preview [text cap]
   (let [lines (str/split-lines text)]
@@ -197,7 +197,7 @@
         text (str/trim-newline (or doc ""))]
     (reset! doc-view {:token token :text text})
     (api/show-below [{:text (doc-preview text (quot (api/terminal-height) 4))
-                      :style {:fg :bright-black}}])))
+                      :style {:faint true}}])))
 
 (defn doc-at-cursor
   "Widget previewing the doc for the token at the cursor.
@@ -244,7 +244,7 @@
                (str "…" (subs path (inc (- (count path) path-width))))
                path)]
     [{:text path :style {:fg :cyan :bold true}}
-     {:text (str gap info) :style {:fg :bright-black}}]))
+     {:text (str gap info) :style {:faint true}}]))
 
 (defn body-rows [{:keys [leaf entries]} cursor]
   (if leaf
@@ -254,7 +254,7 @@
 (defn inspector-lines [{:keys [path info header] :as view} cursor cols footer]
   (let [head [(breadcrumb path info cols) [{:text header :style {:bold true}}]]
         body (body-rows view cursor)
-        tail [[{:text ""}] [{:text (or footer (footer-text view)) :style {:fg :bright-black}}]]
+        tail [[{:text ""}] [{:text (or footer (footer-text view)) :style {:faint true}}]]
         rows (reduce into [head body tail])]
     (mapv #(clamped-line cols %) rows)))
 
@@ -390,7 +390,7 @@
 (defn print-echo [{:keys [code column] ns-name :ns} prompt-fn]
   (let [prompt (prompt-in prompt-fn ns-name)
         width (.columnLength ^AttributedString (last (.columnSplitLength (color/build-attrib-str prompt) Integer/MAX_VALUE)))]
-    (api/print-above (conj prompt {:text (align code (or column 1) width) :style {:fg :bright-black}}))))
+    (api/print-above (conj prompt {:text (align code (or column 1) width) :style {:faint true}}))))
 
 (defn refresh-prompt [response ^LineReaderImpl rdr prompt-fn libspecs follow-ns?]
   (reset! api/last-response response)

client/src/clojure_cli/repl/color.clj

@@ -30,13 +30,14 @@
 (defn build-style
   "Build a JLine AttributedStyle from a style map, nil values yield the default style."
   [style-map]
-  (let [{:keys [fg bg bold italic underline inverse]} style-map
+  (let [{:keys [fg bg bold faint italic underline inverse]} style-map
         fg-code (color-code fg)
         bg-code (color-code bg)]
     (cond-> AttributedStyle/DEFAULT
       fg-code   (.foreground fg-code)
       bg-code   (.background bg-code)
       bold      (.bold)
+      faint     (.faint)
       italic    (.italic)
       underline (.underline)
       inverse   (.inverse))))

doc/prompts.md

@@ -23,7 +23,7 @@ A segment is a map of `:text` and an optional `:style`:
    {:text " => "}])
 ```
 
-Style keys: `:fg`, `:bg`, `:bold`, `:italic`, `:underline`, and `:inverse`.
+Style keys: `:fg`, `:bg`, `:bold`, `:faint`, `:italic`, `:underline`, and `:inverse`.
 Colors: `:black`, `:red`, `:green`, `:yellow`, `:blue`, `:magenta`, `:cyan`, `:white`,
 and their `:bright-*` variants or an xterm 256 value (0-255).
 

examples/.cljconf/org.clojure/clojure-cli.repl/src/dev/full_width_prompt.clj

@@ -17,7 +17,7 @@
   {:retro {:ns {:fg :bright-white :bg :blue}
            :ok {:fg :black :bg :green}
            :err {:fg :bright-white :bg :red}
-           :time {:fg :bright-white :bg :bright-black}
+           :time {:fg :black :bg :yellow}
            :heap {:fg :black :bg :cyan}
            :clock {:fg :bright-white :bg :magenta}
            :arrow {:fg :bright-green}}