From 56aa6e20e0279c69e0130905573b1607056cfaf9 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 11 Aug 2018 16:20:37 +0300
Subject: More symbols

---
 crates/libeditor/src/symbols.rs | 3 +++
 crates/libeditor/tests/test.rs  | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'crates/libeditor')

diff --git a/crates/libeditor/src/symbols.rs b/crates/libeditor/src/symbols.rs
index 3faf96868..5cd781c80 100644
--- a/crates/libeditor/src/symbols.rs
+++ b/crates/libeditor/src/symbols.rs
@@ -63,5 +63,8 @@ fn to_symbol(node: SyntaxNodeRef) -> Option<FileSymbol> {
         .visit(decl::<ast::Enum<_>>)
         .visit(decl::<ast::Trait<_>>)
         .visit(decl::<ast::Module<_>>)
+        .visit(decl::<ast::TypeItem<_>>)
+        .visit(decl::<ast::ConstItem<_>>)
+        .visit(decl::<ast::StaticItem<_>>)
         .accept(node)?
 }
diff --git a/crates/libeditor/tests/test.rs b/crates/libeditor/tests/test.rs
index ba7181ab8..dedca49a4 100644
--- a/crates/libeditor/tests/test.rs
+++ b/crates/libeditor/tests/test.rs
@@ -70,6 +70,9 @@ mod m {
 }
 
 enum E { X, Y(i32) }
+type T = ();
+static S: i32 = 92;
+const C: i32 = 92;
 "#);
     let symbols = file_symbols(&file);
     dbg_eq(
@@ -77,7 +80,10 @@ enum E { X, Y(i32) }
         r#"[FileSymbol { parent: None, name: "Foo", name_range: [8; 11), node_range: [1; 26), kind: STRUCT },
             FileSymbol { parent: None, name: "m", name_range: [32; 33), node_range: [28; 53), kind: MODULE },
             FileSymbol { parent: Some(1), name: "bar", name_range: [43; 46), node_range: [40; 51), kind: FUNCTION },
-            FileSymbol { parent: None, name: "E", name_range: [60; 61), node_range: [55; 75), kind: ENUM }]"#,
+            FileSymbol { parent: None, name: "E", name_range: [60; 61), node_range: [55; 75), kind: ENUM },
+            FileSymbol { parent: None, name: "T", name_range: [81; 82), node_range: [76; 88), kind: TYPE_ITEM },
+            FileSymbol { parent: None, name: "S", name_range: [96; 97), node_range: [89; 108), kind: STATIC_ITEM },
+            FileSymbol { parent: None, name: "C", name_range: [115; 116), node_range: [109; 127), kind: CONST_ITEM }]"#,
     )
 }
 
-- 
cgit v1.2.3