Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git: re-add support for git decoration preferences #11674

Merged
merged 2 commits into from
Sep 20, 2022

Conversation

vince-fugnitto
Copy link
Member

@vince-fugnitto vince-fugnitto commented Sep 16, 2022

What it does

The pull-request re-adds support for git.decorations.enabled and git.decorations.colors which were previously not referenced and supported after a change in #8911 (v1.14.0).

git-decorations.mov

How to test

  1. start the application with a workspace that is under version control
  2. perform some changes in the workspace, (create new files, modifications, deletions)
  3. open the preferences-view
  4. search for git decorations
  5. confirm that toggling git.decorations.enabled hides/shows decorations in the navigator for the resources
  6. confirm that toggling git.decorations.colors hides/displays colors for the decorations in the navigator for the resources
  7. confirm the preferences are respected on startup

Review checklist

Reminder for reviewers

Signed-off-by: vince-fugnitto vincent.fugnitto@ericsson.com

The commit re-adds support for `git.decorations.enabled` and `git.decorations.colors` which were previously not referenced and supported after a change in `v1.14.0`.

Signed-off-by: vince-fugnitto <vincent.fugnitto@ericsson.com>
@vince-fugnitto vince-fugnitto added git issues related to git navigator issues related to the navigator/explorer labels Sep 16, 2022
@vince-fugnitto vince-fugnitto self-assigned this Sep 16, 2022
@msujew msujew self-requested a review September 16, 2022 15:02
Copy link
Member

@msujew msujew left a comment

Choose a reason for hiding this comment

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

I can confirm that the changes work as expected. I have some comments though, see below.

packages/git/src/browser/git-decoration-provider.ts Outdated Show resolved Hide resolved
packages/git/src/browser/git-decoration-provider.ts Outdated Show resolved Hide resolved
packages/git/src/browser/git-decoration-provider.ts Outdated Show resolved Hide resolved
packages/git/src/browser/git-decoration-provider.ts Outdated Show resolved Hide resolved
Signed-off-by: vince-fugnitto <vincent.fugnitto@ericsson.com>
@vince-fugnitto
Copy link
Member Author

@msujew thank you for your help, I like it better than having to cache the event itself.

Copy link
Member

@msujew msujew left a comment

Choose a reason for hiding this comment

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

The changes look good to me 👍

  • Decorations are applied/colored correctly when both preferences are enabled
  • Decorations can be completely disabled
  • Decoration colors can be disabled independently of that
  • Changes these preferences is applied correctly and instantly

Copy link
Contributor

@alvsan09 alvsan09 left a comment

Choose a reason for hiding this comment

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

I have verified the changes as per instructions and with a different theme and it works as expected ! 👍

The code looks good to me as well !!

@vince-fugnitto vince-fugnitto merged commit 559c6ca into master Sep 20, 2022
@vince-fugnitto vince-fugnitto deleted the vf/git-preferences branch September 20, 2022 13:45
@github-actions github-actions bot added this to the 1.30.0 milestone Sep 20, 2022
EstFoisy pushed a commit to EstFoisy/theia that referenced this pull request Sep 20, 2022
The commit re-adds support for `git.decorations.enabled` and `git.decorations.colors` which were previously not referenced and supported after a change in `v1.14.0`.

Signed-off-by: vince-fugnitto <vincent.fugnitto@ericsson.com>
Co-authored-by: Mark Sujew <mark.sujew@typefox.io>
EstFoisy pushed a commit to EstFoisy/theia that referenced this pull request Sep 21, 2022
The commit re-adds support for `git.decorations.enabled` and `git.decorations.colors` which were previously not referenced and supported after a change in `v1.14.0`.

Signed-off-by: vince-fugnitto <vincent.fugnitto@ericsson.com>
Co-authored-by: Mark Sujew <mark.sujew@typefox.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
git issues related to git navigator issues related to the navigator/explorer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants