Staging area: fix issues with refreshing editor highlighting for new and untracked files. #3359
Conversation
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
For untracked files, GitStageLineStatusTrackerProvider#loadContent normally returns null. However, for added files empty TrackedContent instances are created. If such a file becomes unstaged, loadContent is not invoked again because the HEAD position is unchanged, leaving stale editor highlighting in place. This commit prevents base content from being created for untracked files, avoiding incorrect highlighting. IJPL-225212
…fter committing new file After a commit, GitStageLineStatusTrackerProvider#loadContent may be invoked while GitStageTracker statuses are not up-to-date yet. In particular, after committing a new file, its status can temporarily remain added, causing loadContent to return empty content. Once the status is refreshed, loadContent is not called again because the HEAD position has not changed, leaving base content outdated. This commit includes the file status in ContentInfo so that status changes can trigger a loadContent call. IJPL-181327
…aded for unchanged files When an added file becomes untracked again, it may be briefly reported as unchanged because GitUntrackedFilesHolder and GitStagingAreaHolder are refreshed independently. During this period GitStageLineStatusTrackerProvider can try to load base content and report a warning. This commit logs the condition at debug level instead to avoid polluting log files.
Contributor
Author
|
JFYI: if these commits are applied, mind the commit message: git can trim the "[git-index]" prefix from the message when applying a patch. |
| catch (e: VcsException) { | ||
| LOG.warn("Can't load base revision content for ${file.path} with status $status", e) | ||
| val message = "Can't load base revision content for ${file.path} with status $status" | ||
| if (status.isNotChanged()) LOG.debug(message, e) else LOG.warnWithDebug(message, e) |
Member
There was a problem hiding this comment.
It seems ok for now, but probably it's better to classify isNotChanged via another subtype of VcsException or simply downgrade here to debug level.
Member
|
Small typo in cbd1438: @juliabeliaeva Thank you for your PR, looks good to me! |
intellij-monorepo-bot
pushed a commit
that referenced
this pull request
Jan 13, 2026
…after committing new file After a commit, GitStageLineStatusTrackerProvider#loadContent may be invoked while GitStageTracker statuses are not up-to-date yet. In particular, after committing a new file, its status can temporarily remain added, causing loadContent to return empty content. Once the status is refreshed, loadContent is not called again because the HEAD position has not changed, leaving base content outdated. This commit includes the file status in ContentInfo so that status changes can trigger a loadContent call. IJPL-181327 closes #3359 GitOrigin-RevId: 1eea8198563e897ecd91d28fdbe3ffb9ddaa48d1
intellij-monorepo-bot
pushed a commit
that referenced
this pull request
Jan 13, 2026
…oaded for unchanged files IJPL-225212, IJPL-181327 When an added file becomes untracked again, it may be briefly reported as unchanged because GitUntrackedFilesHolder and GitStagingAreaHolder are refreshed independently. During this period GitStageLineStatusTrackerProvider can try to load base content and report a warning. This commit logs the condition at debug level instead to avoid polluting log files. closes #3359 GitOrigin-RevId: befcee2cfa6889f714bc9fb5533bfaf3f536e984
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This PR provides fixes for the following issues:
The causes of both issues are related:
More details are in commit descriptions.