From 2b828c68e8acda628d6e3a36827d1ffd9c9aaec6 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 14 Aug 2018 11:20:09 +0300 Subject: separete structure from symbols --- crates/libeditor/src/lib.rs | 2 +- crates/libeditor/src/symbols.rs | 82 +++++++++++++++++++++++++++++++++++------ crates/libeditor/tests/test.rs | 26 ++++++++----- 3 files changed, 88 insertions(+), 22 deletions(-) (limited to 'crates/libeditor') diff --git a/crates/libeditor/src/lib.rs b/crates/libeditor/src/lib.rs index e5933cbd6..b40db2c66 100644 --- a/crates/libeditor/src/lib.rs +++ b/crates/libeditor/src/lib.rs @@ -19,7 +19,7 @@ pub use libsyntax2::{File, TextRange, TextUnit}; pub use self::{ line_index::{LineIndex, LineCol}, extend_selection::extend_selection, - symbols::{FileSymbol, file_symbols}, + symbols::{StructureNode, file_structure, FileSymbol, file_symbols}, edit::{EditBuilder, Edit, AtomEdit}, code_actions::{flip_comma}, }; 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, - 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 { + let syntax = file.syntax(); + preorder(syntax.as_ref()) + .filter_map(to_symbol) + .collect() +} + +fn to_symbol(node: SyntaxNodeRef) -> Option { + fn decl<'a, N: NameOwner<&'a SyntaxRoot>>(node: N) -> Option { + let name = node.name()?; + Some(FileSymbol { + name: name.text(), + node_range: node.syntax().range(), + kind: node.syntax().kind(), + }) + } + visitor() + .visit(decl::>) + .visit(decl::>) + .visit(decl::>) + .visit(decl::>) + .visit(decl::>) + .visit(decl::>) + .visit(decl::>) + .visit(decl::>) + .accept(node)? +} + + +pub fn file_structure(file: &ast::File) -> Vec { 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 { 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 { } } 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 { res } -fn to_symbol(node: SyntaxNodeRef) -> Option { - fn decl<'a, N: NameOwner<&'a SyntaxRoot>>(node: N) -> Option { +fn structure_node(node: SyntaxNodeRef) -> Option { + fn decl<'a, N: NameOwner<&'a SyntaxRoot>>(node: N) -> Option { 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 { .visit(decl::>) .visit(decl::>) .visit(decl::>) + .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)? } diff --git a/crates/libeditor/tests/test.rs b/crates/libeditor/tests/test.rs index fab2e4ad3..97fa30e1f 100644 --- a/crates/libeditor/tests/test.rs +++ b/crates/libeditor/tests/test.rs @@ -9,7 +9,7 @@ use itertools::Itertools; use libsyntax2::AstNode; use libeditor::{ File, TextUnit, TextRange, - highlight, runnables, extend_selection, file_symbols, flip_comma, + highlight, runnables, extend_selection, file_structure, flip_comma, }; #[test] @@ -66,7 +66,7 @@ fn test_foo() {} } #[test] -fn symbols() { +fn test_structure() { let file = file(r#" struct Foo { x: i32 @@ -80,16 +80,22 @@ enum E { X, Y(i32) } type T = (); static S: i32 = 92; const C: i32 = 92; + +impl E {} + +impl fmt::Debug for E {} "#); - let symbols = file_symbols(&file); + let symbols = file_structure(&file); dbg_eq( - r#"[FileSymbol { parent: None, name: "Foo", name_range: [8; 11), node_range: [1; 26), kind: STRUCT_DEF }, - 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: FN_DEF }, - FileSymbol { parent: None, name: "E", name_range: [60; 61), node_range: [55; 75), kind: ENUM_DEF }, - FileSymbol { parent: None, name: "T", name_range: [81; 82), node_range: [76; 88), kind: TYPE_DEF }, - FileSymbol { parent: None, name: "S", name_range: [96; 97), node_range: [89; 108), kind: STATIC_DEF }, - FileSymbol { parent: None, name: "C", name_range: [115; 116), node_range: [109; 127), kind: CONST_DEF }]"#, + r#"[StructureNode { parent: None, label: "Foo", navigation_range: [8; 11), node_range: [1; 26), kind: STRUCT_DEF }, + StructureNode { parent: None, label: "m", navigation_range: [32; 33), node_range: [28; 53), kind: MODULE }, + StructureNode { parent: Some(1), label: "bar", navigation_range: [43; 46), node_range: [40; 51), kind: FN_DEF }, + StructureNode { parent: None, label: "E", navigation_range: [60; 61), node_range: [55; 75), kind: ENUM_DEF }, + StructureNode { parent: None, label: "T", navigation_range: [81; 82), node_range: [76; 88), kind: TYPE_DEF }, + StructureNode { parent: None, label: "S", navigation_range: [96; 97), node_range: [89; 108), kind: STATIC_DEF }, + StructureNode { parent: None, label: "C", navigation_range: [115; 116), node_range: [109; 127), kind: CONST_DEF }, + StructureNode { parent: None, label: "impl E ", navigation_range: [129; 136), node_range: [129; 138), kind: IMPL_ITEM }, + StructureNode { parent: None, label: "impl fmt::Debug for E ", navigation_range: [140; 162), node_range: [140; 164), kind: IMPL_ITEM }]"#, &symbols, ) } -- cgit v1.2.3