45708d2680
This adds a new version of the project diff editor to go alongside the new git panel. The basics seem to be working, but still todo: * [ ] Fix untracked files * [ ] Fix deleted files * [ ] Show commit message editor at top * [x] Handle empty state * [x] Fix panic where locator sometimes seeks to wrong excerpt Release Notes: - N/A
42 lines
1.2 KiB
Rust
42 lines
1.2 KiB
Rust
use ::settings::Settings;
|
|
use git::status::FileStatus;
|
|
use git_panel_settings::GitPanelSettings;
|
|
use gpui::App;
|
|
use project_diff::ProjectDiff;
|
|
use ui::{ActiveTheme, Color, Icon, IconName, IntoElement};
|
|
|
|
pub mod git_panel;
|
|
mod git_panel_settings;
|
|
pub mod project_diff;
|
|
pub mod repository_selector;
|
|
|
|
pub fn init(cx: &mut App) {
|
|
GitPanelSettings::register(cx);
|
|
cx.observe_new(ProjectDiff::register).detach();
|
|
}
|
|
|
|
// TODO: Add updated status colors to theme
|
|
pub fn git_status_icon(status: FileStatus, cx: &App) -> impl IntoElement {
|
|
let (icon_name, color) = if status.is_conflicted() {
|
|
(
|
|
IconName::Warning,
|
|
cx.theme().colors().version_control_conflict,
|
|
)
|
|
} else if status.is_deleted() {
|
|
(
|
|
IconName::SquareMinus,
|
|
cx.theme().colors().version_control_deleted,
|
|
)
|
|
} else if status.is_modified() {
|
|
(
|
|
IconName::SquareDot,
|
|
cx.theme().colors().version_control_modified,
|
|
)
|
|
} else {
|
|
(
|
|
IconName::SquarePlus,
|
|
cx.theme().colors().version_control_added,
|
|
)
|
|
};
|
|
Icon::new(icon_name).color(Color::Custom(color))
|
|
}
|