separete structure from symbols

1 files changed, 71 insertions, 11 deletions

diff --git a/crates/libeditor/src/symbols.rs b/crates/libeditor/src/symbols.rs
index f1d5222f4..43f4164da 100644
--- a/crates/libeditor/src/symbols.rs
+++ b/crates/libeditor/src/symbols.rs
@@ -4,22 +4,58 @@ use libsyntax2::{
     ast::{self, NameOwner},
     algo::{
         visit::{visitor, Visitor},
-        walk::{walk, WalkEvent},
+        walk::{walk, WalkEvent, preorder},
     },
+    SyntaxKind::*,
 };
 use TextRange;
 
 #[derive(Debug)]
-pub struct FileSymbol {
+pub struct StructureNode {
     pub parent: Option<usize>,
-    pub name: SmolStr,
-    pub name_range: TextRange,
+    pub label: String,
+    pub navigation_range: TextRange,
     pub node_range: TextRange,
     pub kind: SyntaxKind,
 }
 
+#[derive(Debug)]
+pub struct FileSymbol {
+    pub name: SmolStr,
+    pub node_range: TextRange,
+    pub kind: SyntaxKind,
+}
 
 pub fn file_symbols(file: &ast::File) -> Vec<FileSymbol> {
+    let syntax = file.syntax();
+    preorder(syntax.as_ref())
+        .filter_map(to_symbol)
+        .collect()
+}
+
+fn to_symbol(node: SyntaxNodeRef) -> Option<FileSymbol> {
+    fn decl<'a, N: NameOwner<&'a SyntaxRoot>>(node: N) -> Option<FileSymbol> {
+        let name = node.name()?;
+        Some(FileSymbol {
+            name: name.text(),
+            node_range: node.syntax().range(),
+            kind: node.syntax().kind(),
+        })
+    }
+    visitor()
+        .visit(decl::<ast::FnDef<_>>)
+        .visit(decl::<ast::StructDef<_>>)
+        .visit(decl::<ast::EnumDef<_>>)
+        .visit(decl::<ast::TraitDef<_>>)
+        .visit(decl::<ast::Module<_>>)
+        .visit(decl::<ast::TypeDef<_>>)
+        .visit(decl::<ast::ConstDef<_>>)
+        .visit(decl::<ast::StaticDef<_>>)
+        .accept(node)?
+}
+
+
+pub fn file_structure(file: &ast::File) -> Vec<StructureNode> {
     let mut res = Vec::new();
     let mut stack = Vec::new();
     let syntax = file.syntax();
@@ -27,7 +63,7 @@ pub fn file_symbols(file: &ast::File) -> Vec<FileSymbol> {
     for event in walk(syntax.as_ref()) {
         match event {
             WalkEvent::Enter(node) => {
-                match to_symbol(node) {
+                match structure_node(node) {
                     Some(mut symbol) => {
                         symbol.parent = stack.last().map(|&n| n);
                         stack.push(res.len());
@@ -37,7 +73,7 @@ pub fn file_symbols(file: &ast::File) -> Vec<FileSymbol> {
                 }
             }
             WalkEvent::Exit(node) => {
-                if to_symbol(node).is_some() {
+                if structure_node(node).is_some() {
                     stack.pop().unwrap();
                 }
             }
@@ -46,13 +82,13 @@ pub fn file_symbols(file: &ast::File) -> Vec<FileSymbol> {
     res
 }
 
-fn to_symbol(node: SyntaxNodeRef) -> Option<FileSymbol> {
-    fn decl<'a, N: NameOwner<&'a SyntaxRoot>>(node: N) -> Option<FileSymbol> {
+fn structure_node(node: SyntaxNodeRef) -> Option<StructureNode> {
+    fn decl<'a, N: NameOwner<&'a SyntaxRoot>>(node: N) -> Option<StructureNode> {
         let name = node.name()?;
-        Some(FileSymbol {
+        Some(StructureNode {
             parent: None,
-            name: name.text(),
-            name_range: name.syntax().range(),
+            label: name.text().to_string(),
+            navigation_range: name.syntax().range(),
             node_range: node.syntax().range(),
             kind: node.syntax().kind(),
         })
@@ -67,5 +103,29 @@ fn to_symbol(node: SyntaxNodeRef) -> Option<FileSymbol> {
         .visit(decl::<ast::TypeDef<_>>)
         .visit(decl::<ast::ConstDef<_>>)
         .visit(decl::<ast::StaticDef<_>>)
+        .visit(|im: ast::ImplItem<_>| {
+            let mut label = String::new();
+            let brace = im.syntax().children()
+                .find(|it| {
+                    let stop = it.kind() == L_CURLY;
+                    if !stop {
+                        label.push_str(&it.text());
+                    }
+                    stop
+                })?;
+            let navigation_range = TextRange::from_to(
+                im.syntax().range().start(),
+                brace.range().start(),
+            );
+
+            let node = StructureNode {
+                parent: None,
+                label,
+                navigation_range,
+                node_range: im.syntax().range(),
+                kind: im.syntax().kind(),
+            };
+            Some(node)
+        })
         .accept(node)?
 }