Keep a stale hint from reaching into the next member - #785
Merged
Conversation
The recorded line is tried before anything else, so that two snapshots in one member stay apart. But it was tried whenever it sat at or below the member's declaration, with nothing above it - and a member's declaration bounds the search from below only, so "below" reaches to the end of the file. That makes the hint outrank the member name in exactly the case the member name exists for. A hint goes stale as soon as anything above it is edited, and a stale one pointing into the test next door rewrote that test's identical snapshot and left this one as it was, reporting Applied. Only take the hint when no declaration sits between the member's own and it, which is the cheap half of asking whether the hint is still inside the member. When no member was named there is nothing to be outside of, and the hint is all there is - so that path is untouched.
…pes-member # Conflicts: # src/DiffEngine.Tests/InlinePatcherTests.cs
…pes-member # Conflicts: # src/DiffEngine.Tests/InlinePatcherTests.cs
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
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.
The recorded line is tried before anything else, so that two snapshots in one
member stay apart. But it was tried whenever it sat at or below the member's
declaration, with nothing above it - and a member's declaration bounds the
search from below only, so "below" reaches to the end of the file.
That makes the hint outrank the member name in exactly the case the member name
exists for. A hint goes stale as soon as anything above it is edited, and a
stale one pointing into the test next door rewrote that test's identical
snapshot and left this one as it was, reporting Applied.
Only take the hint when no declaration sits between the member's own and it,
which is the cheap half of asking whether the hint is still inside the member.
When no member was named there is nothing to be outside of, and the hint is all
there is - so that path is untouched.