Support multiline regex in text filtering (#2857) #2889
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
dgtlmoon
reviewed
Jan 8, 2025
| else: | ||
| ignore_text.append(k.strip()) | ||
|
|
||
| for line in content.splitlines(keepends=True): | ||
| i += 1 | ||
| for r in ignore_regex_multiline: |
There was a problem hiding this comment.
Can you explain what the approach is here so i dont have to manually compile it in my brain?
There was a problem hiding this comment.
It finds all matches over the whole content using finditer, without splitting it into lines.
For each match it calculates the start/end line number by using splitlines on part of the content before the match end, and the number of lines in the matched content.
Instead of accumulating output lines to an array, the line numbers are added to ignored_lines array which is then converted to a set to remove duplicates. This way multiple filtering methods can mark lines as ignored, and the output is constructed as the last step.
dgtlmoon
reviewed
Jan 8, 2025
| @@ -42,6 +41,46 @@ def test_strip_regex_text_func(): | |||
| # Check line number reporting | |||
| stripped_content = html_tools.strip_ignore_text(test_content, ignore_lines, mode="line numbers") | |||
| assert stripped_content == [2, 5, 6, 7, 8, 10] | |||
|
|
|||
| stripped_content = html_tools.strip_ignore_text(test_content, ['/but 1.+5 lines/s']) | |||
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 #2857.
Hopefully this does not break some obscure edge case.