git: clear blame information when switching to editor with no diff info#309179
Open
yogeshwaran-c wants to merge 1 commit intomicrosoft:mainfrom
Open
git: clear blame information when switching to editor with no diff info#309179yogeshwaran-c wants to merge 1 commit intomicrosoft:mainfrom
yogeshwaran-c wants to merge 1 commit intomicrosoft:mainfrom
Conversation
When switching from a git-tracked file to a file with no SCM diff information (e.g. a file outside any repository, or a virtual/read-only document), _updateTextEditorBlameInformation returned early because `textEditor.diffInformation` was undefined. This left the previous file's blame decoration and status-bar item visible for the new editor. Separate the two early-exit conditions so that the race-condition guard (textEditor !== activeTextEditor) still returns silently, while the missing-diff-info case explicitly clears textEditorBlameInformation before returning.
Contributor
📬 CODENOTIFYThe following users are being notified based on files changed in this PR: @lszomoruMatched files:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When switching from a git-tracked file to a file with no SCM diff information (e.g. a file outside any repository, a virtual document, or an untitled file),
_updateTextEditorBlameInformationreturned early becausetextEditor.diffInformationwasundefined. The two conditions were ORed together in a single guard:This meant the "no diff info" path returned without clearing
textEditorBlameInformation, leaving the previous file's blame decoration and status-bar item visible in the new editor.Fix: Separate the two guards so each has the correct side-effect:
textEditor !== window.activeTextEditor) — return silently; don't touch state, since we're processing a stale event.!textEditor.diffInformation) — settextEditorBlameInformation = undefinedbefore returning, so decorations and the status-bar are cleared.Files changed
extensions/git/src/blame.ts—_updateTextEditorBlameInformation()