From 982d010be5fdb1cff471978634f8ff374deba9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 10 Oct 2020 11:47:09 +0200
Subject: [PATCH] lib: fix fmt removing ESC characters in theme and plugin list
 CLI commands

---
 lib/cli.zsh | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 5d6c31aef..c9ee159bc 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -134,18 +134,20 @@ function _omz::plugin::list {
     custom_plugins=("$ZSH_CUSTOM"/plugins/*(/N:t))
     builtin_plugins=("$ZSH"/plugins/*(/N:t))
 
-    (( ${#custom_plugins} )) && {
-        print -Pn "%U%BCustom plugins%b%u: "
-        print -l ${(q-)custom_plugins}
-    } | fmt -w $COLUMNS
+    {
+        (( ${#custom_plugins} )) && {
+            print -Pn "%U%BCustom plugins%b%u: "
+            print -l ${(q-)custom_plugins}
+        }
 
-    (( ${#builtin_plugins} )) && {
-        # add a line of separation
-        (( ${#custom_plugins} )) && echo
+        (( ${#builtin_plugins} )) && {
+            # add a line of separation
+            (( ${#custom_plugins} )) && echo
 
-        print -Pn "%U%BBuilt-in plugins%b%u: "
-        print -l ${(q-)builtin_plugins}
-    } | fmt -w $COLUMNS
+            print -Pn "%U%BBuilt-in plugins%b%u: "
+            print -l ${(q-)builtin_plugins}
+        }
+    } | fmt -w $COLUMNS | sed -E $'s/\e?(\\[[0-9]*m)/\e\\1/g' # deal with fmt removing ESC
 }
 
 function _omz::pr {
@@ -305,18 +307,20 @@ function _omz::theme::list {
     custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
     builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
 
-    (( ${#custom_themes} )) && {
-        print -Pn "%U%BCustom themes%b%u: "
-        print -l ${(q-)custom_themes}
-    } | fmt -w $COLUMNS
+    {
+        (( ${#custom_themes} )) && {
+            print -Pn "%U%BCustom themes%b%u: "
+            print -l ${(q-)custom_themes}
+        }
 
-    (( ${#builtin_themes} )) && {
-        # add a line of separation
-        (( ${#custom_themes} )) && echo
+        (( ${#builtin_themes} )) && {
+            # add a line of separation
+            (( ${#custom_themes} )) && echo
 
-        print -Pn "%U%BBuilt-in themes%b%u: "
-        print -l ${(q-)builtin_themes}
-    } | fmt -w $COLUMNS
+            print -Pn "%U%BBuilt-in themes%b%u: "
+            print -l ${(q-)builtin_themes}
+        }
+    } | fmt -w $COLUMNS | sed -E $'s/\e?(\\[[0-9]*m)/\e\\1/g' # deal with fmt removing ESC
 }
 
 function _omz::theme::use {