[Yaml] fix parse error when unindented collections contain a comment #36683
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
xabbuh
approved these changes
May 4, 2020
|
For 3.4? |
|
@xabbuh - I could not test it for 3.4 and 4.0, only for 5.0 - I get an out-of-mem error when running |
nicolas-grekas
changed the title
|
@wdiesveld No problem, I have changed the base branch and rebased your changes. Thank you for working on this issue. |
fabpot
approved these changes
May 4, 2020
|
Thank you @wdiesveld. |
|
Awesome. Congratulations to your first contribution! |
This was referenced May 31, 2020
Merged
Merged
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.
Problem
The method
Parser::getNextEmbedBlockdid not determine the yaml-block correctly when there was a comment before the first unindented collection item. This was caused by the fact that the check for unindented collection items was done for the first line of the block only. So in case this first line is a comment, this check will result in false, while in fact the parser is in an unindented collection.Solution
In the solution I implemented the parser will check for comment lines as well. As long as the loop encounters a comment line, it will check (in the next iteration) whether the line is an unindented collection item. So this check will be done until all comments before the first uncommented item are parsed.