Infer indentation with imports when logical indent is absent #11608
+553
−480
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
charliermarsh
force-pushed
the
charlie/ident
branch
2 times, most recently
from
af2a95e to
bbe7a30
Compare
charliermarsh
force-pushed
the
charlie/ident
branch
from
bbe7a30 to
2f5f393
Compare
charliermarsh
commented
May 30, 2024
| @@ -177,7 +209,6 @@ if True: | |||
| &Indentation("\t".to_string()) | |||
| ); | |||
|
|
|||
| // TODO(charlie): Should non-significant whitespace be detected? | |||
|
dhruvmanila
added a commit
that referenced
this pull request
Jun 20, 2024
## Summary This PR avoids the `depth` counter when detecting indentation from non-logical lines because it seems to never be used. It might have been a leftover when the logic was added originally in #11608. ## Test Plan `cargo insta test`
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.
Summary
In an
__init__.pyfile, it's not uncommon to lack a logical indent (since it may just contain imports). In such cases, we were always falling back to four-space indent. This PR adds detection for indents within import groups.Closes #11606.