-
Notifications
You must be signed in to change notification settings - Fork 1
🐛 Fix space handling (#51) #54
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,54 @@ | |
| "end_column": 17, | ||
| }, | ||
| ), | ||
| # Test case for leading space after start sequence (bug fix) | ||
| ( | ||
| f"@ title 1, IMPL_1 {UNIX_NEWLINE}", | ||
| { | ||
| "title": "title 1", | ||
| "id": "IMPL_1", | ||
| "type": "impl", | ||
| "links": [], | ||
| "start_column": 1, | ||
| "end_column": 18, | ||
| }, | ||
| ), | ||
| # Test case for multiple leading spaces after start sequence | ||
| ( | ||
| f"@ title 1, IMPL_1 {UNIX_NEWLINE}", | ||
| { | ||
| "title": "title 1", | ||
| "id": "IMPL_1", | ||
| "type": "impl", | ||
| "links": [], | ||
| "start_column": 1, | ||
| "end_column": 20, | ||
| }, | ||
| ), | ||
| # Test case for trailing space before end sequence | ||
| ( | ||
| f"@title 1, IMPL_1 {UNIX_NEWLINE}", | ||
| { | ||
| "title": "title 1", | ||
| "id": "IMPL_1", | ||
| "type": "impl", | ||
| "links": [], | ||
| "start_column": 1, | ||
| "end_column": 18, | ||
| }, | ||
| ), | ||
| # Test case for both leading and trailing spaces | ||
| ( | ||
| f"@ title 1, IMPL_1 {UNIX_NEWLINE}", | ||
| { | ||
| "title": "title 1", | ||
| "id": "IMPL_1", | ||
| "type": "impl", | ||
| "links": [], | ||
| "start_column": 1, | ||
| "end_column": 21, | ||
| }, | ||
| ), | ||
| ], | ||
| ) | ||
| def test_oneline_parser_default_config_positive( | ||
|
|
@@ -34,6 +82,99 @@ def test_oneline_parser_default_config_positive( | |
| assert oneline_need == result | ||
|
|
||
|
|
||
| # Test case for space as field separator (as mentioned by Kilian) | ||
| # Example: @Implementation <field1> <field2> | ||
| ONELINE_COMMENT_STYLE_SPACE_SEPARATOR = OneLineCommentStyle( | ||
| start_sequence="@", | ||
| end_sequence=UNIX_NEWLINE, | ||
| field_split_char=" ", | ||
| needs_fields=[ | ||
| {"name": "title"}, | ||
| {"name": "id"}, | ||
| {"name": "type", "default": "impl"}, | ||
| ], | ||
| ) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "oneline, result", | ||
| [ | ||
| # Basic space-separated fields | ||
| ( | ||
| f"@Implementation IMPL_1{UNIX_NEWLINE}", | ||
| { | ||
| "title": "Implementation", | ||
| "id": "IMPL_1", | ||
| "type": "impl", | ||
| "start_column": 1, | ||
| "end_column": 22, | ||
| }, | ||
| ), | ||
| # Space separator with explicit type | ||
| ( | ||
| f"@MyFeature FEAT_001 feature{UNIX_NEWLINE}", | ||
| { | ||
| "title": "MyFeature", | ||
| "id": "FEAT_001", | ||
| "type": "feature", | ||
| "start_column": 1, | ||
| "end_column": 27, | ||
| }, | ||
| ), | ||
| # Leading space after @ (the bug Kilian reported) | ||
| ( | ||
| f"@ Implementation IMPL_2{UNIX_NEWLINE}", | ||
| { | ||
| "title": "Implementation", | ||
| "id": "IMPL_2", | ||
| "type": "impl", | ||
| "start_column": 1, | ||
| "end_column": 23, | ||
| }, | ||
| ), | ||
| # Trailing space before newline | ||
| ( | ||
| f"@Implementation IMPL_3 {UNIX_NEWLINE}", | ||
| { | ||
| "title": "Implementation", | ||
| "id": "IMPL_3", | ||
| "type": "impl", | ||
| "start_column": 1, | ||
| "end_column": 23, | ||
| }, | ||
| ), | ||
| # Multiple leading spaces after @ | ||
| ( | ||
| f"@ Title ID_456{UNIX_NEWLINE}", | ||
| { | ||
| "title": "Title", | ||
| "id": "ID_456", | ||
| "type": "impl", | ||
| "start_column": 1, | ||
| "end_column": 15, | ||
| }, | ||
| ), | ||
| # Title contain spaces | ||
| ( | ||
| f"@ Title\ escape\ space ID_456{UNIX_NEWLINE}", | ||
| { | ||
| "title": "Title escape space", | ||
| "id": "ID_456", | ||
| "type": "impl", | ||
| "start_column": 1, | ||
| "end_column": 30, | ||
| }, | ||
| ), | ||
| ], | ||
| ) | ||
| def test_oneline_parser_space_separator( | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Greate! Could you add the following test case? so that we know escaping separator works? (I tested it works) # Title contain spaces
(
f"@ Title\ escape\ space ID_456{UNIX_NEWLINE}",
{
"title": "Title escape space",
"id": "ID_456",
"type": "impl",
"start_column": 1,
"end_column": 30,
},
), |
||
| oneline: str, result: dict[str, str | list[str]] | ||
| ) -> None: | ||
| """Test oneline parser with space as field separator.""" | ||
| oneline_need = oneline_parser(oneline, ONELINE_COMMENT_STYLE_SPACE_SEPARATOR) | ||
| assert oneline_need == result | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "oneline, result", | ||
| [ | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.