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

Fix for-loop expressions breaking with BlockExpr iterable

Browse source
This commit is contained in:
Lukas Wirth 2021-10-30 16:37:32 +02:00
parent b9fa37f5b4
commit c93983e76f
4 changed files with 44 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -850,7 +850,6 @@ pub struct ForExpr {
pub(crate) syntax: SyntaxNode,
}
impl ast::HasAttrs for ForExpr {}
impl ast::HasLoopBody for ForExpr {}
impl ForExpr {
pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) }
pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }

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

@ -754,6 +754,15 @@ impl ast::GenericParamList {
}
}
impl ast::HasLoopBody for ast::ForExpr {
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::HasDocComments for ast::SourceFile {}
impl ast::HasDocComments for ast::Fn {}
impl ast::HasDocComments for ast::Struct {}