Kunall Banerjee created
From the looks of it, this setting was never used by the File Finder. It
also doesn’t make much sense to show git info in the File Finder. The
Project Panel already exposes this information to the user.
Closes #49709.
| Before | After |
|--------|--------|
| <img width="1012" height="769" alt="image"
src="https://github.com/user-attachments/assets/9666ace7-38cb-4789-8681-80c15b8ac3fd"
/> | <img width="1012" height="769" alt="image"
src="https://github.com/user-attachments/assets/5e0505d7-3ede-46fa-bb33-a44865a9f64b"
/> |
Before you mark this PR as ready for review, make sure that you have:
- [x] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
Release Notes:
- Removed unused `file_finder.git_status` settingassets/settings/default.json | 2 -
crates/settings_content/src/settings_content.rs | 4 ---
crates/settings_ui/src/page_data.rs | 20 ------------------
docs/src/visual-customization.md | 1
4 files changed, 1 insertion(+), 26 deletions(-)
@@ -1271,8 +1271,6 @@
//
// Default: true
"skip_focus_for_active_in_search": true,
- // Whether to show the git status in the file finder.
- "git_status": true,
// Whether to use gitignored files when searching.
// Only the file Zed had indexed will be used, not necessary all the gitignored files.
//
@@ -716,10 +716,6 @@ pub struct FileFinderSettingsContent {
///
/// Default: true
pub skip_focus_for_active_in_search: Option<bool>,
- /// Determines whether to show the git status in the file finder
- ///
- /// Default: true
- pub git_status: Option<bool>,
/// Whether to use gitignored files when searching.
/// Only the file Zed had indexed will be used, not necessary all the gitignored files.
///
@@ -3154,7 +3154,7 @@ fn search_and_files_page() -> SettingsPage {
]
}
- fn file_finder_section() -> [SettingsPageItem; 6] {
+ fn file_finder_section() -> [SettingsPageItem; 5] {
[
SettingsPageItem::SectionHeader("File Finder"),
// todo: null by default
@@ -3242,24 +3242,6 @@ fn search_and_files_page() -> SettingsPage {
metadata: None,
files: USER,
}),
- SettingsPageItem::SettingItem(SettingItem {
- title: "Git Status",
- description: "Show the Git status in the file finder.",
- field: Box::new(SettingField {
- json_path: Some("file_finder.git_status"),
- pick: |settings_content| {
- settings_content.file_finder.as_ref()?.git_status.as_ref()
- },
- write: |settings_content, value| {
- settings_content
- .file_finder
- .get_or_insert_default()
- .git_status = value;
- },
- }),
- metadata: None,
- files: USER,
- }),
]
}
@@ -436,7 +436,6 @@ TBD: Centered layout related settings
"file_finder": {
"file_icons": true, // Show/hide file icons
"modal_max_width": "small", // Horizontal size: small, medium, large, xlarge, full
- "git_status": true, // Show the git status for each entry
"include_ignored": null // gitignored files in results: true, false, null
},
```