fix(PatchProcessor): Fixup encoding for diff text #12091
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
RussKie
approved these changes
Dec 6, 2024
gerhardol
approved these changes
Dec 7, 2024
fix(PatchProcessor): Fixup StartOfContentsRegex Refs: gitextensions#12091
fix(PatchProcessor): Fixup StartOfContentsRegex Similar for GetSubmodulesInfo() (in submodules form and Plugins for statistics). Refs: gitextensions#12091
gerhardol
reviewed
Dec 7, 2024
| @@ -39,7 +39,7 @@ private enum PatchProcessorState | |||
| [GeneratedRegex(@$"(---|\+\+\+) [""]?[^/\s]+/(?<filename>.*)[""]?", RegexOptions.ExplicitCapture)] | |||
| private static partial Regex FileNameRegex(); | |||
|
|
|||
| [GeneratedRegex(@$"^({_escapeSequenceRegex})?[ -+@]", RegexOptions.ExplicitCapture)] | |||
| [GeneratedRegex(@$"^({_escapeSequenceRegex})?[-+@ ]", RegexOptions.ExplicitCapture)] | |||
There was a problem hiding this comment.
To further clarify
Suggested change
| [GeneratedRegex(@$"^({_escapeSequenceRegex})?[-+@ ]", RegexOptions.ExplicitCapture)] | |
| [GeneratedRegex(@$"^({_escapeSequenceRegex})?[\-+@ ]", RegexOptions.ExplicitCapture)] |
I searched for other occurrences, found one other, with no importance.
Also some testcases.
Pushed to private branch, suggest it is included
gerhardol
approved these changes
Dec 7, 2024
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.
Fixes #12066
Proposed changes
PatchProcessor.StartOfContentsRegex: Move'-'to first position inside"[ -+@]"in order to avoid special meaning in regex.This made
CreatePatchFromStringchoose the wrong encoding for removed line.Screenshots
Before
After
Test methodology
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.