nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-31 17:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix file_structure() to recognize macro_rules!

Browse Source 
where first token != "macro_rules"
This commit is contained in:
Roland Ruckerbauer 2020-01-10 20:35:23 +01:00
parent d0b52e5d84
commit db151763d4
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/ra_ide/src/display/structure.rs
View File

@ -151,10 +151,24 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
Some(node)
},
ast::MacroCall(it) => {
let first_token = it.syntax().first_token().unwrap();
if first_token.text().as_str() != "macro_rules" {
return None;
let macro_name = it.syntax()
.children()
.find(|c|
![
SyntaxKind::COMMENT,
SyntaxKind::WHITESPACE,
SyntaxKind::ATTR
].iter()
.any(|&k| k == c.kind())
);
match macro_name {
None => return None,
Some(n) => if n.first_token().unwrap().text().as_str() != "macro_rules" {
return None;
}
}
decl(it)
},
_ => None,