[Yaml] Allow tabs before comments at the end of a line #15793
Merged
Conversation
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
| @@ -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])) { | |||
There was a problem hiding this comment.
wouldn't this break in case # is the first char is $output ?
There was a problem hiding this comment.
and this would look for the wrong char in this case:
foo: test#foo # comment here|
the current implementation is buggy. status: needs work |
e27f69d to
4fb5c12
Compare
|
@stof New revision should work in all cases. Also added test case mentioned to tests. |
| @@ -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, ' #')) || (false !== $strpos = strpos($output, "\t#"))) { | |||
There was a problem hiding this comment.
What if there is a mix of tabs and spaces?
There was a problem hiding this comment.
the case being broke is when you have \t# #, where it would use the second one. We need to check for both positions and use the smaller one.
|
@superdav42 Any news? |
In Yaml 1.2 spec white space is space or tab
4fb5c12 to
d040be7
Compare
|
@fabpot Updated to use preg_match, now works for all test cases. |
|
Thank you @superdav42. |
fabpot
added a commit
that referenced
this pull request
Oct 7, 2015
…perdav42) This PR was merged into the 2.3 branch. Discussion ---------- [Yaml] Allow tabs before comments at the end of a line | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT If a yml file has a tab character before a line ending comment the comment will be included in the parsed value. Yaml spec allows tab or space as whitespace characters so we need to check for tab as well. See included test. Recently caused an odd and hard to find bug in our project. See spec: http://www.yaml.org/spec/1.2/spec.html#s-b-comment http://www.yaml.org/spec/1.2/spec.html#s-separate-in-line http://www.yaml.org/spec/1.2/spec.html#s-white This is a new PR replacing #15747 @fabpot Commits ------- d040be7 [Yaml] Allow tabs before comments at the end of a line
This was referenced Oct 27, 2015
Closed
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.
If a yml file has a tab character before a line ending comment the comment will be included in the parsed value. Yaml spec allows tab or space as whitespace characters so we need to check for tab as well. See included test.
Recently caused an odd and hard to find bug in our project.
See spec:
http://www.yaml.org/spec/1.2/spec.html#s-b-comment
http://www.yaml.org/spec/1.2/spec.html#s-separate-in-line
http://www.yaml.org/spec/1.2/spec.html#s-white
This is a new PR replacing #15747
@fabpot