sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

pull/315/head
Wilfred Hughes 2022-07-04 15:11:38 +07:00
parent 719654d462
commit d72251f9fa
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/diff/sliders.rs
Unescape Escape View File

@ -64,10 +64,9 @@ fn prefer_outer_delimiter(language: guess_language::Language) -> bool {
// languages have syntax like `foo(bar)` or `foo[bar]` where
// the inner delimiter is more relevant.
Bash | C | CPlusPlus | CSharp | Css | Dart | Elixir | Elm | Elvish | Gleam | Go
| Haskell | Html | Java | JavaScript | Jsx | Kotlin | Lua | Nix | OCaml | OCamlInterface
| Perl | Php | Python | Ruby | Rust | Scala | Swift | Tsx | TypeScript | Yaml | Zig => {
false
}
| Haskell | Html | Java | JavaScript | Jsx | Kotlin | Lua | Nix | OCaml
| OCamlInterface | Perl | Php | Python | Ruby | Rust | Scala | Swift | Tsx | TypeScript
| Yaml | Zig => false,
}
}

6
src/display/side_by_side.rs
Unescape Escape View File

@ -520,7 +520,8 @@ pub fn print(
display_options.use_color,
);
if let Some(line_num) = lhs_line_num {
if display_options.use_color && lhs_lines_with_novel.contains(line_num) {
if display_options.use_color && lhs_lines_with_novel.contains(line_num)
{
s = if display_options.background_color.is_dark() {
s.bright_red().to_string()
} else {
@ -541,7 +542,8 @@ pub fn print(
display_options.use_color,
);
if let Some(line_num) = rhs_line_num {
if display_options.use_color && rhs_lines_with_novel.contains(line_num) {
if display_options.use_color && rhs_lines_with_novel.contains(line_num)
{
s = if display_options.background_color.is_dark() {
s.bright_green().to_string()
} else {

28
src/display/style.rs
Unescape Escape View File

@ -10,7 +10,7 @@ use crate::{
use owo_colors::{OwoColorize, Style};
use rustc_hash::FxHashMap;
use std::cmp::{max, min};
use unicode_width::{UnicodeWidthStr, UnicodeWidthChar};
use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};
#[derive(Clone, Copy, Debug)]
pub enum BackgroundColor {
@ -32,18 +32,22 @@ fn substring_by_width(s: &str, start: usize, end: usize) -> &str {
assert!(end > start);
let mut idx_width_iter = s.char_indices()
let mut idx_width_iter = s
.char_indices()
.scan(0, |w, (idx, ch)| {
let before = *w;
*w += ch.width().unwrap_or(0);
Some((idx, before, *w))
let before = *w;
*w += ch.width().unwrap_or(0);
Some((idx, before, *w))
})
.skip_while(|(_, before, _)| *before < start);
let byte_start = idx_width_iter
.next()
.expect("Expected a width index inside `s`.")
.0;
match idx_width_iter.skip_while(|(_, _, after)| *after <= end).next() {
match idx_width_iter
.skip_while(|(_, _, after)| *after <= end)
.next()
{
Some(byte_end) => &s[byte_start..byte_end.0],
None => &s[byte_start..],
}
@ -69,21 +73,17 @@ fn split_string_by_width(s: &str, max_width: usize, pad: bool) -> Vec<(&str, usi
let l = substring_by_width(s, 0, max_width);
let used = l.width();
let padding = if pad && used < max_width {
// a fullwidth char is followed
1
// a fullwidth char is followed
1
} else {
0
0
};
res.push((l, padding));
s = substring_by_width(s, used, s.width());
}
if res.is_empty() || !s.is_empty() {
let padding = if pad {
max_width - s.width()
} else {
0
};
let padding = if pad { max_width - s.width() } else { 0 };
res.push((s, padding));
}