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

scm: select node based on active editor #11560

Merged
merged 2 commits into from
Aug 22, 2022
Merged

Conversation

vince-fugnitto
Copy link
Member

What it does

Fixes: #11558.

The pull-request updates the scm-view to properly select the appropriate node in the changes tree based on the active editor.

How to test

  1. start the application with a workspace under git version control
  2. perform changes in two files
  3. open the scm-view and open the working tree changes for both
  4. switching between the two files should now properly set the tree selection
  5. confirm it works for list and tree view modes
  6. confirm it works for deep nested files
  7. confirm it works for working tree, regular editors, and preview editors

Review checklist

Reminder for reviewers

Signed-off-by: vince-fugnitto [email protected]

@vince-fugnitto vince-fugnitto added the scm issues related to the source control manager label Aug 11, 2022
@vince-fugnitto vince-fugnitto self-assigned this Aug 11, 2022
packages/scm/src/browser/scm-widget.tsx Outdated Show resolved Hide resolved
packages/scm/src/browser/scm-tree-widget.tsx Outdated Show resolved Hide resolved
@vince-fugnitto
Copy link
Member Author

@msujew thank you for the review, I incorporated your suggestions and confirmed it works.

Signed-off-by: vince-fugnitto <[email protected]>
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.

Looks good to me 👍

Copy link
Contributor

@colin-grant-work colin-grant-work left a comment

Choose a reason for hiding this comment

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

Based on our offline discussions, this appears to be the best way to achieve this end. 👍

@vince-fugnitto vince-fugnitto merged commit 1a0ff5f into master Aug 22, 2022
@vince-fugnitto vince-fugnitto deleted the vf/scm-selectnode branch August 22, 2022 19:01
@github-actions github-actions bot added this to the 1.29.0 milestone Aug 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
scm issues related to the source control manager
Projects
None yet
Development

Successfully merging this pull request may close these issues.

scm: file change tree should highlight active editor
3 participants