From 7be8dead07b86683a627a1fa2969b3947fc44f1c Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Mon, 22 May 2023 20:23:07 -0700 Subject: [PATCH 1/4] Add initial project panel settings --- Cargo.lock | 4 +++ assets/settings/default.json | 4 +++ crates/project_panel/Cargo.toml | 6 ++++ crates/project_panel/src/project_panel.rs | 7 ++++- .../src/project_panel_settings.rs | 29 +++++++++++++++++++ 5 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 crates/project_panel/src/project_panel_settings.rs diff --git a/Cargo.lock b/Cargo.lock index 3ae96f4751751fb06ce6250a31b138f93cd4cdf0..981005f3f2b0e0de0364a67378903f41e5383b2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4886,6 +4886,7 @@ dependencies = [ name = "project_panel" version = "0.1.0" dependencies = [ + "anyhow", "client", "context_menu", "drag_and_drop", @@ -4896,6 +4897,9 @@ dependencies = [ "menu", "postage", "project", + "schemars", + "serde", + "serde_derive", "serde_json", "settings", "theme", diff --git a/assets/settings/default.json b/assets/settings/default.json index e4e7a8c522d3585dda3ef9ac05a01d37b72bcda5..38d0ce820ba3eaf06281bb9992e5ed0c3a0b56ae 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -70,6 +70,10 @@ // Whether to show git diff indicators in the scrollbar. "git_diff": true }, + "project_panel": { + // Whether to show the git status in the project panel. + "git_status": true + }, // Whether the screen sharing icon is shown in the os status bar. "show_call_status_icon": true, // Whether to use language servers to provide code intelligence. diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml index 6fcdf06d2c736c63ea19cc5bd5ebdd79e7c36061..01d1be53b9eaeb572a69de15c655a750812f7df3 100644 --- a/crates/project_panel/Cargo.toml +++ b/crates/project_panel/Cargo.toml @@ -21,6 +21,12 @@ util = { path = "../util" } workspace = { path = "../workspace" } postage.workspace = true futures.workspace = true +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true +anyhow.workspace = true +schemars.workspace = true + unicase = "2.6" [dev-dependencies] diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index a7895172d56d02a0da84c890eafd774b9f3fa905..d4cd0074549fdd6bc86159319395ee25a46fd47f 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -1,3 +1,5 @@ +mod project_panel_settings; + use context_menu::{ContextMenu, ContextMenuItem}; use drag_and_drop::{DragAndDrop, Draggable}; use editor::{Cancel, Editor}; @@ -20,6 +22,7 @@ use project::{ repository::GitFileStatus, Entry, EntryKind, Project, ProjectEntryId, ProjectPath, Worktree, WorktreeId, }; +use project_panel_settings::ProjectPanelSettings; use std::{ cmp::Ordering, collections::{hash_map, HashMap}, @@ -111,6 +114,7 @@ actions!( ); pub fn init(cx: &mut AppContext) { + settings::register::(cx); cx.add_action(ProjectPanel::expand_selected_entry); cx.add_action(ProjectPanel::collapse_selected_entry); cx.add_action(ProjectPanel::select_prev); @@ -1000,6 +1004,7 @@ impl ProjectPanel { } let end_ix = range.end.min(ix + visible_worktree_entries.len()); + let git_status_setting = settings::get::(cx).git_status; if let Some(worktree) = self.project.read(cx).worktree_for_id(*worktree_id, cx) { let snapshot = worktree.read(cx).snapshot(); let root_name = OsStr::new(snapshot.root_name()); @@ -1013,7 +1018,7 @@ impl ProjectPanel { for (entry, repo) in snapshot.entries_with_repositories(visible_worktree_entries[entry_range].iter()) { - let status = (entry.path.parent().is_some() && !entry.is_ignored) + let status = (git_status_setting && entry.path.parent().is_some() && !entry.is_ignored) .then(|| repo.and_then(|repo| repo.status_for_path(&snapshot, &entry.path))) .flatten(); diff --git a/crates/project_panel/src/project_panel_settings.rs b/crates/project_panel/src/project_panel_settings.rs new file mode 100644 index 0000000000000000000000000000000000000000..01a15d089bfed0b794777f8479580d98e097eccf --- /dev/null +++ b/crates/project_panel/src/project_panel_settings.rs @@ -0,0 +1,29 @@ +use serde_derive::{Deserialize, Serialize}; +use anyhow; +use settings::Setting; +use schemars::JsonSchema; + + +#[derive(Deserialize, Debug)] +pub struct ProjectPanelSettings { + pub git_status: bool, +} + +#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)] +pub struct ProjectPanelSettingsContent { + pub git_status: Option, +} + +impl Setting for ProjectPanelSettings { + const KEY: Option<&'static str> = Some("project_panel"); + + type FileContent = ProjectPanelSettingsContent; + + fn load( + default_value: &Self::FileContent, + user_values: &[&Self::FileContent], + _: &gpui::AppContext, + ) -> anyhow::Result { + Self::load_via_json_merge(default_value, user_values) + } +} From da96802bf03644d4f056ff4bd8f8be97fd3e069b Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Mon, 22 May 2023 20:25:27 -0700 Subject: [PATCH 2/4] fmt --- crates/project_panel/src/project_panel.rs | 4 +++- crates/project_panel/src/project_panel_settings.rs | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index d4cd0074549fdd6bc86159319395ee25a46fd47f..66f0fe77182d0ef1a1493141be93483624392078 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -1018,7 +1018,9 @@ impl ProjectPanel { for (entry, repo) in snapshot.entries_with_repositories(visible_worktree_entries[entry_range].iter()) { - let status = (git_status_setting && entry.path.parent().is_some() && !entry.is_ignored) + let status = (git_status_setting + && entry.path.parent().is_some() + && !entry.is_ignored) .then(|| repo.and_then(|repo| repo.status_for_path(&snapshot, &entry.path))) .flatten(); diff --git a/crates/project_panel/src/project_panel_settings.rs b/crates/project_panel/src/project_panel_settings.rs index 01a15d089bfed0b794777f8479580d98e097eccf..7786f1b4380b10956c8b3ea327f98b349c0e6ad3 100644 --- a/crates/project_panel/src/project_panel_settings.rs +++ b/crates/project_panel/src/project_panel_settings.rs @@ -1,8 +1,7 @@ -use serde_derive::{Deserialize, Serialize}; use anyhow; -use settings::Setting; use schemars::JsonSchema; - +use serde_derive::{Deserialize, Serialize}; +use settings::Setting; #[derive(Deserialize, Debug)] pub struct ProjectPanelSettings { From b19a712799a042596d8e75654c9419a70b946532 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Mon, 22 May 2023 20:33:18 -0700 Subject: [PATCH 3/4] Add init_settings to tests --- crates/project_panel/src/project_panel.rs | 7 ++++++- crates/zed/src/zed.rs | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index 66f0fe77182d0ef1a1493141be93483624392078..40ba0b7e67de51b3f2d0677257cb4fc7df11620f 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -113,8 +113,12 @@ actions!( ] ); -pub fn init(cx: &mut AppContext) { +pub fn init_settings(cx: &mut AppContext) { settings::register::(cx); +} + +pub fn init(cx: &mut AppContext) { + init_settings(cx); cx.add_action(ProjectPanel::expand_selected_entry); cx.add_action(ProjectPanel::collapse_selected_entry); cx.add_action(ProjectPanel::select_prev); @@ -2051,6 +2055,7 @@ mod tests { cx.foreground().forbid_parking(); cx.update(|cx| { cx.set_global(SettingsStore::test(cx)); + init_settings(cx); theme::init((), cx); language::init(cx); editor::init_settings(cx); diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs index 376ecfc06bd43aeb2753345aa2301b8bd7d60cf7..95d09e82ec445ea245508f8e31441772b118ba6f 100644 --- a/crates/zed/src/zed.rs +++ b/crates/zed/src/zed.rs @@ -2068,6 +2068,7 @@ mod tests { workspace::init(app_state.clone(), cx); language::init(cx); editor::init(cx); + project_panel::init_settings(cx); pane::init(cx); app_state }) From a37b1b6a45c97f99cf236ffb71d3e27e42f72f4b Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Mon, 22 May 2023 20:38:30 -0700 Subject: [PATCH 4/4] Add other setting init --- crates/project_panel/src/project_panel.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index 40ba0b7e67de51b3f2d0677257cb4fc7df11620f..69d8b8be4ddeca6f63c59368be4dda153c80965c 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -2068,6 +2068,7 @@ mod tests { cx.update(|cx| { let app_state = AppState::test(cx); theme::init((), cx); + init_settings(cx); language::init(cx); editor::init(cx); pane::init(cx);