fix for spaces and quotes in jinja block matching #208
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
nicholasyager
approved these changes
May 9, 2024
There was a problem hiding this comment.
@dave-connors-3 Great turn around time on this! The extensive tests make me feel quite comfortable with this change's ability to fix our users' issues. I left a small non-blocking comment to remove an old regex comment. Otherwise, this looks great!
Comment on lines
+133
to
+135
| def test_from_file_detects_block_range_special_character(self): | ||
| range = JinjaBlock.find_block_range(special_character, "docs", "cust-omer_id") | ||
| assert range == (2, 73) |
There was a problem hiding this comment.
I'm happy to see that the inner dash is still identified correctly!
| @@ -24,7 +24,8 @@ def find_block_range(file_content: str, block_type: str, name: str) -> Tuple[int | |||
| end_line = None | |||
|
|
|||
| for match in re.finditer( | |||
| r"{%-?\s+" + block_type + r"\s+" + name + r"([(a-zA-Z0-9=,_ )]*)\s-?%}", | |||
| r"{%-?\s*" + block_type + r"\s*" + name + r"\s*([(a-zA-Z0-9=,_ \'\")]*)\s*-?%}", | |||
There was a problem hiding this comment.
Good call swapping the + for *!
Co-authored-by: Nicholas A. Yager <yager@nicholasyager.com>
nicholasyager
approved these changes
May 21, 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.
closes #205
Some users saw issues when we collected jinja blocks due to a few shortcomings of our regex matching for jinja blocks, namely:
{%docs my_docs %}vs{% docs my_docs %}The fix for problem 1 was fairly straightforward, just updating our space matches to be
zero or more. In testing, i also found we were lacking support for default values that included quote characters.I didn't make any adjustments for special characters, but did add a test for a block name with a special character, and it seemed to pass. Happy to change that if this test is insufficient!