Rewrite diff syntax highlighter #466
Merged
Conversation
This file contains 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
The previous DiffSyntaxHighlighter worked adequately, but because it was stateless, it needed a lot of complicated regular expressions to try to match all the possible diff header lines. It could also be thrown off, if for example a line was removed starting with '-- ', the resulting diff line would start with '--- ', causing the syntax highlighter to interpret it as a header line instead of a removal. To address these shortcomings, completely rewrite the syntax highlighter to be stateful. This greatly simplifies the logic and drastically reduces the number of regular expressions that need to be matched. Because DiffSyntaxHighlighter was the only user of GenericSyntaxHighlighter, and GenericSyntaxHighlighter does not fit the stateful approach, eliminate GenericSyntaxHighlighter (moving a few necessary bits to DiffSyntaxHighlighter) and move DiffSyntaxHighlighter from qtutils to widgets.diff, where it is actually used. Closes git-cola#462 Reported-by: Andreas Sommer <andreas.sommer87@googlemail.com> Signed-off-by: Daniel Harding <dharding@living180.net>
|
Nicely done. 👏 |
davvid
added a commit
that referenced
this pull request
Jun 16, 2015
diff: rewrite diff syntax highlighter Signed-off-by: David Aguilar <davvid@gmail.com>
|
Changed/new commits in submodules are now gray text instead of black. Intended? |
|
No, I intended to preserve pre-existing behavior (modulo an additional bug I found in the old code). I'll try to look at what is going on this week to see about getting a fix in. Thanks for testing! |
Merged
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 previous
DiffSyntaxHighlighterworked adequately, but because it was stateless, it needed a lot of complicated regular expressions to try to match all the possible diff header lines. It could also be thrown off, if for example a line was removed starting with'-- ', the resulting diff line would start with'--- ', causing the syntax highlighter to interpret it as a header line instead of a removal. To address these shortcomings, completely rewrite the syntax highlighter to be stateful. This greatly simplifies the logic and drastically reduces the number of regular expressions that need to be matched. BecauseDiffSyntaxHighlighterwas the only user ofGenericSyntaxHighlighter, andGenericSyntaxHighlighterdoes not fit the stateful approach, eliminateGenericSyntaxHighlighter(moving a few necessary bits toDiffSyntaxHighlighter) and moveDiffSyntaxHighlighterfromqtutilstowidgets.diff, where it is actually used.Closes #462.