mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18312 from LastExceed/symbolkind-variable

Browse Source 
Report document symbols of kind `variable` for let statements
This commit is contained in:
Lukas Wirth 2024-10-28 13:40:42 +00:00 committed by GitHub
commit 003270d3e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/tools/rust-analyzer/crates/ide/src/file_structure.rs
View File

@ -187,6 +187,24 @@ fn collapse_ws(node: &SyntaxNode, output: &mut String) {
}; };
Some(node) Some(node)
}, },
ast::LetStmt(it) => {
let pat = it.pat()?;
let mut label = String::new();
collapse_ws(pat.syntax(), &mut label);
let node = StructureNode {
parent: None,
label,
navigation_range: pat.syntax().text_range(),
node_range: it.syntax().text_range(),
kind: StructureNodeKind::SymbolKind(SymbolKind::Local),
detail: it.ty().map(|ty| ty.to_string()),
deprecated: false,
};
Some(node)
},
ast::Macro(it) => decl(it, StructureNodeKind::SymbolKind(SymbolKind::Macro)), ast::Macro(it) => decl(it, StructureNodeKind::SymbolKind(SymbolKind::Macro)),
_ => None, _ => None,
} }
@ -308,6 +326,17 @@ fn f() {}
// endregion // endregion
fn g() {} fn g() {}
} }
fn let_statements() {
let x = 42;
let mut y = x;
let Foo {
..
} = Foo { x };
if let None = Some(x) {}
_ = ();
let _ = g();
}
"#, "#,
expect![[r#" expect![[r#"
[ [
@ -633,6 +662,71 @@ fn g() {}
), ),
deprecated: false, deprecated: false,
}, },
StructureNode {
parent: None,
label: "let_statements",
navigation_range: 641..655,
node_range: 638..798,
kind: SymbolKind(
Function,
),
detail: Some(
"fn()",
),
deprecated: false,
},
StructureNode {
parent: Some(
26,
),
label: "x",
navigation_range: 668..669,
node_range: 664..675,
kind: SymbolKind(
Local,
),
detail: None,
deprecated: false,
},
StructureNode {
parent: Some(
26,
),
label: "mut y",
navigation_range: 684..689,
node_range: 680..694,
kind: SymbolKind(
Local,
),
detail: None,
deprecated: false,
},
StructureNode {
parent: Some(
26,
),
label: "Foo { .. }",
navigation_range: 703..725,
node_range: 699..738,
kind: SymbolKind(
Local,
),
detail: None,
deprecated: false,
},
StructureNode {
parent: Some(
26,
),
label: "_",
navigation_range: 788..789,
node_range: 784..796,
kind: SymbolKind(
Local,
),
detail: None,
deprecated: false,
},
] ]
"#]], "#]],
); );