Don't mistake a following if for an elif #5296
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
|
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
PR Check ResultsBenchmarkLinuxWindows |
## Summary
This snippet used to panic because it expected to see a comma or something similar after the `2` but met the closing parentheses that is not part of the range and panicked
```python
a = {
1: (2),
# comment
3: True,
}
```
Originally found in https://github.com/bolucat/Firefox/blob/636a717ef025c16434997dc89e42351ef740ee6b/testing/marionette/client/marionette_driver/geckoinstance.py#L109
This snippet is also the test plan.
In the following code, the comment used to get wrongly associated with the `if False` since it looked like an elif. This fixes it by checking the indentation and adding a regression test
```python
if True:
pass
else: # Comment
if False:
pass
pass
```
Originally found in https://github.com/gradio-app/gradio/blob/1570b94a02d23d051ae137e0063974fd8a48b34e/gradio/external.py#L478
konstin
force-pushed
the
Fix_formatter_panic_with_comment_after_parenthesized_dict_value
branch
from
8010d93
to
b963c7f
Compare
konstin
force-pushed
the
check_if_indentation_for_elif_comment
branch
from
d6f0cd1
to
97b027a
Compare
Base automatically changed from
Fix_formatter_panic_with_comment_after_parenthesized_dict_value
to
main
June 22, 2023 14:52
MichaReiser
approved these changes
Jun 23, 2023
|
|
||
| # Regression test for formatter panic with comment after parenthesized dict value | ||
| # Originally found in https://github.com/bolucat/Firefox/blob/636a717ef025c16434997dc89e42351ef740ee6b/testing/marionette/client/marionette_driver/geckoinstance.py#L109 | ||
| a = { |
There was a problem hiding this comment.
This fix seems unrelated to if/elif right?
There was a problem hiding this comment.
There was a problem hiding this comment.
just confirmed, it's also not part of the merge commit
| CommentPlacement::Default(comment) | ||
| } else { | ||
| CommentPlacement::trailing(preceding, comment) | ||
| let base_if_indent = |
There was a problem hiding this comment.
Just an idea. It may be annoying to do because of all the type narrowing that's necessary and you would need to identify the right parent body but I thought it may be worth mentioning. The way to normally detect whether it is an elif or not... oh no.... It is not. These two programs have the same AST
if True:
pass
elif False:
passIf(
StmtIf {
range: 0..38,
test: Constant(
ExprConstant {
range: 3..7,
value: Bool(
true,
),
kind: None,
},
),
body: [
Pass(
StmtPass {
range: 13..17,
},
),
],
orelse: [
If(
StmtIf {
range: 18..38,
test: Constant(
ExprConstant {
range: 23..28,
value: Bool(
false,
),
kind: None,
},
),
body: [
Pass(
StmtPass {
range: 34..38,
},
),
],
orelse: [],
},
),
],
},
),
if True:
pass
else:
if False:
passIf(
StmtIf {
range: 41..91,
test: Constant(
ExprConstant {
range: 44..48,
value: Bool(
true,
),
kind: None,
},
),
body: [
Pass(
StmtPass {
range: 54..58,
},
),
],
orelse: [
If(
StmtIf {
range: 69..91,
test: Constant(
ExprConstant {
range: 72..77,
value: Bool(
false,
),
kind: None,
},
),
body: [
Pass(
StmtPass {
range: 87..91,
},
),
],
orelse: [],
},
),
],
},
),
MichaReiser
added
internal
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.
In the following code, the comment used to get wrongly associated with the
if Falsesince it looked like an elif. This fixes it by checking the indentation and adding a regression testOriginally found in https://github.com/gradio-app/gradio/blob/1570b94a02d23d051ae137e0063974fd8a48b34e/gradio/external.py#L478