Fix whitespace collapsed bug in io.aviso.ansi/compose

Fixes #86
clj-commons · May 24, 2023 · ff8e59c · ff8e59c
1 parent e7fcbde
commit ff8e59c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,15 @@
-## 1.4.1 -- 5 May 2023
+## 1.4.3 -- UNRELEASED
+
+The `compose` function would collapse blank strings to empty strings.
+
+[Closed Issues](https://github.com/AvisoNovate/pretty/milestone/33?closed=1)
+
+## 1.4.1, 1.4.2 -- 5 May 2023
 
 `io.aviso.ansi`: Add support for `faint`, `underlined`, and `not-underlined` text, and improvements
 to docstrings.
 
-[Closed issues](https://github.com/AvisoNovate/pretty/milestone/33?closed=1)
+[Closed issues](https://github.com/AvisoNovate/pretty/milestone/34?closed=1)
 
 ## 1.4 -- 27 Mar 2023
 

diff --git a/src/io/aviso/ansi.clj b/src/io/aviso/ansi.clj
@@ -245,7 +245,9 @@
 (defn- collect-markup
   [state input]
   (cond
-    (nil? input)
+    (or
+      (nil? input)
+      (= "" input))
     state
 
     (vector? input)
@@ -264,10 +266,6 @@
     (sequential? input)
     (reduce collect-markup state input)
 
-    (and (string? input)
-      (str/blank? input))
-    state
-
     :else
     (let [{:keys [active current]} state
           state' (if (= active current)

diff --git a/test/io/aviso/ansi_test.clj b/test/io/aviso/ansi_test.clj
@@ -31,6 +31,13 @@
     "Prefix-- 0 1 2 --Suffix[CSI]m"
 
 
+    ;; A bug caused blank strings to be omitted, this checks for the fix:
+    [" "
+     "|"
+     "  "
+     "|"
+     "   "] " |  |   [CSI]m"
+
     ["Notice: the "
      [:yellow "shields"]
      " are operating at "