Skip to content

project_panel: Add Git status indicators#50216

Merged
smitbarmase merged 6 commits intozed-industries:mainfrom
davidescaccia:git-status-indicators
Mar 25, 2026
Merged

project_panel: Add Git status indicators#50216
smitbarmase merged 6 commits intozed-industries:mainfrom
davidescaccia:git-status-indicators

Conversation

@davidescaccia
Copy link
Copy Markdown
Contributor

@davidescaccia davidescaccia commented Feb 26, 2026 •
edited by smitbarmase
Loading

This PR adds Git status badges next to file names in the Project Panel, following my older PR #49802
These are enabled by having "git_status" true.

Screenshot
image

I'd love to hear feedback about any of this :)
Especially feedback on these:

  • File name colour is determined only by Git status, the diagnostic badges remain separate. Should diagnostics also affect the filename colour?
  • (Unstaged) Modified files and staged modifications share the same colour, in vscode staged modifications use a brownish colour by default which I could not find the colours. I think differentiating them is definetely something to add.

Release Notes

  • Added git status indicators in Project Panel. It can be enabled by setting git_status_indicator to true in project_panel settings.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 26, 2026
smitbarmase
smitbarmase requested changes Mar 23, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@smitbarmase smitbarmase left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Aren't we introducing a setting to turn off these indicators, just like we have a setting for the diagnostic count?

@davidescaccia
Copy link
Copy Markdown
Contributor Author

davidescaccia commented Mar 23, 2026

Thanks. Aren't we introducing a setting to turn off these indicators, just like we have a setting for the diagnostic count?

Sure, ill do that asap, should it be off by default?

@smitbarmase
Copy link
Copy Markdown
Member

smitbarmase commented Mar 23, 2026

Can you rebase?

@davidescaccia davidescaccia force-pushed the git-status-indicators branch from 176926e to c7ff1a2 Compare March 23, 2026 14:22
@davidescaccia
Copy link
Copy Markdown
Contributor Author

davidescaccia commented Mar 24, 2026

@smitbarmase Hey, I added a small fix to workspace.rs to correct the diagnostic_badges default value, everything looks solid now imo.

@zed-industries-bot
Copy link
Copy Markdown
Contributor

zed-industries-bot commented Mar 25, 2026 •
edited
Loading

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 76995cb

smitbarmase
smitbarmase approved these changes Mar 25, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@smitbarmase smitbarmase left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! This looks great.

@smitbarmase smitbarmase merged commit 9973a34 into zed-industries:main Mar 25, 2026
32 checks passed
@davidescaccia davidescaccia deleted the git-status-indicators branch March 25, 2026 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@smitbarmase smitbarmase smitbarmase approved these changes

Assignees

@smitbarmase smitbarmase

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@davidescaccia @smitbarmase @zed-industries-bot