From 33c87611dcd15dba6bde4c28c87f40bea82cbb57 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Thu, 8 Jul 2021 07:25:35 -0700 Subject: [PATCH] remove use of cluster cell idx in ls-fonts --- wezterm-gui/src/main.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wezterm-gui/src/main.rs b/wezterm-gui/src/main.rs index fe8da7144..50ae3861f 100644 --- a/wezterm-gui/src/main.rs +++ b/wezterm-gui/src/main.rs @@ -440,21 +440,21 @@ pub fn run_ls_fonts(config: config::ConfigHandle, cmd: &LsFontsCommand) -> anyho let infos = font.shape(&cluster.text, || {}, |_| {}).unwrap(); for info in infos { - let cell_idx = cluster.byte_to_cell_idx(info.cluster as usize); - let cells = &line.cells()[cell_idx..][..info.num_cells as usize]; - let text = cells.iter().map(|c| c.str()).collect::(); let parsed = &handles[info.font_idx]; - let escaped = format!("{}", text.escape_unicode()); + let escaped = format!("{}", cluster.text.escape_unicode()); if config.custom_block_glyphs { if let Some(block) = glyphcache::BlockKey::from_str(&text) { - println!("{:4} {:12} drawn by wezterm: {:?}", text, escaped, block); + println!( + "{:4} {:12} drawn by wezterm: {:?}", + cluster.text, escaped, block + ); continue; } } println!( "{:4} {:12} glyph={:<4} {}\n{:29}{}", - text, + cluster.text, escaped, info.glyph_pos, parsed.lua_name(),