Refactor to fully tokenize before formatting #530
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
bitwiseman
changed the title
bitwiseman
force-pushed
the
tokens-first
branch
2 times, most recently
from
43d7684
to
945fab5
Compare
We've been dealing with limitations from incomplete parsing (beautifier#200) for ages. Instead of parsing fully this change tokenizes fully before starting formatting. This should open the door to simplifying parsing and formatting rules. For example, to find an object literal currently, we have to check repeatedly later on for a matching pattern. With this change we could determine as a block is opened whether to treat it as on object-literal or not.
It is hard to see the changes here because of brain-dead diff diff tools. Created a Tokenizer class/scope and moved all tokenizing into it. There are a few cases where sharing data makes sense, so the beautifier references Tokenizer when needed.
bitwiseman
force-pushed
the
tokens-first
branch
from
945fab5
to
216cdc2
Compare
bitwiseman
added a commit
that referenced
this pull request
Sep 24, 2014
Refactor to fully tokenize before formatting
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.
We've been dealing with limitations from incomplete parsing (#200) for ages.
Instead attempting full parsing, this change only tokenizes fully before starting formatting. This should open the door to simplifying parsing and formatting rules.
For example, to find an object literal currently, we have to check repeatedly later on for a matching pattern. With this change we could determine as a block is opened whether to treat it as on object-literal or not (for features like #114, #315, #370).
Next steps could also include cleaning up the factoring for the recognizers for each token, adding a parse-ish pass, and refactoring the beautification rules to make use of the information now available to them.
@evocateur, @einars - please take a look when you have a chance. Any feedback welcome.