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

parameter parsing does not destroy blocks

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-24 20:50:37 +03:00
parent b0aac1ca98
commit f104458d45
10 changed files with 70 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/libsyntax2/src/lib.rs
View file

@ -58,6 +58,10 @@ pub fn parse(text: &str) -> SyntaxNode {
res
}
#[cfg(not(debug_assertions))]
fn validate_block_structure(_: SyntaxNodeRef) {}
#[cfg(debug_assertions)]
fn validate_block_structure(root: SyntaxNodeRef) {
let mut stack = Vec::new();
for node in algo::walk::preorder(root) {
@ -67,7 +71,12 @@ fn validate_block_structure(root: SyntaxNodeRef) {
}
SyntaxKind::R_CURLY => {
if let Some(pair) = stack.pop() {
assert_eq!(node.parent(), pair.parent());
assert_eq!(
node.parent(),
pair.parent(),
"unpaired curleys:\n{}",
utils::dump_tree(root),
);
assert!(
node.next_sibling().is_none() && pair.prev_sibling().is_none(),
"floating curlys at {:?}\nfile:\n{}\nerror:\n{}\n",