-
Notifications
You must be signed in to change notification settings - Fork 402
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Move tabs logic into utils * Re-use buffer returned by tabs::expand * Add TabCfg to configure tabs Use the String from this config for the tab replacement. This avoids creating a new String for each processed line. * Avoid unicode segmentation for each line just to remove a prefix In some code paths no prefix is removed, and in almost all other cases the prefix is just ascii. This simplifies a lot of calls. * Set default tab with to 8 Editors like vim, emacs, nano and most terminal emulators set this value as the default tab display width.
- Loading branch information
Showing
8 changed files
with
88 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| use unicode_segmentation::UnicodeSegmentation; | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub struct TabCfg { | ||
| replacement: String, | ||
| } | ||
|
|
||
| impl TabCfg { | ||
| pub fn new(width: usize) -> Self { | ||
| TabCfg { | ||
| replacement: " ".repeat(width), | ||
| } | ||
| } | ||
| pub fn width(&self) -> usize { | ||
| self.replacement.len() | ||
| } | ||
| pub fn replace(&self) -> bool { | ||
| !self.replacement.is_empty() | ||
| } | ||
| } | ||
|
|
||
| /// Expand tabs as spaces. | ||
| pub fn expand(line: &str, tab_cfg: &TabCfg) -> String { | ||
| if tab_cfg.replace() && line.as_bytes().iter().any(|c| *c == b'\t') { | ||
| itertools::join(line.split('\t'), &tab_cfg.replacement) | ||
| } else { | ||
| line.to_string() | ||
| } | ||
| } | ||
|
|
||
| /// Remove `prefix` chars from `line`, then call `tabs::expand()`. | ||
| pub fn remove_prefix_and_expand(prefix: usize, line: &str, tab_cfg: &TabCfg) -> String { | ||
| let line_bytes = line.as_bytes(); | ||
| // The to-be-removed prefixes are almost always ascii +/- (or ++/ +/.. for merges) for | ||
| // which grapheme clusters are not required. | ||
| if line_bytes.len() >= prefix && line_bytes[..prefix].is_ascii() { | ||
| // Safety: slicing into the utf-8 line-str is ok, upto `prefix` only ascii was present. | ||
| expand(&line[prefix..], tab_cfg) | ||
| } else { | ||
| let cut_line = line.graphemes(true).skip(prefix).collect::<String>(); | ||
| expand(&cut_line, tab_cfg) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| pub mod tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn test_remove_prefix_and_expand() { | ||
| let line = "+-foo\tbar"; | ||
| let result = remove_prefix_and_expand(2, line, &TabCfg::new(3)); | ||
| assert_eq!(result, "foo bar"); | ||
| let result = remove_prefix_and_expand(2, line, &TabCfg::new(0)); | ||
| assert_eq!(result, "foo\tbar"); | ||
|
|
||
| let utf8_prefix = "-│-foo\tbar"; | ||
| let n = 3; | ||
| let result = remove_prefix_and_expand(n, utf8_prefix, &TabCfg::new(1)); | ||
| assert_eq!(result, "foo bar"); | ||
| // ensure non-ascii chars were removed: | ||
| assert!(utf8_prefix.len() - result.len() > n); | ||
| } | ||
| } |