Add initial project panel settings

Mikayla Maki created 2 years ago

Change summary

Cargo.lock                                         |  4 ++
assets/settings/default.json                       |  4 ++
crates/project_panel/Cargo.toml                    |  6 +++
crates/project_panel/src/project_panel.rs          |  7 +++
crates/project_panel/src/project_panel_settings.rs | 29 ++++++++++++++++
5 files changed, 49 insertions(+), 1 deletion(-)

Detailed changes

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",

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.

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]

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::<ProjectPanelSettings>(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::<ProjectPanelSettings>(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();
 

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<bool>,
+}
+
+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> {
+        Self::load_via_json_merge(default_value, user_values)
+    }
+}