Support for multibyte string

uzimaru0000 · Aug 26, 2021 · 9b8b8b0 · 9b8b8b0
1 parent 3d0250b
commit 9b8b8b0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,3 +12,4 @@ csv = "1.1.6"
 serde = { version = "1.0.129", features = ["derive"] }
 serde_json = "1.0.66"
 tokio = { version = "1.10.1", features = ["full"] }
+unicode-width = "0.1.7"
diff --git a/src/data.rs b/src/data.rs
@@ -3,6 +3,8 @@ use std::{collections::HashMap, fmt::Display};
 use crate::utils::Transpose;
 use anyhow::{Context, Result};
 
+use unicode_width::UnicodeWidthStr;
+
 type Json<'a> = HashMap<&'a str, serde_json::Value>;
 
 #[derive(Debug)]
@@ -74,7 +76,7 @@ impl<'a> Data<'a> {
  .zip(keys)
  .map(|(mut xs, k)| {
  xs.push(&k);
- xs.into_iter().map(|x| x.len()).max().unwrap_or_default()
+ xs.into_iter().map(|x| x.width()).max().unwrap_or_default()
  })
  .collect::<Vec<_>>()
  }
@@ -108,7 +110,7 @@ impl<'a> Display for Data<'a> {
  xs
  .iter()
  .zip(pads.clone())
- .map(|(x, pad)| format!("{:>width$}", x, width = pad))
+ .map(|(x, pad)| format!("{}{}", " ".repeat(pad - x.width()), x))
  .collect::<Vec<_>>()
  .join("|")
  )

diff --git a/test.json b/test.json
@@ -1,6 +1,6 @@
 [
  {
- "name": "test",
+ "name": "テストテスト",
  "age": 10,
  "lang": "ja"
  },