Lexer, helpers and comments cleanup #5063
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
… clearer that it only happens once
…ass through the parser into the node classes
…ent them in the nodes class
helixbass
approved these changes
May 13, 2018
| @@ -946,19 +947,19 @@ exports.Lexer = class Lexer | |||
|
|
|||
| # Same as `token`, except this just returns the token without adding it | |||
| # to the results. | |||
| makeToken: (tag, value, offsetInChunk = 0, length = value.length) -> | |||
| makeToken: (tag, value, offsetInChunk = 0, length = value.length, origin) -> | |||
There was a problem hiding this comment.
@GeoffreyBooth ah I see ya once this is merged I can merge into preserve-string-literal and convert to an option arg that gets passed along by token()
src/helpers.coffee
Outdated
| # and therefore matching `tokenHash`es, merge the comments from both/all | ||
| # tokens together into one array, even if there are duplicate comments; | ||
| # they will get sorted out later. | ||
| if tokenData[tokenHash].comments? |
There was a problem hiding this comment.
@GeoffreyBooth I know this is just basically moving existing code, but a way I like to write this pattern is:
(tokenData[tokenHash].comments ?= []).push token.comments...
|
Thanks @helixbass I made the change you recommended. |
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.
#5045 had various improvements to comments and the lexer that were unrelated to that PR’s goal of passing extra token data through the parser. This PR wraps up those unrelated improvements.
@helixbass @zdenko