actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2024-12-22 15:42:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix misalignment in report highlight and indent

Browse source 
Previous method misaligns highlights when there are double width asian characters
```
39 |  한글 eglish
   |    ^^^^^^
```
This commit fixes the highlight to have correct alignment.
```
39 |  한글 eglish
   |      ^^^^^^
```
`unicode-rs` crate is used by the Rust compiler [1].
[1]: 34a6c9f26e/compiler/rustc_errors/src/emitter.rs (L861)
This commit is contained in:
SeongChan Lee 2022-04-25 11:43:42 +09:00
parent 7d3e9bb070
commit e096eb2095
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1576,6 +1576,7 @@ dependencies = [
"typos-vars",
"unicase",
"unicode-segmentation",
"unicode-width",
"varcon-core",
"yansi",
]

1
Cargo.toml
View file

@ -91,6 +91,7 @@ encoding = "0.2"
kstring = { version = "2.0.0", features = ["serde"] }
typed-arena = "2.0.1"
maplit = "1.0"
unicode-width = "0.1.9"
[dev-dependencies]
assert_fs = "1.0"

9
src/bin/typos-cli/report.rs
View file

@ -3,6 +3,8 @@
use std::io::{self, Write};
use std::sync::atomic;
use unicode_width::UnicodeWidthStr;
use typos_cli::report::{Context, Message, Report, Typo};
#[derive(Copy, Clone, Debug)]
@ -218,8 +220,11 @@ fn print_long_correction(msg: &Typo, palette: Palette) -> Result<(), std::io::Er
let line_num = context.line_num.to_string();
let line_indent: String = itertools::repeat_n(" ", line_num.len()).collect();
let hl_indent: String = itertools::repeat_n(" ", column).collect();
let hl: String = itertools::repeat_n("^", msg.typo.len()).collect();
let visible_column = UnicodeWidthStr::width(start.as_ref());
let visible_len = UnicodeWidthStr::width(msg.typo);
let hl_indent: String = itertools::repeat_n(" ", visible_column).collect();
let hl: String = itertools::repeat_n("^", visible_len).collect();
writeln!(handle, "{} |", line_indent)?;
writeln!(