Compute ArgKind::Other width from text.chars().count() not text.len() (#450)

* Compute `ArgKind::Other` width from `text.chars().count()` not `text.len()`

* Keep trailing empty line

Author: DavisVaughan

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 # Development version
 
+- Fixed an issue with Unicode elements and table alignment (#449).
+
+
 # 0.8.0
 
 - Added support for table formatting of `tribble()` and `fcase()` calls (#113).

crates/air_r_formatter/src/r/auxiliary/call_arguments_table.rs

@@ -491,7 +491,13 @@ impl ArgKind {
                 Some(frac_len) => *integer_width + DOT_WIDTH + *frac_len,
                 None => *integer_width,
             },
-            ArgKind::Other { text } => text.len(),
+            ArgKind::Other { text } => {
+                // Unlike with integers and decimals, can't use `text.len()` here in case
+                // Unicode characters are involved. `len()` counts bytes, but we want to
+                // align based on the number of characters that visibly show up in a
+                // user's editor (#449).
+                text.chars().count()
+            }
         }
     }
 }

crates/air_r_formatter/tests/specs/r/call_table.R

@@ -407,3 +407,16 @@ list(
   # comment
   foo = 1, 2, 3
 )
+
+# ------------------------------------------------------------------------
+# Unicode
+
+# Width of strings count the number of `chars()` (#449)
+# fmt: table
+tribble(
+  ~col1, ~col2,
+  "A (Mio. €)", 10,
+  "B (T €)", 20,
+  "C §", 10,
+  "ascii", 10,
+)

crates/air_r_formatter/tests/specs/r/call_table.R.snap

@@ -415,6 +415,19 @@ list(
   foo = 1, 2, 3
 )
 
+# ------------------------------------------------------------------------
+# Unicode
+
+# Width of strings count the number of `chars()` (#449)
+# fmt: table
+tribble(
+  ~col1, ~col2,
+  "A (Mio. €)", 10,
+  "B (T €)", 20,
+  "C §", 10,
+  "ascii", 10,
+)
+
 ```
 
 
@@ -848,6 +861,19 @@ list(
   2,
   3
 )
+
+# ------------------------------------------------------------------------
+# Unicode
+
+# Width of strings count the number of `chars()` (#449)
+# fmt: table
+tribble(
+  ~col1        , ~col2 ,
+  "A (Mio. €)" ,    10 ,
+  "B (T €)"    ,    20 ,
+  "C §"        ,    10 ,
+  "ascii"      ,    10 ,
+)
 ```