Handle mixed spaces and tabs. #234
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
This allows the parser to handle tabs and spaces. Currently it requires that spaces come after any tabs, which is slightly more strict than python3. It also requires that neighboring indentation levels have either both more spaces and tabs or less spaces and tabs so that tab size can't make perception of indentation differ from what the parser interprets. I didn't opt to implement PartialOrd on IndentationLevel because I wasn't sure that the comparison logic would meet the logical requirements for that trait. One could easily switch to having it implement PartialOrd though. This would necessitate switching to manually implementing PartialEq so that it's behavior 'matches'. It's unclear from the docs what 'matches' exactly means so for now I'm avoiding implementing the traits.
|
This is a first pass. Not sure if it's the best behavior or the best way to implement the logic but it does handle some of the cases of tab usage. |
|
The neighboring spaces needing strictly more spaces and tabs or less spaces and tabs is a Python 3 thing, but it looks like Python 3 allows reordering where those spaces are. I think it would be pretty easy to switch to that behavior, but it actually breaks the avowed goal of not having indentation dependent on the size of a tab (because tabs tend to fill in toward a multiple). For example, python 3 considers |
|
Sorry, forgot rustfmt again... |
|
Nice job! |
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 allows the parser to handle tabs and spaces. Currently it
requires that spaces come after any tabs, which is slightly more
strict than python3. It also requires that neighboring indentation
levels have either both more spaces and tabs or less spaces and
tabs so that tab size can't make perception of indentation
differ from what the parser interprets.
I didn't opt to implement PartialOrd on IndentationLevel because I
wasn't sure that the comparison logic would meet the logical
requirements for that trait. One could easily switch to having it
implement PartialOrd though. This would necessitate switching to
manually implementing PartialEq so that it's behavior 'matches'.
It's unclear from the docs what 'matches' exactly means so for
now I'm avoiding implementing the traits.