Improve readability of files in the git changes panel #41857

alphathekiwi · 2025-11-03T21:27:58Z

Closes unknown

This PR places the file_name before the file_path so that when the panel is slim it is still usable, mirrors the behaviour of the file picker (cmd+P)

Release Notes:

Improved readability of files in the git changes panel

cla-bot · 2025-11-03T21:28:00Z

We require contributors to sign our Contributor License Agreement, and we don't have @alphathekiwi on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

alphathekiwi · 2025-11-03T21:35:44Z

@cla-bot check

cla-bot · 2025-11-03T21:35:48Z

The cla-bot has been summoned, and re-checked this pull request!

cole-miller · 2025-11-04T16:42:24Z

Thanks for opening a PR! We're discussing internally whether this design is something we want for the git panel, and will let you know what the outcome of that discussion is.

xipeng-jin · 2025-11-04T17:52:46Z

Hi @alphathekiwi , I like your idea. Previously, I saw there is a similar PR #27230 before. It was being closed due to Zed team would like to handle this case with a different design for Tree-View Git Panel in this ticket #35803. I have been working on that and get a initial setup, but I think the same UI issue is still exist since there is a switch button on top so that you can click on it switch between the tree-view or flat-view as shown here

If you switch to Flat-View you will get the same design as right now, which means the readability of files in git changes are still not great!.
If Zed team is interested in accepting your PR, I am looking forward to integrating it into the final design for git panel with Tree-view. I think that would make the final UI looks even better. I am happy to have a further discussion on this. Thank you. cc @cole-miller

alphathekiwi · 2025-11-04T20:41:57Z

The use case of file name first is perfect for when you are editing a bunch of files that all have different names and it is how we do it in the file picker and how VScode does their git view.

The use case for file path first is when edit a lot of files that have the same name translation.json inside of lang/en, lang/cz, etc so i don't want to discredit this as being bad it just should perhaps be a selectable option.

I would hope we could maybe have all three options available to us, perhaps we could expand the selector you have to be like the crude screenshot I have shown

alphathekiwi · 2025-11-04T20:50:22Z

Hi @alphathekiwi , I like your idea. Previously, I saw there is a similar PR #27230 before. It was being closed due to Zed team would like to handle this case with a different design for Tree-View Git Panel in this ticket #35803. I have been working on that and get a initial setup, but I think the same UI issue is still exist since there is a switch button on top so that you can click on it switch between the tree-view or flat-view as shown here
If you switch to Flat-View you will get the same design as right now, which means the readability of files in git changes are still not great!. If Zed team is interested in accepting your PR, I am looking forward to integrating it into the final design for git panel with Tree-view. I think that would make the final UI looks even better. I am happy to have a further discussion on this. Thank you. cc @cole-miller

I didn't know about #27230 so the fact that two people wanted this code change enough to make it into a PR and each with different reasons probably indicates there is a non zero amount of people who would like this to exist in some form or fashion. This is my first attempt to make a PR and I don't really understand how the Zed settings system works, otherwise I probably would have made this a setting.

Regardless of the outcome though I want to take the time to thank you for your comprehensive reply and for also taking the time to be very welcoming, I hope to contribute more to the project in future.

ConradIrwin · 2025-11-05T18:18:31Z

I think this makes sense, but as a setting (there are some projects where the directory contains a bunch of index.js and tests.js and you need to see the project folder to know).

I do think this makes sense as a default (it'd be better for most projects I use) even though it breaks the obvious sorting behaviour.

I know there's also work going on for the tree view, and other display options here so maybe something like:

{"git_panel": {"filenames": "filename_first"}} // "tree_view" | "full"

But defer to @cole-miller who's working on this

alphathekiwi · 2025-11-06T00:28:11Z

@cole-miller at your convenience I would love to pair on making this have a setting, I loosely understand how settings work currently with the exception of the Settings UI portion and would love to work on this, I am hanging out in the zed/git1.0 channel fairly regularly most mornings NZT (afternoon/evenings in American time)

cole-miller · 2025-11-14T03:05:57Z

@alphathekiwi Sorry for the delay! We'd like to help get this ready to merge, could you book a pairing time here? https://cal.com/esther-trapadoux-zed/30min

Anthony-Eid · 2025-11-14T16:49:58Z

@alphathekiwi To add a setting to the settings ui you mainly have to add it to this Vec

zed/crates/settings_ui/src/page_data.rs

Lines 22 to 23 in 5dde87d

    
           pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> { 
        
               vec![

.

zed-industries-bot · 2025-11-14T20:53:24Z

	Warnings
⚠️	This PR is missing release notes. Please add a "Release Notes" section that describes the change: `Release Notes: - Added/Fixed/Improved ...` If your change is not user-facing, you can use "N/A" for the entry: `Release Notes: - N/A`

Generated by 🚫 dangerJS against 3193aa8

alphathekiwi · 2025-11-14T21:28:50Z

@alphathekiwi To add a setting to the settings ui you mainly have to add it to this Vec

zed/crates/settings_ui/src/page_data.rs

Lines 22 to 23 in 5dde87d

pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {

vec![

.

Cool have added settings now have also allowed an option for:
#41857
Although probably that's incorrect as now that I'm thinking about it that should be added with their PR not mine - late night coding lol 🤣

Anthony-Eid · 2025-11-18T15:54:18Z

crates/settings_ui/src/page_data.rs

+                SettingsPageItem::SettingItem(SettingItem {
+                    title: "Show Change Counters",
+                    description: "When to show change counters in the git gutter.",
+                    field: Box::new(SettingField {
+                        json_path: Some("git.show_change_counters"),
+                        pick: |settings_content| settings_content.git.as_ref()?.show_change_counters.as_ref(),
+                        write: |settings_content, value| {
+                            settings_content.git.get_or_insert_default().show_change_counters = value;
+                        },
+                    }),
+                    metadata: None,
+                    files: USER,
+                }),


This looks like a different setting than the GitPathStyle setting your PR added. Is this a setting that was missing from the settings UI?

The second to last step to finalizing this PR is adding the GitPathStyle setting to the UI

It seems like CICD is failing because show_change_counter isn't a real value. I'll be happy to help you fix this though.

Ahhh sorry about that, its a combination of broken rust-analyser and trying to work on two things at once.

Anthony-Eid · 2025-11-18T15:56:00Z

crates/settings_ui/README.md

Having a file like this would be very helpful, but it should be added through its own PR.

I also think this file is a bit too information-dense in some areas and misses the why the settings are structured the way they are. I'll be happy to help you clean it up for a different PR 😀

Okay sounds good :)

Anthony-Eid · 2025-11-18T15:56:52Z

crates/git_ui/src/git_panel.rs

                h_flex()
                    .items_center()
                    .flex_1()
                    // .overflow_hidden()


While we're editing this code could you also please remove this comment?

cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Nov 3, 2025

alphathekiwi changed the title ~~Initial attempt at this change~~ Improves readability of files in the git changes panel Nov 3, 2025

maxdeviant changed the title ~~Improves readability of files in the git changes panel~~ Improve readability of files in the git changes panel Nov 3, 2025

SomeoneToIgnore assigned cole-miller and danilo-leal Nov 3, 2025

danilo-leal removed their assignment Nov 10, 2025

xipeng-jin mentioned this pull request Nov 11, 2025

Tree view for Git Panel #35803

Open

This was referenced Nov 12, 2025

Fix track file renames in git panel #42352

Merged

Files in nested directories are hard to distinguish #26097

Open

alphathekiwi force-pushed the git/file_name_first branch from 86b828b to 10a4c41 Compare November 14, 2025 20:52

alphathekiwi force-pushed the git/file_name_first branch from 10a4c41 to c71ea03 Compare November 15, 2025 04:18

Anthony-Eid self-assigned this Nov 18, 2025

Anthony-Eid requested changes Nov 18, 2025

View reviewed changes

alphathekiwi added 2 commits November 19, 2025 01:19

Initial attempt at this change

aa632c6

Added settings for git view

7f76de5

alphathekiwi force-pushed the git/file_name_first branch 2 times, most recently from af64793 to c166537 Compare November 18, 2025 20:06

alphathekiwi force-pushed the git/file_name_first branch from c166537 to a3041c2 Compare November 18, 2025 20:18

alphathekiwi requested a review from Anthony-Eid November 18, 2025 20:23

Amendments to resolve merge conflict and fix clippy errors

3193aa8

alphathekiwi force-pushed the git/file_name_first branch from a3041c2 to 3193aa8 Compare November 18, 2025 21:58

Improve readability of files in the git changes panel #41857

Are you sure you want to change the base?

Improve readability of files in the git changes panel #41857

Conversation

alphathekiwi commented Nov 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cla-bot bot commented Nov 3, 2025

Uh oh!

alphathekiwi commented Nov 3, 2025

Uh oh!

cla-bot bot commented Nov 3, 2025

Uh oh!

cole-miller commented Nov 4, 2025

Uh oh!

xipeng-jin commented Nov 4, 2025

Uh oh!

alphathekiwi commented Nov 4, 2025

Uh oh!

alphathekiwi commented Nov 4, 2025

Uh oh!

ConradIrwin commented Nov 5, 2025

Uh oh!

alphathekiwi commented Nov 6, 2025

Uh oh!

cole-miller commented Nov 14, 2025

Uh oh!

Anthony-Eid commented Nov 14, 2025

Uh oh!

zed-industries-bot commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alphathekiwi commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Anthony-Eid Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

Anthony-Eid Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

alphathekiwi Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

Anthony-Eid Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

alphathekiwi Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

Anthony-Eid Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

alphathekiwi Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

alphathekiwi commented Nov 3, 2025 •

edited

Loading

zed-industries-bot commented Nov 14, 2025 •

edited

Loading

alphathekiwi commented Nov 14, 2025 •

edited

Loading