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

Change parsing of struct field patterns

Browse source
This commit is contained in:
Marcus Klaas de Vries 2019-01-19 01:02:38 +01:00 • committed by Aleksey Kladov
parent bcbfa2cc11
commit fa43ef30f4
5 changed files with 46 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/ra_hir/src/expr.rs
View file

@ -854,25 +854,25 @@ impl ExprCollector {
ast::PatKind::PlaceholderPat(_) => Pat::Wild,
ast::PatKind::StructPat(p) => {
let path = p.path().and_then(Path::from_ast);
let fields = p
let field_pat_list = p
.field_pat_list()
.expect("every struct should have a field list")
.pats()
.map(|f| {
let ast_pat = f.pat().expect("field pat always contains a pattern");
.expect("every struct should have a field list");
let mut fields: Vec<_> = field_pat_list
.bind_pats()
.map(|bind_pat| {
let ast_pat = ast::Pat::cast(bind_pat.syntax()).expect("bind pat is a pat");
let pat = self.collect_pat(ast_pat);
let name = f
.name()
.unwrap_or_else(|| {
ast::BindPat::cast(ast_pat.syntax())
.expect("field pat without label is a bind pat")
.name()
.expect("bind pat has a name")
})
.as_name();
let name = bind_pat.name().expect("bind pat has a name").as_name();
FieldPat { name, pat }
})
.collect();
let iter = field_pat_list.field_pats().map(|f| {
let ast_pat = f.pat().expect("field pat always contains a pattern");
let pat = self.collect_pat(ast_pat);
let name = f.name().expect("field pats always have a name").as_name();
FieldPat { name, pat }
});
fields.extend(iter);
Pat::Struct {
path: path,