Fixed inline comments parsing #148
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
The newline is now included as separate token, previously it was silently discarded, so it was not present in output. See phpmyadmin/phpmyadmin#13139 Signed-off-by: Michal Čihař <michal@cihar.com>
Concatenating line terminated comments will change the query. Signed-off-by: Michal Čihař <michal@cihar.com>
Codecov Report
@@ Coverage Diff @@
## master #148 +/- ##
=======================================
Coverage 100% 100%
- Complexity 1682 1687 +5
=======================================
Files 55 55
Lines 3950 3956 +6
=======================================
+ Hits 3950 3956 +6Continue to review full report at Codecov.
|
devenbansod
approved these changes
Apr 5, 2017
| // Include trailing \n as whitespace token | ||
| if ($this->last < $this->len) { | ||
| $this->last--; | ||
| } | ||
|
|
There was a problem hiding this comment.
I am not very familiar with the Lexer code, but I believe this makes sense. Having the whitespaces as a separate whitespace token makes sense.
nijel
added a commit
that referenced
this pull request
Apr 6, 2017
Signed-off-by: Michal Čihař <michal@cihar.com>
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.
This is different approach than #147 to fix phpmyadmin/phpmyadmin#13139.
Please review the changes.