Skip to content

Commit f7004dd

Browse files
committed
builtin/repo: fix table alignment for UTF-8 characters
The output table from "git repo structure" is misaligned when displaying UTF-8 characters (e.g., non-ASCII glyphs). E.g.: | 仓库结构 | 值 | | -------------- | ---- | | * 引用 | | | * 计数 | 67 | The previous implementation used simple width formatting with printf() which didn't properly handle multi-byte UTF-8 characters, causing misaligned table columns when displaying repository structure information. This change modifies the stats_table_print_structure function to use strbuf_utf8_align() instead of basic printf width specifiers. This ensures proper column alignment regardless of the character encoding of the content being displayed. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
1 parent 9a1381f commit f7004dd

File tree

2 files changed

+50
-4
lines changed

2 files changed

+50
-4
lines changed

builtin/repo.c

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,14 +292,20 @@ static void stats_table_print_structure(const struct stats_table *table)
292292
int name_col_width = utf8_strwidth(name_col_title);
293293
int value_col_width = utf8_strwidth(value_col_title);
294294
struct string_list_item *item;
295+
struct strbuf buf = STRBUF_INIT;
295296

296297
if (table->name_col_width > name_col_width)
297298
name_col_width = table->name_col_width;
298299
if (table->value_col_width > value_col_width)
299300
value_col_width = table->value_col_width;
300301

301-
printf("| %-*s | %-*s |\n", name_col_width, name_col_title,
302-
value_col_width, value_col_title);
302+
strbuf_addstr(&buf, "| ");
303+
strbuf_utf8_align(&buf, ALIGN_LEFT, name_col_width, name_col_title);
304+
strbuf_addstr(&buf, " | ");
305+
strbuf_utf8_align(&buf, ALIGN_LEFT, value_col_width, value_col_title);
306+
strbuf_addstr(&buf, " |");
307+
printf("%s\n", buf.buf);
308+
303309
printf("| ");
304310
for (int i = 0; i < name_col_width; i++)
305311
putchar('-');
@@ -317,9 +323,16 @@ static void stats_table_print_structure(const struct stats_table *table)
317323
value = entry->value;
318324
}
319325

320-
printf("| %-*s | %*s |\n", name_col_width, item->string,
321-
value_col_width, value);
326+
strbuf_reset(&buf);
327+
strbuf_addstr(&buf, "| ");
328+
strbuf_utf8_align(&buf, ALIGN_LEFT, name_col_width, item->string);
329+
strbuf_addstr(&buf, " | ");
330+
strbuf_utf8_align(&buf, ALIGN_RIGHT, value_col_width, value);
331+
strbuf_addstr(&buf, " |");
332+
printf("%s\n", buf.buf);
322333
}
334+
335+
strbuf_release(&buf);
323336
}
324337

325338
static void stats_table_clear(struct stats_table *table)

t/unit-tests/u-utf8-width.c

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,36 @@ void test_utf8_width__strnwidth_cjk_with_ansi(void)
9797
/* "Hello"(5) + "世界"(4) + "!"(1) = 10 */
9898
cl_assert_equal_i(10, width);
9999
}
100+
101+
/*
102+
* Test the strbuf_utf8_align function with CJK characters
103+
*/
104+
void test_utf8_width__strbuf_utf8_align(void)
105+
{
106+
struct strbuf buf = STRBUF_INIT;
107+
108+
/* Test left alignment with CJK */
109+
strbuf_utf8_align(&buf, ALIGN_LEFT, 10, "你好");
110+
/* Should be "你好 " (你好 + 8 spaces, but accounting for 2-char width per CJK) */
111+
/* Since "你好" is 4 display columns, we need 6 more spaces to reach 10 */
112+
cl_assert_equal_s("你好 ", buf.buf);
113+
strbuf_reset(&buf);
114+
115+
/* Test right alignment with CJK */
116+
strbuf_utf8_align(&buf, ALIGN_RIGHT, 8, "世界");
117+
/* "世界" is 4 display columns, so we need 4 leading spaces */
118+
cl_assert_equal_s(" 世界", buf.buf);
119+
strbuf_reset(&buf);
120+
121+
/* Test center alignment with CJK */
122+
strbuf_utf8_align(&buf, ALIGN_MIDDLE, 10, "中");
123+
/* "中" is 2 display columns, so (10-2)/2 = 4 spaces on left, 4 on right with 1 extra on right */
124+
cl_assert_equal_s(" 中 ", buf.buf);
125+
strbuf_reset(&buf);
126+
127+
/* Test alignment that is smaller than string width */
128+
strbuf_utf8_align(&buf, ALIGN_LEFT, 2, "你好");
129+
/* Since "你好" is 4 display columns, it should not be truncated */
130+
cl_assert_equal_s("你好", buf.buf);
131+
strbuf_release(&buf);
132+
}

0 commit comments

Comments
 (0)