actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2024-11-25 02:20:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Change column number to 1-based index

Browse source
This commit is contained in:
SeongChan Lee 2022-04-27 11:42:53 +09:00
parent 4ad2f49190
commit f2de431701
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -181,7 +181,8 @@ fn print_long_correction(msg: &Typo, palette: Palette) -> Result<(), std::io::Er
let line = String::from_utf8_lossy(msg.buffer.as_ref()); let line = String::from_utf8_lossy(msg.buffer.as_ref());
let line = line.replace('\t', " "); let line = line.replace('\t', " ");
let start = String::from_utf8_lossy(&msg.buffer[0..msg.byte_offset]); let start = String::from_utf8_lossy(&msg.buffer[0..msg.byte_offset]);
let column = unicode_segmentation::UnicodeSegmentation::graphemes(start.as_ref(), true).count(); let column_number =
unicode_segmentation::UnicodeSegmentation::graphemes(start.as_ref(), true).count() + 1;
match &msg.corrections { match &msg.corrections {
typos::Status::Valid => {} typos::Status::Valid => {}
typos::Status::Invalid => { typos::Status::Invalid => {
@ -213,7 +214,7 @@ fn print_long_correction(msg: &Typo, palette: Palette) -> Result<(), std::io::Er
" --> {}{}{}", " --> {}{}{}",
palette.info.paint(context_display(&msg.context)), palette.info.paint(context_display(&msg.context)),
palette.info.paint(divider), palette.info.paint(divider),
palette.info.paint(column) palette.info.paint(column_number)
)?; )?;
if let Some(Context::File(context)) = &msg.context { if let Some(Context::File(context)) = &msg.context {

10
tests/cmd/stdin-failure-multiwidth.stdout
View file

@ -1,29 +1,29 @@
error: `Apropriate` should be `Appropriate` error: `Apropriate` should be `Appropriate`
--> -:5:2 --> -:5:3
| |
5 | 한 Apropriate world 5 | 한 Apropriate world
| ^^^^^^^^^^ | ^^^^^^^^^^
| |
error: `Apropriate` should be `Appropriate` error: `Apropriate` should be `Appropriate`
--> -:12:2 --> -:12:3
| |
12 | 한 Apropriate world 12 | 한 Apropriate world
| ^^^^^^^^^^ | ^^^^^^^^^^
| |
error: `Apropriate` should be `Appropriate` error: `Apropriate` should be `Appropriate`
--> -:19:2 --> -:19:3
| |
19 | 👁️‍🗨️ Apropriate world 19 | 👁️‍🗨️ Apropriate world
| ^^^^^^^^^^ | ^^^^^^^^^^
| |
error: `Apropriate` should be `Appropriate` error: `Apropriate` should be `Appropriate`
--> -:26:2 --> -:26:3
| |
26 | 😵‍💫 Apropriate world 26 | 😵‍💫 Apropriate world
| ^^^^^^^^^^ | ^^^^^^^^^^
| |
error: `Apropriate` should be `Appropriate` error: `Apropriate` should be `Appropriate`
--> -:33:1 --> -:33:2
| |
33 | Apropriate world 33 | Apropriate world
| ^^^^^^^^^^ | ^^^^^^^^^^