Diff lexer - add extra check for catching duplicate lines #1532
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
As described in rouge-ruby#1531, the Diff lexer was catching lines that started with either --- or +++ however that includes two consecutive --- lines, or two +++ lines. This extra checks considers just the two combos, either ---/+++ or +++/---.
pyrmont
approved these changes
Jun 3, 2020
|
@ci Thanks for taking the time to file the issue and submit the PR. I've merged this in. It'll be part of the next version of Rouge, v3.20.0. That's scheduled for release on Tuesday 9 June 🎉 |
mattt
pushed a commit
to NSHipster/rouge
that referenced
this pull request
May 19, 2021
The `detect?` method in the Diff lexer currently returns true if the text contains a pair of `---` or a pair of `+++`. This causes erroneous matches with various types of text (e.g. certificates). This commit updates the method to only match alternating pairs.
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.
As described in #1531, the Diff lexer was catching lines that started with either --- or +++ however that includes two consecutive --- lines, or two +++ lines.
This extra checks considers just the two combos, either ---/+++ or +++/---.
Hoping I'm not missing anything and we can't actually have diff types that have two consecutive
---or+++lines.This fixes #1531.