Merge #7975

7975: Provide regions in file structure r=ivan770 a=ivan770

Closes #7913 

https://user-images.githubusercontent.com/14003886/110819163-96b3c080-8296-11eb-993e-a7cdb574a12d.mp4



Co-authored-by: ivan770 <[email protected]>

1 files changed, 8 insertions, 1 deletions

diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index d415ed4d3..ab742a17c 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -11,7 +11,7 @@ use ide::{
     Markup, NavigationTarget, ReferenceAccess, RenameError, Runnable, Severity, SourceChange,
     TextEdit, TextRange, TextSize,
 };
-use ide_db::SymbolKind;
+use ide_db::{StructureNodeKind, SymbolKind};
 use itertools::Itertools;
 use serde_json::to_value;
 
@@ -63,6 +63,13 @@ pub(crate) fn symbol_kind(symbol_kind: SymbolKind) -> lsp_types::SymbolKind {
     }
 }
 
+pub(crate) fn structure_node_kind(kind: StructureNodeKind) -> lsp_types::SymbolKind {
+    match kind {
+        StructureNodeKind::SymbolKind(symbol) => symbol_kind(symbol),
+        StructureNodeKind::Region => lsp_types::SymbolKind::Namespace,
+    }
+}
+
 pub(crate) fn document_highlight_kind(
     reference_access: ReferenceAccess,
 ) -> lsp_types::DocumentHighlightKind {