language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-21 15:51:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Have inline_local_variable use precedence calculation for parentheses

Browse source
This commit is contained in:
Lukas Wirth 2025-02-28 09:45:24 +01:00
parent 2c4ef382d6
commit e92dc3fd80
5 changed files with 44 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/syntax/src/ast/prec.rs
View file

@ -7,7 +7,7 @@ use crate::{
#[derive(Debug, Clone, Copy, PartialEq, PartialOrd)]
pub enum ExprPrecedence {
// return, break, yield, closures
// return val, break val, yield val, closures
Jump,
// = += -= *= /= %= &= |= ^= <<= >>=
Assign,
@ -58,12 +58,18 @@ pub fn precedence(expr: &ast::Expr) -> ExprPrecedence {
Some(_) => ExprPrecedence::Unambiguous,
},
Expr::BreakExpr(e) if e.expr().is_some() => ExprPrecedence::Jump,
Expr::BecomeExpr(e) if e.expr().is_some() => ExprPrecedence::Jump,
Expr::ReturnExpr(e) if e.expr().is_some() => ExprPrecedence::Jump,
Expr::YeetExpr(e) if e.expr().is_some() => ExprPrecedence::Jump,
Expr::YieldExpr(e) if e.expr().is_some() => ExprPrecedence::Jump,
Expr::BreakExpr(_)
| Expr::BecomeExpr(_)
| Expr::ContinueExpr(_)
| Expr::ReturnExpr(_)
| Expr::YeetExpr(_)
| Expr::YieldExpr(_) => ExprPrecedence::Jump,
| Expr::YieldExpr(_)
| Expr::ContinueExpr(_) => ExprPrecedence::Unambiguous,
Expr::RangeExpr(..) => ExprPrecedence::Range,
@ -387,6 +393,7 @@ impl Expr {
BreakExpr(e) => e.expr().is_none(),
ContinueExpr(_) => true,
YieldExpr(e) => e.expr().is_none(),
BecomeExpr(e) => e.expr().is_none(),
_ => false,
}
}

4
crates/syntax/src/ast/token_ext.rs
View file

@ -269,7 +269,7 @@ impl ast::ByteString {
}
(Ok(c), true) => {
buf.reserve_exact(text.len());
buf.extend_from_slice(text[..prev_end].as_bytes());
buf.extend_from_slice(&text.as_bytes()[..prev_end]);
buf.push(c as u8);
}
(Err(e), _) => has_error = Some(e),
@ -333,7 +333,7 @@ impl ast::CString {
}
(Ok(u), true) => {
buf.reserve_exact(text.len());
buf.extend(text[..prev_end].as_bytes());
buf.extend(&text.as_bytes()[..prev_end]);
extend_unit(&mut buf, u);
}
(Err(e), _) => has_error = Some(e),