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

Merge pull request #18625 from Veykril/push-npnxwpxuzlqz

Browse source 
fix: Fix parser getting stuck for bad asm expressions
This commit is contained in:
Lukas Wirth 2024-12-06 05:11:08 +00:00 • committed by GitHub
commit cddaf7485f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 71 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/parser/src/grammar/expressions/atom.rs
View file

@ -345,10 +345,7 @@ fn parse_asm_expr(p: &mut Parser<'_>, m: Marker) -> Option<CompletedMarker> {
name(p);
p.bump(T![=]);
allow_templates = false;
true
} else {
false
};
}
let op = p.start();
let dir_spec = p.start();
@ -399,6 +396,19 @@ fn parse_asm_expr(p: &mut Parser<'_>, m: Marker) -> Option<CompletedMarker> {
op.abandon(p);
op_n.abandon(p);
p.err_and_bump("expected asm operand");
// improves error recovery and handles err_and_bump recovering from `{` which gets
// the parser stuck here
if p.at(T!['{']) {
// test_err bad_asm_expr
// fn foo() {
// builtin#asm(
// label crashy = { return; }
// );
// }
expr(p);
}
if p.at(T!['}']) {
break;
}