dandavison/delta
1
1
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2024-10-05 04:17:21 +03:00
Code Issues Projects Releases Wiki Activity

Rearrange

Browse Source
This commit is contained in:
Dan Davison 2019-07-12 22:59:50 -04:00
parent 07589712d4
commit 6f69778268
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/parse.rs
View File

@ -67,7 +67,37 @@ pub fn delta(
for raw_line in lines {
let line = strip_ansi_codes(&raw_line).to_string();
if line.starts_with("diff --") {
if line.starts_with("commit") {
painter.paint_buffered_lines();
state = State::Commit;
match config.opt.commit_style {
cli::SectionStyle::Plain => (),
cli::SectionStyle::Box => {
painter.emit()?;
let ansi_style = Yellow.normal();
let box_width = line.len() + 1;
draw::write_boxed_with_line(
&raw_line,
box_width,
ansi_style,
true,
painter.writer,
)?;
write!(
painter.writer,
"{}",
ansi_style.paint(
box_drawing::heavy::HORIZONTAL
.repeat(config.terminal_width - box_width - 1),
)
)?;
continue;
}
cli::SectionStyle::Underline => {
panic!("--commit-style underline is not implemented!") // TODO
}
}
} else if line.starts_with("diff --") {
painter.paint_buffered_lines();
state = State::DiffMeta;
painter.syntax = match get_file_extension_from_diff_line(&line) {
@ -114,36 +144,6 @@ pub fn delta(
continue;
}
}
} else if line.starts_with("commit") {
painter.paint_buffered_lines();
state = State::Commit;
match config.opt.commit_style {
cli::SectionStyle::Plain => (),
cli::SectionStyle::Box => {
painter.emit()?;
let ansi_style = Yellow.normal();
let box_width = line.len() + 1;
draw::write_boxed_with_line(
&raw_line,
box_width,
ansi_style,
true,
painter.writer,
)?;
write!(
painter.writer,
"{}",
ansi_style.paint(
box_drawing::heavy::HORIZONTAL
.repeat(config.terminal_width - box_width - 1),
)
)?;
continue;
}
cli::SectionStyle::Underline => {
panic!("--commit-style underline is not implemented!") // TODO
}
}
} else if line.starts_with("@@") {
state = State::HunkMeta;
match config.opt.hunk_style {