Skip to content

[Yaml] Fix wrong line number when comments are inserted in the middle of a block. #17733

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.

Sign up for GitHub

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

Closed
wants to merge 7 commits into from
Closed

[Yaml] Fix wrong line number when comments are inserted in the middle of a block. #17733

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
88d210f
[Yaml] Fix wrong line number when comments are inserted in the middle…
paradajozsef Feb 8, 2016
0644b84
[Yaml] Fix wrong line number when comments are inserted in the middle…
paradajozsef Feb 11, 2016
dac814c
[Yaml] Fix wrong line number when comments are inserted in the middle…
paradajozsef Feb 12, 2016
2a082b0
[Yaml] Fix wrong line number when comments are inserted in the middle…
paradajozsef Feb 13, 2016
343ee3e
[Yaml] Fix wrong line number when comments are inserted in the middle…
paradajozsef Feb 13, 2016
bf4501a
[Yaml] Fix comment and change method name
paradajozsef Apr 30, 2016
c8b34a7
Coding standard + unnecessary comment fixes.
paradajozsef May 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Yaml] Fix comment and change method name
  • Loading branch information
@paradajozsef
paradajozsef committed May 6, 2016
commit bf4501a535237dceeafa4b8042fbfdd6f61b237a
6 changes: 3 additions & 3 deletions src/Symfony/Component/Yaml/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
}

// we ignore "comment" lines only when we are not inside a scalar block
if (empty($blockScalarIndentations) && $this->isCurrentLineComment() && false === $this->isPreviousNonCommentLineIsCollectionItem()) {
if (empty($blockScalarIndentations) && $this->isCurrentLineComment() && false === $this->checkIfPreviousNonCommentLineIsCollectionItem()) {
continue;
}

Expand Down Expand Up @@ -826,11 +826,11 @@ private function isCurrentLineCollectionItem()
}

/**
* Tests whether or not the current comment line is in a collection.
* Tests whether the current comment line is in a collection.
*
* @return bool
*/
private function isPreviousNonCommentLineIsCollectionItem()
private function checkIfPreviousNonCommentLineIsCollectionItem()
{
$isCollectionItem = false;
$moves = 0;
Expand Down