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

Revert "Revert to f6f7c5"

Browse source 
This approach is correct, but it needs an addition to Restrictions too

This reverts commit ad00d0c8a5f64142e6636e8b048204c8f8982f4a.
This commit is contained in:
DJMcNab 2018-12-19 20:02:37 +00:00
parent 4dce66ad31
commit def0a95d35
3 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_syntax/src/grammar/expressions/atom.rs
View file

@ -61,12 +61,16 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet = token_set_union![
const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW];
pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<CompletedMarker> {
pub(super) fn atom_expr(
p: &mut Parser,
r: Restrictions,
) -> (Option<CompletedMarker>, Option<BlockLike>) {
if let Some(m) = literal(p) {
return Some(m);
return (Some(m), None);
}
if paths::is_path_start(p) || p.at(L_ANGLE) {
return Some(path_expr(p, r));
let path_expr = path_expr(p, r);
return (Some(path_expr.0), path_expr.1);
}
let la = p.nth(1);
let done = match p.current() {
@ -94,7 +98,7 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<CompletedMark
// }
p.error("expected a loop");
m.complete(p, ERROR);
return None;
return (None, None);
}
}
}
@ -111,10 +115,10 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<CompletedMark
BREAK_KW => break_expr(p),
_ => {
p.err_recover("expected expression", EXPR_RECOVERY_SET);
return None;
return (None, None);
}
};
Some(done)
(Some(done), None)
}
// test tuple_expr