language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-18 17:40:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix body selection in while loops

Browse source
This commit is contained in:
Laurențiu Nicola 2022-02-26 16:45:06 +02:00
parent a2cc1d6b7b
commit 87c4a4104d
4 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/syntax/src/ast/generated/nodes.rs
View file

@ -1035,7 +1035,6 @@ pub struct WhileExpr {
pub(crate) syntax: SyntaxNode,
}
impl ast::HasAttrs for WhileExpr {}
impl ast::HasLoopBody for WhileExpr {}
impl WhileExpr {
pub fn while_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![while]) }
pub fn condition(&self) -> Option<Expr> { support::child(&self.syntax) }

9
crates/syntax/src/ast/node_ext.rs
View file

@ -769,6 +769,15 @@ impl ast::HasLoopBody for ast::ForExpr {
}
}
impl ast::HasLoopBody for ast::WhileExpr {
fn loop_body(&self) -> Option<ast::BlockExpr> {
let mut exprs = support::children(self.syntax());
let first = exprs.next();
let second = exprs.next();
second.or(first)
}
}
impl ast::HasAttrs for ast::AnyHasDocComments {}
impl From<ast::Adt> for ast::Item {

5
crates/syntax/src/tests/sourcegen_ast.rs
View file

@ -85,8 +85,9 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: &AstSrc) -> String {
.traits
.iter()
.filter(|trait_name| {
// For loops have two expressions so this might collide, therefor manual impl it
node.name != "ForExpr" || trait_name.as_str() != "HasLoopBody"
// Loops have two expressions so this might collide, therefor manual impl it
node.name != "ForExpr" && node.name != "WhileExpr"
|| trait_name.as_str() != "HasLoopBody"
})
.map(|trait_name| {
let trait_name = format_ident!("{}", trait_name);