Partially fix formatting when edits are rejected#45
Open
mcelrath wants to merge 1 commit intogergap:masterfrom
Open
Partially fix formatting when edits are rejected#45mcelrath wants to merge 1 commit intogergap:masterfrom
mcelrath wants to merge 1 commit intogergap:masterfrom
Conversation
gergap
reviewed
Feb 28, 2025
Comment on lines
+657
to
+658
| start_line = group.get('start_line', 1) - g_restored_lines | ||
| end_line = group.get('end_line', 1) - g_restored_lines |
Owner
There was a problem hiding this comment.
I don't think this is correct. Restored lines are "deleted lines" that were restored by rejecting this change.
We need to add this new lines to compensate the changed line numbers after this change, so that the next change is proceeded at the correct start_line.
When lines are added (restored) the start_line of the next change must increase.
gergap
reviewed
Feb 28, 2025
| VimHelper.DeleteLine(lineno) | ||
| VimHelper.DeleteLine(start_line) | ||
| g_restored_lines += 1 | ||
| lineno += 1 |
Owner
There was a problem hiding this comment.
The current lineno does not change when deleting a line (undoing the add).
Maybe we need a g_restored_lines -= 1 here? Incrementing makes no sense.
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.
This is a stab at fixing #36. It fixes the formatting after rejecting an edit for the one example I was testing on, but there is a lot of other problems with this code, so don't merge this yet.
An error was getting thrown:
because lineno was not being tracked correctly, and a bunch of vim signs were getting added to the same line after removal. So instead I call
VimHelper.DeleteLine(start_line)-- if it's a block of pure adds, they appear to all be on the same line.The code for "changed" lines is pretty borked though. That should only get applied if it's a one-line change, and be shown as adds and deletes if not.