fix: Correctly check for parentheses redundancy in remove_parentheses assist
#13764
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
rustbot
added
the
S-waiting-on-review
Veykril
reviewed
Dec 20, 2022
crates/syntax/src/ast/prec.rs
Outdated
| ast::StmtList(_) => self.needs_parens_in_stmt(None), | ||
| ast::ArgList(_) => false, | ||
| ast::MatchArm(_) => false, | ||
| _ => unimplemented!() |
There was a problem hiding this comment.
I feel like this should just be false? unimplmented seems wrong since other nodes don't make sense here right?
There was a problem hiding this comment.
Yeah, right. This was left from the time I was testing things out and haven't figured out possible parents.
fixed :)
Comment on lines
+229
to
+254
| return contains_exterior_struct_lit_inner(self).is_some(); | ||
|
|
||
| fn contains_exterior_struct_lit_inner(expr: &Expr) -> Option<()> { | ||
| use Expr::*; | ||
|
|
||
| match expr { | ||
| RecordExpr(..) => Some(()), | ||
|
|
||
| // X { y: 1 } + X { y: 2 } | ||
| BinExpr(e) => e | ||
| .lhs() | ||
| .as_ref() | ||
| .and_then(contains_exterior_struct_lit_inner) | ||
| .or_else(|| e.rhs().as_ref().and_then(contains_exterior_struct_lit_inner)), | ||
|
|
||
| // `&X { y: 1 }`, `X { y: 1 }.y`, `X { y: 1 }.bar(...)`, etc | ||
| IndexExpr(e) => contains_exterior_struct_lit_inner(&e.base()?), | ||
| AwaitExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | ||
| PrefixExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | ||
| CastExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | ||
| FieldExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | ||
| MethodCallExpr(e) => contains_exterior_struct_lit_inner(&e.receiver()?), | ||
|
|
||
| _ => None, | ||
| } | ||
| } |
There was a problem hiding this comment.
This could use a poor-mans try block aka immediately called closure
Suggested change
| return contains_exterior_struct_lit_inner(self).is_some(); | |
| fn contains_exterior_struct_lit_inner(expr: &Expr) -> Option<()> { | |
| use Expr::*; | |
| match expr { | |
| RecordExpr(..) => Some(()), | |
| // X { y: 1 } + X { y: 2 } | |
| BinExpr(e) => e | |
| .lhs() | |
| .as_ref() | |
| .and_then(contains_exterior_struct_lit_inner) | |
| .or_else(|| e.rhs().as_ref().and_then(contains_exterior_struct_lit_inner)), | |
| // `&X { y: 1 }`, `X { y: 1 }.y`, `X { y: 1 }.bar(...)`, etc | |
| IndexExpr(e) => contains_exterior_struct_lit_inner(&e.base()?), | |
| AwaitExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | |
| PrefixExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | |
| CastExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | |
| FieldExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | |
| MethodCallExpr(e) => contains_exterior_struct_lit_inner(&e.receiver()?), | |
| _ => None, | |
| } | |
| } | |
| (|| { | |
| use Expr::*; | |
| match expr { | |
| RecordExpr(..) => Some(()), | |
| // X { y: 1 } + X { y: 2 } | |
| BinExpr(e) => e | |
| .lhs() | |
| .as_ref() | |
| .and_then(contains_exterior_struct_lit_inner) | |
| .or_else(|| e.rhs().as_ref().and_then(contains_exterior_struct_lit_inner)), | |
| // `&X { y: 1 }`, `X { y: 1 }.y`, `X { y: 1 }.bar(...)`, etc | |
| IndexExpr(e) => contains_exterior_struct_lit_inner(&e.base()?), | |
| AwaitExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | |
| PrefixExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | |
| CastExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | |
| FieldExpr(e) => contains_exterior_struct_lit_inner(&e.expr()?), | |
| MethodCallExpr(e) => contains_exterior_struct_lit_inner(&e.receiver()?), | |
| _ => None, | |
| } | |
| })().is_some() |
There was a problem hiding this comment.
It kind of makes the code worse, since the recursive calls return bool that needs to be converted back to Option...
fn contains_exterior_struct_lit(&self) -> bool {
(|| {
use Expr::*;
(match self {
RecordExpr(..) => true,
// X { y: 1 } + X { y: 2 }
BinExpr(e) => {
return e
.lhs()
.as_ref()
.filter(|e| e.contains_exterior_struct_lit())
.map(drop)
.or_else(|| {
e.rhs().as_ref().filter(|e| e.contains_exterior_struct_lit()).map(drop)
})
}
// `&X { y: 1 }`, `X { y: 1 }.y`, `X { y: 1 }.bar(...)`, etc
IndexExpr(e) => e.base()?.contains_exterior_struct_lit(),
AwaitExpr(e) => e.expr()?.contains_exterior_struct_lit(),
PrefixExpr(e) => e.expr()?.contains_exterior_struct_lit(),
CastExpr(e) => e.expr()?.contains_exterior_struct_lit(),
FieldExpr(e) => e.expr()?.contains_exterior_struct_lit(),
MethodCallExpr(e) => e.receiver()?.contains_exterior_struct_lit(),
_ => return None,
})
.then(|| ())
})()
.is_some()
}
|
@bors r+ |
|
☀️ Test successful - checks-actions |
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 is quite a bunch of code and some hacks, but I think this time it's correct.
I've added a lot of tests, most of which fail with the assist impl from #13733 :')