Fix #1601 Allow strings to have trailing comments #1602
Merged
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
Updates the string regex to allow for strings that may have a trailing '#'. This uses a different pattern from other regex patterns, because only the string regex pattern is greedy, while the others are not.
RunDevelopment
requested changes
Oct 29, 2018
There was a problem hiding this comment.
Thank you for this PR!
I left a comment with one minor thing to do and it'd be great if you were to add this case to the YAML string test.
components/prism-yaml.js
Outdated
| @@ -31,7 +31,7 @@ Prism.languages.yaml = { | |||
| alias: 'important' | |||
| }, | |||
| 'string': { | |||
| pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}))/m, | |||
| pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|(\s*#)))/m, | |||
There was a problem hiding this comment.
Please remove the capturing group around \s*#.
components/prism-yaml.js
Outdated
| @@ -31,7 +31,7 @@ Prism.languages.yaml = { | |||
| alias: 'important' | |||
| }, | |||
| 'string': { | |||
| pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}))/m, | |||
| pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|(?:\s*#)))/m, | |||
There was a problem hiding this comment.
I meant that you don't need the group at all...
Sorry for not making myself clear enough.
There was a problem hiding this comment.
My mistake, I had assumed that a grouping would be necessary. I just tried it and you are right.
This grouping was actually not required
|
Perfect! @mAAdhaTTah I think we are ready to merge. |
|
Thank you for the contribution! |
This was referenced Oct 26, 2019
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.
Fixes #1601
Updates the string regex to allow for strings that may have a trailing '#'. This uses a different pattern from other regex patterns, because only the string regex pattern is greedy, while the others are not.
Example
Using the example code from #1601 , I get this result: