language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use shorthand record syntax when renaming struct initializer field

Browse source
This commit is contained in:
Lukas Wirth 2020-11-14 17:49:36 +01:00
parent 99fa139bea
commit e55a44a831
4 changed files with 68 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/syntax/src/ast/expr_ext.rs
View file

@ -22,6 +22,18 @@ impl ast::Expr {
_ => false,
}
}
pub fn name_ref(&self) -> Option<ast::NameRef> {
if let ast::Expr::PathExpr(expr) = self {
let path = expr.path()?;
let segment = path.segment()?;
let name_ref = segment.name_ref()?;
if path.qualifier().is_none() {
return Some(name_ref);
}
}
None
}
}
#[derive(Debug, Clone, PartialEq, Eq)]

10
crates/syntax/src/ast/node_ext.rs
View file

@ -203,15 +203,7 @@ impl ast::RecordExprField {
if let Some(name_ref) = self.name_ref() {
return Some(name_ref);
}
if let Some(ast::Expr::PathExpr(expr)) = self.expr() {
let path = expr.path()?;
let segment = path.segment()?;
let name_ref = segment.name_ref()?;
if path.qualifier().is_none() {
return Some(name_ref);
}
}
None
self.expr()?.name_ref()
}
}