T19 Git: diffs unified and split with word marks and folds, three-way merge and conflict resolver, changes list and commit input, commit graph and list, branch selector, branch, tag and stash lists, blame with annotation, file history, pull request card, review thread, diff stat and status badge
This commit is contained in:
ZacharyZhang-NY committed
1 parent
e79ab866c3
commit
950f17636c
31 files changed
+4166
-21
No files matched your search
@@ -0,0 +1,332 @@
|
||||
use std::{ops::Range, rc::Rc};
|
||||
|
||||
use gpui::{
|
||||
AnyElement, App, ElementId, FontWeight, HighlightStyle, Hsla, InteractiveElement, IntoElement,
|
||||
MouseButton, ParentElement, RenderOnce, SharedString, StatefulInteractiveElement, Styled,
|
||||
StyledText, Window, div, prelude::*, uniform_list,
|
||||
};
|
||||
|
||||
use super::{
|
||||
badges::DiffStat,
|
||||
diff::{DiffLine, LineKind, Stretch, diff, pairs},
|
||||
};
|
||||
use crate::{
|
||||
buttons::SegmentedControl,
|
||||
editor::{code_colors, stack},
|
||||
theme::{ActiveTheme, ControlSize, Palette, TextSize},
|
||||
typography::format,
|
||||
};
|
||||
|
||||
/// How a diff lays out.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum DiffLayout {
|
||||
Unified,
|
||||
Split,
|
||||
}
|
||||
|
||||
/// Unchanged lines kept around each change.
|
||||
const CONTEXT: usize = 3;
|
||||
|
||||
/// A row as the viewer draws it.
|
||||
#[derive(Clone)]
|
||||
enum Shown {
|
||||
Header(SharedString),
|
||||
Line(DiffLine),
|
||||
Pair(Option<DiffLine>, Option<DiffLine>),
|
||||
/// A folded stretch: its place among the stretches and how many lines it hides.
|
||||
Fold(usize, usize),
|
||||
}
|
||||
|
||||
fn shown(stretches: &[Stretch], layout: DiffLayout, open: &[usize]) -> Vec<Shown> {
|
||||
let mut rows = Vec::new();
|
||||
for (ix, stretch) in stretches.iter().enumerate() {
|
||||
match stretch {
|
||||
Stretch::Hunk { header, lines } => {
|
||||
rows.push(Shown::Header(header.clone()));
|
||||
match layout {
|
||||
DiffLayout::Unified => rows.extend(lines.iter().cloned().map(Shown::Line)),
|
||||
DiffLayout::Split => rows.extend(
|
||||
pairs(lines)
|
||||
.into_iter()
|
||||
.map(|(left, right)| Shown::Pair(left.cloned(), right.cloned())),
|
||||
),
|
||||
}
|
||||
}
|
||||
Stretch::Folded(lines) if open.contains(&ix) => {
|
||||
rows.extend(lines.iter().map(|line| match layout {
|
||||
DiffLayout::Unified => Shown::Line(line.clone()),
|
||||
DiffLayout::Split => Shown::Pair(Some(line.clone()), Some(line.clone())),
|
||||
}))
|
||||
}
|
||||
Stretch::Folded(lines) => rows.push(Shown::Fold(ix, lines.len())),
|
||||
}
|
||||
}
|
||||
rows
|
||||
}
|
||||
|
||||
type OnIndex = Rc<dyn Fn(usize, &mut Window, &mut App)>;
|
||||
type OnLayout = Rc<dyn Fn(DiffLayout, &mut Window, &mut App)>;
|
||||
|
||||
/// One file's changes: each change in its context with old and new numbers and its changed words marked, the stretches between folded until pressed; unified or side by side. Long diffs draw only the rows in view; it fills its box.
|
||||
#[derive(IntoElement)]
|
||||
pub struct DiffViewer {
|
||||
id: ElementId,
|
||||
path: SharedString,
|
||||
stretches: Rc<Vec<Stretch>>,
|
||||
stat: (usize, usize),
|
||||
layout: DiffLayout,
|
||||
open: Vec<usize>,
|
||||
on_open: Option<OnIndex>,
|
||||
on_layout: Option<OnLayout>,
|
||||
}
|
||||
|
||||
impl DiffViewer {
|
||||
pub fn new(
|
||||
id: impl Into<ElementId>,
|
||||
path: impl Into<SharedString>,
|
||||
old: &str,
|
||||
new: &str,
|
||||
) -> Self {
|
||||
Self {
|
||||
id: id.into(),
|
||||
path: path.into(),
|
||||
stretches: Rc::new(diff(old, new, CONTEXT)),
|
||||
stat: super::diff::stat(old, new),
|
||||
layout: DiffLayout::Unified,
|
||||
open: Vec::new(),
|
||||
on_open: None,
|
||||
on_layout: None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn layout(mut self, layout: DiffLayout) -> Self {
|
||||
self.layout = layout;
|
||||
self
|
||||
}
|
||||
|
||||
/// Folded stretches shown in full, by their place among the stretches.
|
||||
pub fn open(mut self, stretches: impl IntoIterator<Item = usize>) -> Self {
|
||||
self.open = stretches.into_iter().collect();
|
||||
self
|
||||
}
|
||||
|
||||
pub fn on_open(mut self, handler: impl Fn(usize, &mut Window, &mut App) + 'static) -> Self {
|
||||
self.on_open = Some(Rc::new(handler));
|
||||
self
|
||||
}
|
||||
|
||||
pub fn on_layout(
|
||||
mut self,
|
||||
handler: impl Fn(DiffLayout, &mut Window, &mut App) + 'static,
|
||||
) -> Self {
|
||||
self.on_layout = Some(Rc::new(handler));
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
/// The wash behind a line, and behind its changed words.
|
||||
fn washes(kind: LineKind, colors: &Palette) -> (Option<Hsla>, Hsla) {
|
||||
match kind {
|
||||
LineKind::Same => (None, colors.hover),
|
||||
LineKind::Added => (
|
||||
Some(colors.success.opacity(0.08)),
|
||||
colors.success.opacity(0.25),
|
||||
),
|
||||
LineKind::Removed => (
|
||||
Some(colors.danger.opacity(0.08)),
|
||||
colors.danger.opacity(0.25),
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
/// A line's code, colored as code, its changed words washed.
|
||||
fn code(line: &DiffLine, colors: &Palette, cx: &App) -> StyledText {
|
||||
let (_, word) = washes(line.kind, colors);
|
||||
let mut styles: Vec<(Range<usize>, HighlightStyle)> = code_colors(&line.text, cx);
|
||||
styles.extend(line.words.iter().map(|range| {
|
||||
(
|
||||
range.clone(),
|
||||
HighlightStyle {
|
||||
background_color: Some(word),
|
||||
..HighlightStyle::default()
|
||||
},
|
||||
)
|
||||
}));
|
||||
styles.sort_by_key(|(range, _)| range.start);
|
||||
StyledText::new(line.text.clone()).with_highlights(stack(styles))
|
||||
}
|
||||
|
||||
impl RenderOnce for DiffViewer {
|
||||
fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
|
||||
let theme = cx.theme();
|
||||
let colors = theme.colors.clone();
|
||||
let rows = Rc::new(shown(&self.stretches, self.layout, &self.open));
|
||||
let layout = SegmentedControl::new(
|
||||
(self.id.clone(), "layout"),
|
||||
match self.layout {
|
||||
DiffLayout::Unified => "unified",
|
||||
DiffLayout::Split => "split",
|
||||
},
|
||||
)
|
||||
.size(ControlSize::Sm)
|
||||
.segment("unified", "Unified", None)
|
||||
.segment("split", "Split", None);
|
||||
let layout = match self.on_layout {
|
||||
Some(on_layout) => layout.on_change(move |key, window, cx| {
|
||||
let next = if key.as_ref() == "split" {
|
||||
DiffLayout::Split
|
||||
} else {
|
||||
DiffLayout::Unified
|
||||
};
|
||||
on_layout(next, window, cx)
|
||||
}),
|
||||
None => layout,
|
||||
};
|
||||
let digits = self
|
||||
.stretches
|
||||
.iter()
|
||||
.flat_map(|stretch| match stretch {
|
||||
Stretch::Hunk { lines, .. } | Stretch::Folded(lines) => lines.iter(),
|
||||
})
|
||||
.flat_map(|line| [line.old, line.new])
|
||||
.flatten()
|
||||
.max()
|
||||
.unwrap_or(1)
|
||||
.to_string()
|
||||
.len()
|
||||
.max(2);
|
||||
let (id, on_open) = (self.id.clone(), self.on_open.clone());
|
||||
let list = uniform_list(
|
||||
(self.id.clone(), "rows"),
|
||||
rows.len(),
|
||||
move |range, _, cx| {
|
||||
let colors = cx.theme().colors.clone();
|
||||
let number = |value: Option<usize>| {
|
||||
div()
|
||||
.flex_none()
|
||||
.w(cx.theme().text_size(TextSize::Xs) * (digits as f32 * 0.62 + 0.8))
|
||||
.text_right()
|
||||
.text_color(colors.fg_subtle)
|
||||
.children(value.map(|value| value.to_string()))
|
||||
};
|
||||
let side =
|
||||
|line: Option<&DiffLine>, cx: &App| -> AnyElement {
|
||||
let (wash, _) = line
|
||||
.map_or((Some(colors.hover.opacity(0.5)), colors.hover), |line| {
|
||||
washes(line.kind, &colors)
|
||||
});
|
||||
div()
|
||||
.flex_1()
|
||||
.min_w_0()
|
||||
.flex()
|
||||
.gap_2()
|
||||
.overflow_hidden()
|
||||
.when_some(wash, |side, wash| side.bg(wash))
|
||||
.child(number(line.and_then(|line| line.old.or(line.new))))
|
||||
.children(line.map(|line| {
|
||||
div().whitespace_nowrap().child(code(line, &colors, cx))
|
||||
}))
|
||||
.into_any_element()
|
||||
};
|
||||
range
|
||||
.map(|ix| {
|
||||
let row = div().id(ix).w_full().flex().px_2().whitespace_nowrap();
|
||||
match &rows[ix] {
|
||||
Shown::Header(header) => row
|
||||
.bg(colors.hover)
|
||||
.text_color(colors.fg_muted)
|
||||
.child(header.clone())
|
||||
.into_any_element(),
|
||||
Shown::Line(line) => {
|
||||
let (wash, _) = washes(line.kind, &colors);
|
||||
let sign = match line.kind {
|
||||
LineKind::Same => " ",
|
||||
LineKind::Added => "+",
|
||||
LineKind::Removed => "−",
|
||||
};
|
||||
row.gap_2()
|
||||
.when_some(wash, |row, wash| row.bg(wash))
|
||||
.child(number(line.old))
|
||||
.child(number(line.new))
|
||||
.child(
|
||||
div().flex_none().text_color(colors.fg_subtle).child(sign),
|
||||
)
|
||||
.child(
|
||||
div()
|
||||
.flex_1()
|
||||
.min_w_0()
|
||||
.overflow_hidden()
|
||||
.child(code(line, &colors, cx)),
|
||||
)
|
||||
.into_any_element()
|
||||
}
|
||||
Shown::Pair(left, right) => row
|
||||
.gap_1()
|
||||
.child(side(left.as_ref(), cx))
|
||||
.child(side(right.as_ref(), cx))
|
||||
.into_any_element(),
|
||||
Shown::Fold(stretch, count) => {
|
||||
let (open, stretch) = (on_open.clone(), *stretch);
|
||||
row.id((id.clone(), format!("fold-{stretch}")))
|
||||
.justify_center()
|
||||
.bg(colors.hover.opacity(0.5))
|
||||
.text_color(colors.fg_subtle)
|
||||
.cursor_pointer()
|
||||
.hover(|row| row.text_color(colors.fg))
|
||||
.on_mouse_down(MouseButton::Left, |_, window, _| {
|
||||
window.prevent_default()
|
||||
})
|
||||
.when_some(open, |row, open| {
|
||||
row.on_click(move |_, window, cx| open(stretch, window, cx))
|
||||
})
|
||||
.child(format!(
|
||||
"⋯ {}",
|
||||
format::plural(
|
||||
*count as u64,
|
||||
"unchanged line",
|
||||
"unchanged lines"
|
||||
)
|
||||
))
|
||||
.into_any_element()
|
||||
}
|
||||
}
|
||||
})
|
||||
.collect()
|
||||
},
|
||||
)
|
||||
.size_full();
|
||||
div()
|
||||
.size_full()
|
||||
.flex()
|
||||
.flex_col()
|
||||
.text_size(theme.text_size(TextSize::Sm))
|
||||
.child(
|
||||
div()
|
||||
.flex()
|
||||
.items_center()
|
||||
.gap_3()
|
||||
.px_2()
|
||||
.py_1p5()
|
||||
.border_b_1()
|
||||
.border_color(colors.border)
|
||||
.child(
|
||||
div()
|
||||
.flex_1()
|
||||
.min_w_0()
|
||||
.font_weight(FontWeight::MEDIUM)
|
||||
.text_color(colors.fg)
|
||||
.child(self.path),
|
||||
)
|
||||
.child(DiffStat::new(self.stat.0, self.stat.1))
|
||||
.child(layout),
|
||||
)
|
||||
.child(
|
||||
div()
|
||||
.flex_1()
|
||||
.min_h_0()
|
||||
.font_family(theme.mono_family.clone())
|
||||
.text_size(theme.text_size(TextSize::Xs))
|
||||
.child(list),
|
||||
)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user