Correctly calculate character widths (#820)

denisidoro · Apr 8, 2023 · 8963749 · 8963749 · lacygoill · Apr 9, 2023
1 parent 2b03c89
commit 8963749
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,6 +35,7 @@ serde = { version = "1.0.159", features = ["derive"] }
 serde_yaml = "0.9.21"
 dns_common_derive = { version = "0.2.1" }
 dns_common = { version = "0.2.1", default-features = false, features = ["yaml", "json"] }
+unicode-width = "0.1.10"
 
 [lib]
 name = "navi"

diff --git a/src/deser/mod.rs b/src/deser/mod.rs
@@ -1,4 +1,5 @@
 use crate::prelude::*;
+use unicode_width::UnicodeWidthStr;
 
 pub mod raycast;
 pub mod terminal;
@@ -26,9 +27,18 @@ pub fn fix_newlines(txt: &str) -> String {
 }
 
 fn limit_str(text: &str, length: usize) -> String {
-    if text.len() > length {
-        format!("{}…", text.chars().take(length - 1).collect::<String>())
+    let len = UnicodeWidthStr::width(text);
+    if len <= length {
+        format!("{}{}", text, " ".repeat(length - len))
     } else {
-        format!("{:width$}", text, width = length)
+        let mut new_length = length;
+        let mut actual_length = 9999;
+        let mut txt = text.to_owned();
+        while actual_length > length {
+            txt = txt.chars().take(new_length - 1).collect::<String>();
+            actual_length = UnicodeWidthStr::width(txt.as_str());
+            new_length -= 1;
+        }
+        format!("{}…", txt)
     }
 }