internal: Tweak change collapsing #14034
Merged
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
rustbot
added
the
S-waiting-on-review
lnicola
force-pushed
the
tweak-change-collapsing
branch
from
026a61b to
fe30f3c
Compare
|
Not really tested, merge with care 😅. |
lnicola
force-pushed
the
tweak-change-collapsing
branch
3 times, most recently
from
d4598f6 to
0e265c3
Compare
lnicola
commented
Jan 26, 2023
| (Modify, Modify) => {} | ||
| // equivalent to `Modify` | ||
| (change @ Delete, Create) => *change = Modify, | ||
| // shouldn't occur, but collapse into `Create` |
There was a problem hiding this comment.
Small change in behavior on these two.
Veykril
approved these changes
Jan 26, 2023
| // We need to fix up the changed events a bit. If we have a create or modify for a file | ||
| // id that is followed by a delete we actually skip observing the file text from the | ||
| // earlier event, to avoid problems later on. | ||
| file_changes.clear(); |
lnicola
force-pushed
the
tweak-change-collapsing
branch
from
0e265c3 to
683cc8b
Compare
lnicola
force-pushed
the
tweak-change-collapsing
branch
from
683cc8b to
deff5f2
Compare
|
This wasn't was actually no longer dropping the |
|
@bors r+ |
|
☀️ Test successful - checks-actions |
1 similar comment
|
☀️ Test successful - checks-actions |
|
👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request. |
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.
CC #14025 (comment).