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

Merge commit '7219414e81' into sync-from-ra

Browse source
This commit is contained in:
Laurențiu Nicola 2024-01-28 15:56:54 +02:00
parent 858f4aca6c
commit f43cea0878
78 changed files with 1391 additions and 2797 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/mbe/src/syntax_bridge.rs
View file

@ -234,7 +234,7 @@ where
let mut stack = NonEmptyVec::new(entry);
while let Some((token, abs_range)) = conv.bump() {
let tt::Subtree { delimiter, token_trees: result } = stack.last_mut();
let tt::Subtree { delimiter, token_trees } = stack.last_mut();
let tt = match token.as_leaf() {
Some(leaf) => tt::TokenTree::Leaf(leaf.clone()),
@ -243,7 +243,7 @@ where
COMMENT => {
let span = conv.span_for(abs_range);
if let Some(tokens) = conv.convert_doc_comment(&token, span) {
result.extend(tokens);
token_trees.extend(tokens);
}
continue;
}
@ -317,7 +317,7 @@ where
span: conv
.span_for(TextRange::at(abs_range.start(), TextSize::of('\''))),
});
result.push(apostrophe.into());
token_trees.push(apostrophe.into());
let ident = tt::Leaf::from(tt::Ident {
text: SmolStr::new(&token.to_text(conv)[1..]),
@ -326,7 +326,7 @@ where
abs_range.end(),
)),
});
result.push(ident.into());
token_trees.push(ident.into());
continue;
}
_ => continue,
@ -337,7 +337,7 @@ where
},
};
result.push(tt);
token_trees.push(tt);
}
// If we get here, we've consumed all input tokens.