Skip to content

[Yaml] Allow comments after tab #15747

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 10 commits into from
Closed

[Yaml] Allow comments after tab #15747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5be9c8a
[Yaml] Allow tabs before comments at the end of a line
superdav42 Sep 10, 2015
5dc774b
[Yaml] Allow tabs before comments at the end of a line
superdav42 Sep 10, 2015
85374e5
Merge branch 'YamlCommentsAfterTab' of github.com:superdav42/symfony …
superdav42 Sep 10, 2015
61912dd
Merge branch 'YamlCommentsAfterTab' of github.com:superdav42/symfony …
superdav42 Sep 10, 2015
f1858a1
Comply with coding standards
superdav42 Sep 10, 2015
f113b42
Merge branch 'YamlCommentsAfterTab' of github.com:superdav42/symfony …
superdav42 Sep 10, 2015
c32d06d
[Yaml] Allow tabs before comments at the end of a line
superdav42 Sep 10, 2015
90f7bf6
Comply with coding standards
superdav42 Sep 10, 2015
c5ed133
Use Yoda style Comments
superdav42 Sep 14, 2015
9b39c42
Merge branch 'YamlCommentsAfterTab' of github.com:superdav42/symfony …
superdav42 Sep 14, 2015
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
2 changes: 1 addition & 1 deletion src/Symfony/Component/Yaml/Inline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter
$i += strlen($output);

// remove comments
if (false !== $strpos = strpos($output, ' #')) {
if ((false !== $strpos = strpos($output, '#')) && (' ' === $output[$strpos - 1] || "\t" === $output[$strpos - 1])) {
$output = rtrim(substr($output, 0, $strpos));
}
} elseif (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
Expand Down
3 changes: 2 additions & 1 deletion src/Symfony/Component/Yaml/Tests/Fixtures/sfComments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ yaml: |
ex2: "foo # bar" # comment
ex3: 'foo # bar' # comment
ex4: foo # comment
ex5: foo # comment with tab before
php: |
array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo')
array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo', 'ex5' => 'foo')
---
test: Comments in the middle
brief: >
Expand Down