giff 1.2.0

Visualizes the differences between the current HEAD and a specified branch in a git repository using a formatted table output in your terminal. The differences are displayed with color-coded additions and deletions for better readability.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153

use ratatui::{
    style::{Color, Modifier, Style},
    text::{Line, Span},
};
use std::sync::LazyLock;
use syntect::easy::HighlightLines;
use syntect::highlighting::{self, ThemeSet};
use syntect::parsing::SyntaxSet;

use super::theme::Theme;

pub static SYNTAX_SET: LazyLock<SyntaxSet> = LazyLock::new(two_face::syntax::extra_newlines);
pub static THEME_SET: LazyLock<ThemeSet> = LazyLock::new(ThemeSet::load_defaults);

fn to_ratatui_color(c: highlighting::Color) -> Color {
    Color::Rgb(c.r, c.g, c.b)
}

pub fn highlight_code(code: &str, highlighter: &mut HighlightLines) -> Vec<Span<'static>> {
    match highlighter.highlight_line(code, &SYNTAX_SET) {
        Ok(ranges) => ranges
            .into_iter()
            .map(|(style, text)| {
                Span::styled(
                    text.to_owned(),
                    Style::default().fg(to_ratatui_color(style.foreground)),
                )
            })
            .collect(),
        Err(_) => vec![Span::raw(code.to_owned())],
    }
}

fn highlight_code_with_bg(
    code: &str,
    highlighter: &mut HighlightLines,
    bg: Color,
) -> Vec<Span<'static>> {
    match highlighter.highlight_line(code, &SYNTAX_SET) {
        Ok(ranges) => ranges
            .into_iter()
            .map(|(style, text)| {
                Span::styled(
                    text.to_owned(),
                    Style::default()
                        .fg(to_ratatui_color(style.foreground))
                        .bg(bg),
                )
            })
            .collect(),
        Err(_) => vec![Span::styled(code.to_owned(), Style::default().bg(bg))],
    }
}

pub fn highlight_line_changes(
    lines: &[(usize, String)],
    filename: &str,
    theme: &Theme,
) -> Vec<Line<'static>> {
    let syntax = SYNTAX_SET
        .find_syntax_for_file(filename)
        .ok()
        .flatten()
        .unwrap_or_else(|| SYNTAX_SET.find_syntax_plain_text());
    let fallback_name = if theme.is_dark {
        "base16-ocean.dark"
    } else {
        "base16-ocean.light"
    };
    let syn_theme = match THEME_SET.themes.get(&theme.syntax_theme) {
        Some(t) => t,
        None => match THEME_SET
            .themes
            .get(fallback_name)
            .or_else(|| THEME_SET.themes.values().next())
        {
            Some(t) => t,
            None => {
                return lines
                    .iter()
                    .map(|(num, line)| {
                        if *num == 0 {
                            return Line::from(Span::raw(""));
                        }
                        Line::from(Span::raw(format!("{:4}   {}", num, line)))
                    })
                    .collect()
            }
        },
    };
    let mut highlighter = HighlightLines::new(syntax, syn_theme);

    let fg_line_num = theme.fg_line_num;
    let bg_removed = theme.bg_removed;
    let bg_added = theme.bg_added;
    let fg_removed_marker = theme.fg_removed_marker;
    let fg_added_marker = theme.fg_added_marker;

    lines
        .iter()
        .map(|(line_num, line)| {
            // Gap/placeholder line for side-by-side alignment
            if *line_num == 0 {
                return Line::from(Span::raw(""));
            }
            if let Some(rest) = line.strip_prefix('-') {
                let mut spans = vec![
                    Span::styled(
                        format!("{:4} ", line_num),
                        Style::default().fg(fg_line_num).bg(bg_removed),
                    ),
                    Span::styled(
                        "- ",
                        Style::default()
                            .fg(fg_removed_marker)
                            .bg(bg_removed)
                            .add_modifier(Modifier::BOLD),
                    ),
                ];
                spans.extend(highlight_code_with_bg(rest, &mut highlighter, bg_removed));
                Line::from(spans)
            } else if let Some(rest) = line.strip_prefix('+') {
                let mut spans = vec![
                    Span::styled(
                        format!("{:4} ", line_num),
                        Style::default().fg(fg_line_num).bg(bg_added),
                    ),
                    Span::styled(
                        "+ ",
                        Style::default()
                            .fg(fg_added_marker)
                            .bg(bg_added)
                            .add_modifier(Modifier::BOLD),
                    ),
                ];
                spans.extend(highlight_code_with_bg(rest, &mut highlighter, bg_added));
                Line::from(spans)
            } else {
                // Context lines in git diff format have a leading space;
                // strip it so code aligns with changed lines (whose +/-
                // prefix is also stripped) and so indentation-sensitive
                // languages (Python, YAML) highlight correctly.
                let content = line.strip_prefix(' ').unwrap_or(line);
                let mut spans = vec![
                    Span::styled(format!("{:4} ", line_num), Style::default().fg(fg_line_num)),
                    Span::styled("  ", Style::default()),
                ];
                spans.extend(highlight_code(content, &mut highlighter));
                Line::from(spans)
            }
        })
        .collect()
}