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

Remove colons after empty strings in diff labels #9786

Merged
merged 1 commit into from
Jul 28, 2021

Conversation

colin-grant-work
Copy link
Contributor

Signed-off-by: Colin Grant colin.grant@ericsson.com

What it does

In the screenshots for #9765, it is clear that diff widgets can wind up with rather odd initial : characters. This is due to faulty logic in the label provider for DiffUris, which doesn't check whether a .displayName is available before creating certain prefixes that use it.

How to test

  1. Open two or more editors.
  2. Use the Open Editors widget context menu to select one for comparison and compare another with that selection.
  3. Observe that the title of the diff widget that appears does not contain a leading : character unless that colon is preceded by actual text.

Review checklist

Reminder for reviewers

Signed-off-by: Colin Grant <colin.grant@ericsson.com>
@vince-fugnitto vince-fugnitto added the diff editor issues related to the diff editor label Jul 27, 2021
Copy link
Member

@vince-fugnitto vince-fugnitto left a comment

Choose a reason for hiding this comment

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

I confirmed that the diff label bug of #9765 is resolved with the issue 👍

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 issue exists on master is addressed nicely by this change.

@colin-grant-work colin-grant-work merged commit 402a8d9 into master Jul 28, 2021
@colin-grant-work colin-grant-work deleted the bugfix/diff-labels branch July 28, 2021 14:04
@github-actions github-actions bot added this to the 1.16.0 milestone Jul 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
diff editor issues related to the diff editor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants