fix unicode-width version to 0.1.13

lsd-rs · Aug 20, 2024 · b0d55bb · b0d55bb
1 parent 5918660
commit b0d55bb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,7 +36,7 @@ once_cell = "1.17.1"
 chrono = { version = "0.4.19", features = ["unstable-locales"] }
 chrono-humanize = "0.2"
 # unicode-width 0.1.13 has a breaking change so stick to 0.1.11
-unicode-width = "=0.1.11"
+unicode-width = "0.1.13"
 lscolors = "0.16.0"
 wild = "2.0"
 globset = "0.4.*"

diff --git a/src/display.rs b/src/display.rs
@@ -439,7 +439,8 @@ fn get_visible_width(input: &str, hyperlink: bool) -> usize {
 
         let m_pos = s.find('m');
         if let Some(len) = m_pos {
-            nb_invisible_char += len
+            // len points to the 'm' character, we must include 'm' to invisible characters
+            nb_invisible_char += len + 1;
         }
     }
 
@@ -449,7 +450,8 @@ fn get_visible_width(input: &str, hyperlink: bool) -> usize {
 
             let m_pos = s.find("\x1B\x5C");
             if let Some(len) = m_pos {
-                nb_invisible_char += len
+                // len points to the '\x1B' character, we must include both '\x1B' and '\x5C' to invisible characters
+                nb_invisible_char += len + 2
             }
         }
     }