From 0e3581e8232461baa50191a2c7474a117b649b1b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 18 Dec 2020 21:10:13 +0300
Subject: NavTarget doesn't assume that it points to a symbol

---
 crates/ide/src/display/navigation_target.rs |  33 ++++---
 crates/ide/src/goto_definition.rs           |   2 +-
 crates/ide/src/hover.rs                     | 148 +++++++++++++++++++++-------
 crates/ide/src/references.rs                |   2 +-
 crates/ide/src/runnables.rs                 |  76 +++++++++-----
 crates/rust-analyzer/src/handlers.rs        |   7 +-
 crates/rust-analyzer/src/to_proto.rs        |   9 +-
 7 files changed, 196 insertions(+), 81 deletions(-)

(limited to 'crates')

diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs
index ac6346b2b..9b9295955 100644
--- a/crates/ide/src/display/navigation_target.rs
+++ b/crates/ide/src/display/navigation_target.rs
@@ -35,8 +35,6 @@ pub enum SymbolKind {
     TypeAlias,
     Trait,
     Macro,
-    // Do we actually need this?
-    DocTest,
 }
 
 /// `NavigationTarget` represents and element in the editor's UI which you can
@@ -64,7 +62,7 @@ pub struct NavigationTarget {
     /// Clients should place the cursor on this range when navigating to this target.
     pub focus_range: Option<TextRange>,
     pub name: SmolStr,
-    pub kind: SymbolKind,
+    pub kind: Option<SymbolKind>,
     pub container_name: Option<SmolStr>,
     pub description: Option<String>,
     pub docs: Option<Documentation>,
@@ -110,8 +108,13 @@ impl NavigationTarget {
 
     #[cfg(test)]
     pub(crate) fn debug_render(&self) -> String {
-        let mut buf =
-            format!("{} {:?} {:?} {:?}", self.name, self.kind, self.file_id, self.full_range);
+        let mut buf = format!(
+            "{} {:?} {:?} {:?}",
+            self.name,
+            self.kind.unwrap(),
+            self.file_id,
+            self.full_range
+        );
         if let Some(focus_range) = self.focus_range {
             buf.push_str(&format!(" {:?}", focus_range))
         }
@@ -146,7 +149,7 @@ impl NavigationTarget {
         NavigationTarget {
             file_id,
             name,
-            kind,
+            kind: Some(kind),
             full_range,
             focus_range,
             container_name: None,
@@ -161,7 +164,7 @@ impl ToNav for FileSymbol {
         NavigationTarget {
             file_id: self.file_id,
             name: self.name.clone(),
-            kind: match self.kind {
+            kind: Some(match self.kind {
                 FileSymbolKind::Function => SymbolKind::Function,
                 FileSymbolKind::Struct => SymbolKind::Struct,
                 FileSymbolKind::Enum => SymbolKind::Enum,
@@ -171,7 +174,7 @@ impl ToNav for FileSymbol {
                 FileSymbolKind::Const => SymbolKind::Const,
                 FileSymbolKind::Static => SymbolKind::Static,
                 FileSymbolKind::Macro => SymbolKind::Macro,
-            },
+            }),
             full_range: self.range,
             focus_range: self.name_range,
             container_name: self.container_name.clone(),
@@ -386,7 +389,7 @@ impl ToNav for hir::Local {
         NavigationTarget {
             file_id: full_range.file_id,
             name,
-            kind: SymbolKind::Local,
+            kind: Some(SymbolKind::Local),
             full_range: full_range.range,
             focus_range: None,
             container_name: None,
@@ -410,7 +413,7 @@ impl ToNav for hir::TypeParam {
         NavigationTarget {
             file_id: src.file_id.original_file(db),
             name: self.name(db).to_string().into(),
-            kind: SymbolKind::TypeParam,
+            kind: Some(SymbolKind::TypeParam),
             full_range,
             focus_range,
             container_name: None,
@@ -427,7 +430,7 @@ impl ToNav for hir::LifetimeParam {
         NavigationTarget {
             file_id: src.file_id.original_file(db),
             name: self.name(db).to_string().into(),
-            kind: SymbolKind::LifetimeParam,
+            kind: Some(SymbolKind::LifetimeParam),
             full_range,
             focus_range: Some(full_range),
             container_name: None,
@@ -488,7 +491,9 @@ fn foo() { enum FooInner { } }
                         5..13,
                     ),
                     name: "FooInner",
-                    kind: Enum,
+                    kind: Some(
+                        Enum,
+                    ),
                     container_name: None,
                     description: Some(
                         "enum FooInner",
@@ -504,7 +509,9 @@ fn foo() { enum FooInner { } }
                         34..42,
                     ),
                     name: "FooInner",
-                    kind: Enum,
+                    kind: Some(
+                        Enum,
+                    ),
                     container_name: Some(
                         "foo",
                     ),
diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs
index 5bee69f4b..7a12e9965 100644
--- a/crates/ide/src/goto_definition.rs
+++ b/crates/ide/src/goto_definition.rs
@@ -86,7 +86,7 @@ fn self_to_nav_target(self_param: ast::SelfParam, file_id: FileId) -> Option<Nav
         full_range: self_param.syntax().text_range(),
         focus_range: Some(self_token.text_range()),
         name: self_token.text().clone(),
-        kind: SymbolKind::SelfParam,
+        kind: Some(SymbolKind::SelfParam),
         container_name: None,
         description: None,
         docs: None,
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index dca098af6..413b1526a 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -2191,7 +2191,9 @@ fn foo_<|>test() {}
                                     11..19,
                                 ),
                                 name: "foo_test",
-                                kind: Function,
+                                kind: Some(
+                                    Function,
+                                ),
                                 container_name: None,
                                 description: None,
                                 docs: None,
@@ -2234,7 +2236,9 @@ mod tests<|> {
                                     4..9,
                                 ),
                                 name: "tests",
-                                kind: Module,
+                                kind: Some(
+                                    Module,
+                                ),
                                 container_name: None,
                                 description: None,
                                 docs: None,
@@ -2273,7 +2277,9 @@ fn main() { let s<|>t = S{ f1:0 }; }
                                         7..8,
                                     ),
                                     name: "S",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct S",
@@ -2312,7 +2318,9 @@ fn main() { let s<|>t = S{ f1:Arg(0) }; }
                                         24..25,
                                     ),
                                     name: "S",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct S",
@@ -2331,7 +2339,9 @@ fn main() { let s<|>t = S{ f1:Arg(0) }; }
                                         7..10,
                                     ),
                                     name: "Arg",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct Arg",
@@ -2370,7 +2380,9 @@ fn main() { let s<|>t = S{ f1: S{ f1: Arg(0) } }; }
                                         24..25,
                                     ),
                                     name: "S",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct S",
@@ -2389,7 +2401,9 @@ fn main() { let s<|>t = S{ f1: S{ f1: Arg(0) } }; }
                                         7..10,
                                     ),
                                     name: "Arg",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct Arg",
@@ -2431,7 +2445,9 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
                                         7..8,
                                     ),
                                     name: "A",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct A",
@@ -2450,7 +2466,9 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
                                         22..23,
                                     ),
                                     name: "B",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct B",
@@ -2469,7 +2487,9 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
                                         53..54,
                                     ),
                                     name: "C",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "pub struct C",
@@ -2508,7 +2528,9 @@ fn main() { let s<|>t = foo(); }
                                         6..9,
                                     ),
                                     name: "Foo",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Foo",
@@ -2548,7 +2570,9 @@ fn main() { let s<|>t = foo(); }
                                         6..9,
                                     ),
                                     name: "Foo",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Foo",
@@ -2567,7 +2591,9 @@ fn main() { let s<|>t = foo(); }
                                         23..24,
                                     ),
                                     name: "S",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct S",
@@ -2607,7 +2633,9 @@ fn main() { let s<|>t = foo(); }
                                         6..9,
                                     ),
                                     name: "Foo",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Foo",
@@ -2626,7 +2654,9 @@ fn main() { let s<|>t = foo(); }
                                         19..22,
                                     ),
                                     name: "Bar",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Bar",
@@ -2669,7 +2699,9 @@ fn main() { let s<|>t = foo(); }
                                         6..9,
                                     ),
                                     name: "Foo",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Foo",
@@ -2688,7 +2720,9 @@ fn main() { let s<|>t = foo(); }
                                         22..25,
                                     ),
                                     name: "Bar",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Bar",
@@ -2707,7 +2741,9 @@ fn main() { let s<|>t = foo(); }
                                         39..41,
                                     ),
                                     name: "S1",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct S1",
@@ -2726,7 +2762,9 @@ fn main() { let s<|>t = foo(); }
                                         52..54,
                                     ),
                                     name: "S2",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct S2",
@@ -2763,7 +2801,9 @@ fn foo(ar<|>g: &impl Foo) {}
                                         6..9,
                                     ),
                                     name: "Foo",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Foo",
@@ -2803,7 +2843,9 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {}
                                         6..9,
                                     ),
                                     name: "Foo",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Foo",
@@ -2822,7 +2864,9 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {}
                                         19..22,
                                     ),
                                     name: "Bar",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Bar",
@@ -2841,7 +2885,9 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {}
                                         36..37,
                                     ),
                                     name: "S",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct S",
@@ -2886,7 +2932,9 @@ mod future {
                                         140..146,
                                     ),
                                     name: "Future",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "pub trait Future",
@@ -2905,7 +2953,9 @@ mod future {
                                         7..8,
                                     ),
                                     name: "S",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct S",
@@ -2943,7 +2993,9 @@ fn foo(ar<|>g: &impl Foo<S>) {}
                                         6..9,
                                     ),
                                     name: "Foo",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Foo",
@@ -2962,7 +3014,9 @@ fn foo(ar<|>g: &impl Foo<S>) {}
                                         23..24,
                                     ),
                                     name: "S",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct S",
@@ -3005,7 +3059,9 @@ fn main() { let s<|>t = foo(); }
                                         49..50,
                                     ),
                                     name: "B",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct B",
@@ -3024,7 +3080,9 @@ fn main() { let s<|>t = foo(); }
                                         6..9,
                                     ),
                                     name: "Foo",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Foo",
@@ -3061,7 +3119,9 @@ fn foo(ar<|>g: &dyn Foo) {}
                                         6..9,
                                     ),
                                     name: "Foo",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Foo",
@@ -3099,7 +3159,9 @@ fn foo(ar<|>g: &dyn Foo<S>) {}
                                         6..9,
                                     ),
                                     name: "Foo",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Foo",
@@ -3118,7 +3180,9 @@ fn foo(ar<|>g: &dyn Foo<S>) {}
                                         23..24,
                                     ),
                                     name: "S",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct S",
@@ -3159,7 +3223,9 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
                                         6..15,
                                     ),
                                     name: "ImplTrait",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait ImplTrait",
@@ -3178,7 +3244,9 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
                                         50..51,
                                     ),
                                     name: "B",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct B",
@@ -3197,7 +3265,9 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
                                         28..36,
                                     ),
                                     name: "DynTrait",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait DynTrait",
@@ -3216,7 +3286,9 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
                                         65..66,
                                     ),
                                     name: "S",
-                                    kind: Struct,
+                                    kind: Some(
+                                        Struct,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "struct S",
@@ -3264,7 +3336,9 @@ fn main() { let s<|>t = test().get(); }
                                         6..9,
                                     ),
                                     name: "Foo",
-                                    kind: Trait,
+                                    kind: Some(
+                                        Trait,
+                                    ),
                                     container_name: None,
                                     description: Some(
                                         "trait Foo",
diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs
index d8069eb64..8c00a7105 100644
--- a/crates/ide/src/references.rs
+++ b/crates/ide/src/references.rs
@@ -278,7 +278,7 @@ fn try_find_self_references(
             full_range: self_param.syntax().text_range(),
             focus_range: Some(param_self_token.text_range()),
             name: param_self_token.text().clone(),
-            kind: SymbolKind::SelfParam,
+            kind: Some(SymbolKind::SelfParam),
             container_name: None,
             description: None,
             docs: None,
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index 600e93b6a..99f11c295 100644
--- a/crates/ide/src/runnables.rs
+++ b/crates/ide/src/runnables.rs
@@ -208,7 +208,7 @@ fn module_def_doctest(sema: &Semantics<RootDatabase>, def: hir::ModuleDef) -> Op
     nav.focus_range = None;
     nav.description = None;
     nav.docs = None;
-    nav.kind = SymbolKind::DocTest;
+    nav.kind = None;
     let res = Runnable { nav, kind: RunnableKind::DocTest { test_id }, cfg: attrs.cfg() };
     Some(res)
 }
@@ -356,7 +356,9 @@ fn bench() {}
                                 4..8,
                             ),
                             name: "main",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -374,7 +376,9 @@ fn bench() {}
                                 26..34,
                             ),
                             name: "test_foo",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -399,7 +403,9 @@ fn bench() {}
                                 62..70,
                             ),
                             name: "test_foo",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -424,7 +430,9 @@ fn bench() {}
                                 89..94,
                             ),
                             name: "bench",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -521,7 +529,9 @@ struct StructWithRunnable(String);
                                 4..8,
                             ),
                             name: "main",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -537,7 +547,7 @@ struct StructWithRunnable(String);
                             full_range: 15..74,
                             focus_range: None,
                             name: "should_have_runnable",
-                            kind: DocTest,
+                            kind: None,
                             container_name: None,
                             description: None,
                             docs: None,
@@ -557,7 +567,7 @@ struct StructWithRunnable(String);
                             full_range: 76..148,
                             focus_range: None,
                             name: "should_have_runnable_1",
-                            kind: DocTest,
+                            kind: None,
                             container_name: None,
                             description: None,
                             docs: None,
@@ -577,7 +587,7 @@ struct StructWithRunnable(String);
                             full_range: 150..254,
                             focus_range: None,
                             name: "should_have_runnable_2",
-                            kind: DocTest,
+                            kind: None,
                             container_name: None,
                             description: None,
                             docs: None,
@@ -597,7 +607,7 @@ struct StructWithRunnable(String);
                             full_range: 756..821,
                             focus_range: None,
                             name: "StructWithRunnable",
-                            kind: DocTest,
+                            kind: None,
                             container_name: None,
                             description: None,
                             docs: None,
@@ -643,7 +653,9 @@ impl Data {
                                 4..8,
                             ),
                             name: "main",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -659,7 +671,7 @@ impl Data {
                             full_range: 44..98,
                             focus_range: None,
                             name: "foo",
-                            kind: DocTest,
+                            kind: None,
                             container_name: None,
                             description: None,
                             docs: None,
@@ -700,7 +712,9 @@ mod test_mod {
                                 5..13,
                             ),
                             name: "test_mod",
-                            kind: Module,
+                            kind: Some(
+                                Module,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -720,7 +734,9 @@ mod test_mod {
                                 35..44,
                             ),
                             name: "test_foo1",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -780,7 +796,9 @@ mod root_tests {
                                 26..40,
                             ),
                             name: "nested_tests_0",
-                            kind: Module,
+                            kind: Some(
+                                Module,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -800,7 +818,9 @@ mod root_tests {
                                 55..69,
                             ),
                             name: "nested_tests_1",
-                            kind: Module,
+                            kind: Some(
+                                Module,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -820,7 +840,9 @@ mod root_tests {
                                 107..121,
                             ),
                             name: "nested_test_11",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -845,7 +867,9 @@ mod root_tests {
                                 163..177,
                             ),
                             name: "nested_test_12",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -870,7 +894,9 @@ mod root_tests {
                                 206..220,
                             ),
                             name: "nested_tests_2",
-                            kind: Module,
+                            kind: Some(
+                                Module,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -890,7 +916,9 @@ mod root_tests {
                                 258..271,
                             ),
                             name: "nested_test_2",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -933,7 +961,9 @@ fn test_foo1() {}
                                 36..45,
                             ),
                             name: "test_foo1",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
@@ -983,7 +1013,9 @@ fn test_foo1() {}
                                 58..67,
                             ),
                             name: "test_foo1",
-                            kind: Function,
+                            kind: Some(
+                                Function,
+                            ),
                             container_name: None,
                             description: None,
                             docs: None,
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index 404b35025..66f8bee99 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -385,7 +385,10 @@ pub(crate) fn handle_workspace_symbol(
             #[allow(deprecated)]
             let info = SymbolInformation {
                 name: nav.name.to_string(),
-                kind: to_proto::symbol_kind(nav.kind),
+                kind: nav
+                    .kind
+                    .map(to_proto::symbol_kind)
+                    .unwrap_or(lsp_types::SymbolKind::Variable),
                 tags: None,
                 location: to_proto::location_from_nav(snap, nav)?,
                 container_name,
@@ -1263,7 +1266,7 @@ pub(crate) fn handle_call_hierarchy_prepare(
     let RangeInfo { range: _, info: navs } = nav_info;
     let res = navs
         .into_iter()
-        .filter(|it| it.kind == SymbolKind::Function)
+        .filter(|it| it.kind == Some(SymbolKind::Function))
         .map(|it| to_proto::call_hierarchy_item(&snap, it))
         .collect::<Result<Vec<_>>>()?;
 
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 79caafe80..6b2302803 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -43,10 +43,9 @@ pub(crate) fn symbol_kind(symbol_kind: SymbolKind) -> lsp_types::SymbolKind {
         SymbolKind::Static => lsp_types::SymbolKind::Constant,
         SymbolKind::Const => lsp_types::SymbolKind::Constant,
         SymbolKind::Impl => lsp_types::SymbolKind::Object,
-        SymbolKind::Local
-        | SymbolKind::SelfParam
-        | SymbolKind::LifetimeParam
-        | SymbolKind::DocTest => lsp_types::SymbolKind::Variable,
+        SymbolKind::Local | SymbolKind::SelfParam | SymbolKind::LifetimeParam => {
+            lsp_types::SymbolKind::Variable
+        }
         SymbolKind::Union => lsp_types::SymbolKind::Struct,
     }
 }
@@ -722,7 +721,7 @@ pub(crate) fn call_hierarchy_item(
 ) -> Result<lsp_types::CallHierarchyItem> {
     let name = target.name.to_string();
     let detail = target.description.clone();
-    let kind = symbol_kind(target.kind);
+    let kind = target.kind.map(symbol_kind).unwrap_or(lsp_types::SymbolKind::Function);
     let (uri, range, selection_range) = location_info(snap, target)?;
     Ok(lsp_types::CallHierarchyItem {
         name,
-- 
cgit v1.2.3


From ade2f5cd124049614801fc821298205006c6bdf4 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 18 Dec 2020 21:26:47 +0300
Subject: Reduce test verbosity

---
 crates/ide/src/display/navigation_target.rs |  53 +--
 crates/ide/src/hover.rs                     | 512 ++++++----------------------
 crates/ide/src/runnables.rs                 | 201 ++---------
 3 files changed, 169 insertions(+), 597 deletions(-)

(limited to 'crates')

diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs
index 9b9295955..cbdd4ecc2 100644
--- a/crates/ide/src/display/navigation_target.rs
+++ b/crates/ide/src/display/navigation_target.rs
@@ -1,5 +1,7 @@
 //! FIXME: write short doc here
 
+use std::fmt;
+
 use either::Either;
 use hir::{AssocItem, Documentation, FieldSource, HasAttrs, HasSource, InFile, ModuleSource};
 use ide_db::{
@@ -42,7 +44,7 @@ pub enum SymbolKind {
 ///
 /// Typically, a `NavigationTarget` corresponds to some element in the source
 /// code, like a function or a struct, but this is not strictly required.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Clone, PartialEq, Eq, Hash)]
 pub struct NavigationTarget {
     pub file_id: FileId,
     /// Range which encompasses the whole element.
@@ -68,6 +70,24 @@ pub struct NavigationTarget {
     pub docs: Option<Documentation>,
 }
 
+impl fmt::Debug for NavigationTarget {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut f = f.debug_struct("NavigationTarget");
+        macro_rules! opt {
+            ($($name:ident)*) => {$(
+                if let Some(it) = &self.$name {
+                    f.field(stringify!($name), it);
+                }
+            )*}
+        }
+        f.field("file_id", &self.file_id).field("full_range", &self.full_range);
+        opt!(focus_range);
+        f.field("name", &self.name);
+        opt!(kind container_name description docs);
+        f.finish()
+    }
+}
+
 pub(crate) trait ToNav {
     fn to_nav(&self, db: &RootDatabase) -> NavigationTarget;
 }
@@ -487,38 +507,21 @@ fn foo() { enum FooInner { } }
                         0,
                     ),
                     full_range: 0..17,
-                    focus_range: Some(
-                        5..13,
-                    ),
+                    focus_range: 5..13,
                     name: "FooInner",
-                    kind: Some(
-                        Enum,
-                    ),
-                    container_name: None,
-                    description: Some(
-                        "enum FooInner",
-                    ),
-                    docs: None,
+                    kind: Enum,
+                    description: "enum FooInner",
                 },
                 NavigationTarget {
                     file_id: FileId(
                         0,
                     ),
                     full_range: 29..46,
-                    focus_range: Some(
-                        34..42,
-                    ),
+                    focus_range: 34..42,
                     name: "FooInner",
-                    kind: Some(
-                        Enum,
-                    ),
-                    container_name: Some(
-                        "foo",
-                    ),
-                    description: Some(
-                        "enum FooInner",
-                    ),
-                    docs: None,
+                    kind: Enum,
+                    container_name: "foo",
+                    description: "enum FooInner",
                 },
             ]
         "#]]
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 413b1526a..b06fa5f15 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -2187,16 +2187,9 @@ fn foo_<|>test() {}
                                     0,
                                 ),
                                 full_range: 0..24,
-                                focus_range: Some(
-                                    11..19,
-                                ),
+                                focus_range: 11..19,
                                 name: "foo_test",
-                                kind: Some(
-                                    Function,
-                                ),
-                                container_name: None,
-                                description: None,
-                                docs: None,
+                                kind: Function,
                             },
                             kind: Test {
                                 test_id: Path(
@@ -2232,16 +2225,9 @@ mod tests<|> {
                                     0,
                                 ),
                                 full_range: 0..46,
-                                focus_range: Some(
-                                    4..9,
-                                ),
+                                focus_range: 4..9,
                                 name: "tests",
-                                kind: Some(
-                                    Module,
-                                ),
-                                container_name: None,
-                                description: None,
-                                docs: None,
+                                kind: Module,
                             },
                             kind: TestMod {
                                 path: "tests",
@@ -2273,18 +2259,10 @@ fn main() { let s<|>t = S{ f1:0 }; }
                                         0,
                                     ),
                                     full_range: 0..19,
-                                    focus_range: Some(
-                                        7..8,
-                                    ),
+                                    focus_range: 7..8,
                                     name: "S",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct S",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct S",
                                 },
                             },
                         ],
@@ -2314,18 +2292,10 @@ fn main() { let s<|>t = S{ f1:Arg(0) }; }
                                         0,
                                     ),
                                     full_range: 17..37,
-                                    focus_range: Some(
-                                        24..25,
-                                    ),
+                                    focus_range: 24..25,
                                     name: "S",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct S",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct S",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2335,18 +2305,10 @@ fn main() { let s<|>t = S{ f1:Arg(0) }; }
                                         0,
                                     ),
                                     full_range: 0..16,
-                                    focus_range: Some(
-                                        7..10,
-                                    ),
+                                    focus_range: 7..10,
                                     name: "Arg",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct Arg",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct Arg",
                                 },
                             },
                         ],
@@ -2376,18 +2338,10 @@ fn main() { let s<|>t = S{ f1: S{ f1: Arg(0) } }; }
                                         0,
                                     ),
                                     full_range: 17..37,
-                                    focus_range: Some(
-                                        24..25,
-                                    ),
+                                    focus_range: 24..25,
                                     name: "S",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct S",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct S",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2397,18 +2351,10 @@ fn main() { let s<|>t = S{ f1: S{ f1: Arg(0) } }; }
                                         0,
                                     ),
                                     full_range: 0..16,
-                                    focus_range: Some(
-                                        7..10,
-                                    ),
+                                    focus_range: 7..10,
                                     name: "Arg",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct Arg",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct Arg",
                                 },
                             },
                         ],
@@ -2441,18 +2387,10 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
                                         0,
                                     ),
                                     full_range: 0..14,
-                                    focus_range: Some(
-                                        7..8,
-                                    ),
+                                    focus_range: 7..8,
                                     name: "A",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct A",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct A",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2462,18 +2400,10 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
                                         0,
                                     ),
                                     full_range: 15..29,
-                                    focus_range: Some(
-                                        22..23,
-                                    ),
+                                    focus_range: 22..23,
                                     name: "B",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct B",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct B",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2483,18 +2413,10 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
                                         0,
                                     ),
                                     full_range: 42..60,
-                                    focus_range: Some(
-                                        53..54,
-                                    ),
+                                    focus_range: 53..54,
                                     name: "C",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "pub struct C",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "pub struct C",
                                 },
                             },
                         ],
@@ -2524,18 +2446,10 @@ fn main() { let s<|>t = foo(); }
                                         0,
                                     ),
                                     full_range: 0..12,
-                                    focus_range: Some(
-                                        6..9,
-                                    ),
+                                    focus_range: 6..9,
                                     name: "Foo",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Foo",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Foo",
                                 },
                             },
                         ],
@@ -2566,18 +2480,10 @@ fn main() { let s<|>t = foo(); }
                                         0,
                                     ),
                                     full_range: 0..15,
-                                    focus_range: Some(
-                                        6..9,
-                                    ),
+                                    focus_range: 6..9,
                                     name: "Foo",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Foo",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Foo",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2587,18 +2493,10 @@ fn main() { let s<|>t = foo(); }
                                         0,
                                     ),
                                     full_range: 16..25,
-                                    focus_range: Some(
-                                        23..24,
-                                    ),
+                                    focus_range: 23..24,
                                     name: "S",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct S",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct S",
                                 },
                             },
                         ],
@@ -2629,18 +2527,10 @@ fn main() { let s<|>t = foo(); }
                                         0,
                                     ),
                                     full_range: 0..12,
-                                    focus_range: Some(
-                                        6..9,
-                                    ),
+                                    focus_range: 6..9,
                                     name: "Foo",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Foo",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Foo",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2650,18 +2540,10 @@ fn main() { let s<|>t = foo(); }
                                         0,
                                     ),
                                     full_range: 13..25,
-                                    focus_range: Some(
-                                        19..22,
-                                    ),
+                                    focus_range: 19..22,
                                     name: "Bar",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Bar",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Bar",
                                 },
                             },
                         ],
@@ -2695,18 +2577,10 @@ fn main() { let s<|>t = foo(); }
                                         0,
                                     ),
                                     full_range: 0..15,
-                                    focus_range: Some(
-                                        6..9,
-                                    ),
+                                    focus_range: 6..9,
                                     name: "Foo",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Foo",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Foo",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2716,18 +2590,10 @@ fn main() { let s<|>t = foo(); }
                                         0,
                                     ),
                                     full_range: 16..31,
-                                    focus_range: Some(
-                                        22..25,
-                                    ),
+                                    focus_range: 22..25,
                                     name: "Bar",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Bar",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Bar",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2737,18 +2603,10 @@ fn main() { let s<|>t = foo(); }
                                         0,
                                     ),
                                     full_range: 32..44,
-                                    focus_range: Some(
-                                        39..41,
-                                    ),
+                                    focus_range: 39..41,
                                     name: "S1",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct S1",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct S1",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2758,18 +2616,10 @@ fn main() { let s<|>t = foo(); }
                                         0,
                                     ),
                                     full_range: 45..57,
-                                    focus_range: Some(
-                                        52..54,
-                                    ),
+                                    focus_range: 52..54,
                                     name: "S2",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct S2",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct S2",
                                 },
                             },
                         ],
@@ -2797,18 +2647,10 @@ fn foo(ar<|>g: &impl Foo) {}
                                         0,
                                     ),
                                     full_range: 0..12,
-                                    focus_range: Some(
-                                        6..9,
-                                    ),
+                                    focus_range: 6..9,
                                     name: "Foo",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Foo",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Foo",
                                 },
                             },
                         ],
@@ -2839,18 +2681,10 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {}
                                         0,
                                     ),
                                     full_range: 0..12,
-                                    focus_range: Some(
-                                        6..9,
-                                    ),
+                                    focus_range: 6..9,
                                     name: "Foo",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Foo",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Foo",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2860,18 +2694,10 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {}
                                         0,
                                     ),
                                     full_range: 13..28,
-                                    focus_range: Some(
-                                        19..22,
-                                    ),
+                                    focus_range: 19..22,
                                     name: "Bar",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Bar",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Bar",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2881,18 +2707,10 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {}
                                         0,
                                     ),
                                     full_range: 29..39,
-                                    focus_range: Some(
-                                        36..37,
-                                    ),
+                                    focus_range: 36..37,
                                     name: "S",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct S",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct S",
                                 },
                             },
                         ],
@@ -2928,18 +2746,10 @@ mod future {
                                         0,
                                     ),
                                     full_range: 101..163,
-                                    focus_range: Some(
-                                        140..146,
-                                    ),
+                                    focus_range: 140..146,
                                     name: "Future",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "pub trait Future",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "pub trait Future",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2949,18 +2759,10 @@ mod future {
                                         0,
                                     ),
                                     full_range: 0..9,
-                                    focus_range: Some(
-                                        7..8,
-                                    ),
+                                    focus_range: 7..8,
                                     name: "S",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct S",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct S",
                                 },
                             },
                         ],
@@ -2989,18 +2791,10 @@ fn foo(ar<|>g: &impl Foo<S>) {}
                                         0,
                                     ),
                                     full_range: 0..15,
-                                    focus_range: Some(
-                                        6..9,
-                                    ),
+                                    focus_range: 6..9,
                                     name: "Foo",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Foo",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Foo",
                                 },
                             },
                             HoverGotoTypeData {
@@ -3010,18 +2804,10 @@ fn foo(ar<|>g: &impl Foo<S>) {}
                                         0,
                                     ),
                                     full_range: 16..27,
-                                    focus_range: Some(
-                                        23..24,
-                                    ),
+                                    focus_range: 23..24,
                                     name: "S",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct S",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct S",
                                 },
                             },
                         ],
@@ -3055,18 +2841,10 @@ fn main() { let s<|>t = foo(); }
                                         0,
                                     ),
                                     full_range: 42..55,
-                                    focus_range: Some(
-                                        49..50,
-                                    ),
+                                    focus_range: 49..50,
                                     name: "B",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct B",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct B",
                                 },
                             },
                             HoverGotoTypeData {
@@ -3076,18 +2854,10 @@ fn main() { let s<|>t = foo(); }
                                         0,
                                     ),
                                     full_range: 0..12,
-                                    focus_range: Some(
-                                        6..9,
-                                    ),
+                                    focus_range: 6..9,
                                     name: "Foo",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Foo",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Foo",
                                 },
                             },
                         ],
@@ -3115,18 +2885,10 @@ fn foo(ar<|>g: &dyn Foo) {}
                                         0,
                                     ),
                                     full_range: 0..12,
-                                    focus_range: Some(
-                                        6..9,
-                                    ),
+                                    focus_range: 6..9,
                                     name: "Foo",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Foo",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Foo",
                                 },
                             },
                         ],
@@ -3155,18 +2917,10 @@ fn foo(ar<|>g: &dyn Foo<S>) {}
                                         0,
                                     ),
                                     full_range: 0..15,
-                                    focus_range: Some(
-                                        6..9,
-                                    ),
+                                    focus_range: 6..9,
                                     name: "Foo",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Foo",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Foo",
                                 },
                             },
                             HoverGotoTypeData {
@@ -3176,18 +2930,10 @@ fn foo(ar<|>g: &dyn Foo<S>) {}
                                         0,
                                     ),
                                     full_range: 16..27,
-                                    focus_range: Some(
-                                        23..24,
-                                    ),
+                                    focus_range: 23..24,
                                     name: "S",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct S",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct S",
                                 },
                             },
                         ],
@@ -3219,18 +2965,10 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
                                         0,
                                     ),
                                     full_range: 0..21,
-                                    focus_range: Some(
-                                        6..15,
-                                    ),
+                                    focus_range: 6..15,
                                     name: "ImplTrait",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait ImplTrait",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait ImplTrait",
                                 },
                             },
                             HoverGotoTypeData {
@@ -3240,18 +2978,10 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
                                         0,
                                     ),
                                     full_range: 43..57,
-                                    focus_range: Some(
-                                        50..51,
-                                    ),
+                                    focus_range: 50..51,
                                     name: "B",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct B",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct B",
                                 },
                             },
                             HoverGotoTypeData {
@@ -3261,18 +2991,10 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
                                         0,
                                     ),
                                     full_range: 22..42,
-                                    focus_range: Some(
-                                        28..36,
-                                    ),
+                                    focus_range: 28..36,
                                     name: "DynTrait",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait DynTrait",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait DynTrait",
                                 },
                             },
                             HoverGotoTypeData {
@@ -3282,18 +3004,10 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
                                         0,
                                     ),
                                     full_range: 58..69,
-                                    focus_range: Some(
-                                        65..66,
-                                    ),
+                                    focus_range: 65..66,
                                     name: "S",
-                                    kind: Some(
-                                        Struct,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "struct S",
-                                    ),
-                                    docs: None,
+                                    kind: Struct,
+                                    description: "struct S",
                                 },
                             },
                         ],
@@ -3332,18 +3046,10 @@ fn main() { let s<|>t = test().get(); }
                                         0,
                                     ),
                                     full_range: 0..62,
-                                    focus_range: Some(
-                                        6..9,
-                                    ),
+                                    focus_range: 6..9,
                                     name: "Foo",
-                                    kind: Some(
-                                        Trait,
-                                    ),
-                                    container_name: None,
-                                    description: Some(
-                                        "trait Foo",
-                                    ),
-                                    docs: None,
+                                    kind: Trait,
+                                    description: "trait Foo",
                                 },
                             },
                         ],
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index 99f11c295..ff386be80 100644
--- a/crates/ide/src/runnables.rs
+++ b/crates/ide/src/runnables.rs
@@ -352,16 +352,9 @@ fn bench() {}
                                 0,
                             ),
                             full_range: 1..13,
-                            focus_range: Some(
-                                4..8,
-                            ),
+                            focus_range: 4..8,
                             name: "main",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Bin,
                         cfg: None,
@@ -372,16 +365,9 @@ fn bench() {}
                                 0,
                             ),
                             full_range: 15..39,
-                            focus_range: Some(
-                                26..34,
-                            ),
+                            focus_range: 26..34,
                             name: "test_foo",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Test {
                             test_id: Path(
@@ -399,16 +385,9 @@ fn bench() {}
                                 0,
                             ),
                             full_range: 41..75,
-                            focus_range: Some(
-                                62..70,
-                            ),
+                            focus_range: 62..70,
                             name: "test_foo",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Test {
                             test_id: Path(
@@ -426,16 +405,9 @@ fn bench() {}
                                 0,
                             ),
                             full_range: 77..99,
-                            focus_range: Some(
-                                89..94,
-                            ),
+                            focus_range: 89..94,
                             name: "bench",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Bench {
                             test_id: Path(
@@ -525,16 +497,9 @@ struct StructWithRunnable(String);
                                 0,
                             ),
                             full_range: 1..13,
-                            focus_range: Some(
-                                4..8,
-                            ),
+                            focus_range: 4..8,
                             name: "main",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Bin,
                         cfg: None,
@@ -545,12 +510,7 @@ struct StructWithRunnable(String);
                                 0,
                             ),
                             full_range: 15..74,
-                            focus_range: None,
                             name: "should_have_runnable",
-                            kind: None,
-                            container_name: None,
-                            description: None,
-                            docs: None,
                         },
                         kind: DocTest {
                             test_id: Path(
@@ -565,12 +525,7 @@ struct StructWithRunnable(String);
                                 0,
                             ),
                             full_range: 76..148,
-                            focus_range: None,
                             name: "should_have_runnable_1",
-                            kind: None,
-                            container_name: None,
-                            description: None,
-                            docs: None,
                         },
                         kind: DocTest {
                             test_id: Path(
@@ -585,12 +540,7 @@ struct StructWithRunnable(String);
                                 0,
                             ),
                             full_range: 150..254,
-                            focus_range: None,
                             name: "should_have_runnable_2",
-                            kind: None,
-                            container_name: None,
-                            description: None,
-                            docs: None,
                         },
                         kind: DocTest {
                             test_id: Path(
@@ -605,12 +555,7 @@ struct StructWithRunnable(String);
                                 0,
                             ),
                             full_range: 756..821,
-                            focus_range: None,
                             name: "StructWithRunnable",
-                            kind: None,
-                            container_name: None,
-                            description: None,
-                            docs: None,
                         },
                         kind: DocTest {
                             test_id: Path(
@@ -649,16 +594,9 @@ impl Data {
                                 0,
                             ),
                             full_range: 1..13,
-                            focus_range: Some(
-                                4..8,
-                            ),
+                            focus_range: 4..8,
                             name: "main",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Bin,
                         cfg: None,
@@ -669,12 +607,7 @@ impl Data {
                                 0,
                             ),
                             full_range: 44..98,
-                            focus_range: None,
                             name: "foo",
-                            kind: None,
-                            container_name: None,
-                            description: None,
-                            docs: None,
                         },
                         kind: DocTest {
                             test_id: Path(
@@ -708,16 +641,9 @@ mod test_mod {
                                 0,
                             ),
                             full_range: 1..51,
-                            focus_range: Some(
-                                5..13,
-                            ),
+                            focus_range: 5..13,
                             name: "test_mod",
-                            kind: Some(
-                                Module,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Module,
                         },
                         kind: TestMod {
                             path: "test_mod",
@@ -730,16 +656,9 @@ mod test_mod {
                                 0,
                             ),
                             full_range: 20..49,
-                            focus_range: Some(
-                                35..44,
-                            ),
+                            focus_range: 35..44,
                             name: "test_foo1",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Test {
                             test_id: Path(
@@ -792,16 +711,9 @@ mod root_tests {
                                 0,
                             ),
                             full_range: 22..323,
-                            focus_range: Some(
-                                26..40,
-                            ),
+                            focus_range: 26..40,
                             name: "nested_tests_0",
-                            kind: Some(
-                                Module,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Module,
                         },
                         kind: TestMod {
                             path: "root_tests::nested_tests_0",
@@ -814,16 +726,9 @@ mod root_tests {
                                 0,
                             ),
                             full_range: 51..192,
-                            focus_range: Some(
-                                55..69,
-                            ),
+                            focus_range: 55..69,
                             name: "nested_tests_1",
-                            kind: Some(
-                                Module,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Module,
                         },
                         kind: TestMod {
                             path: "root_tests::nested_tests_0::nested_tests_1",
@@ -836,16 +741,9 @@ mod root_tests {
                                 0,
                             ),
                             full_range: 84..126,
-                            focus_range: Some(
-                                107..121,
-                            ),
+                            focus_range: 107..121,
                             name: "nested_test_11",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Test {
                             test_id: Path(
@@ -863,16 +761,9 @@ mod root_tests {
                                 0,
                             ),
                             full_range: 140..182,
-                            focus_range: Some(
-                                163..177,
-                            ),
+                            focus_range: 163..177,
                             name: "nested_test_12",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Test {
                             test_id: Path(
@@ -890,16 +781,9 @@ mod root_tests {
                                 0,
                             ),
                             full_range: 202..286,
-                            focus_range: Some(
-                                206..220,
-                            ),
+                            focus_range: 206..220,
                             name: "nested_tests_2",
-                            kind: Some(
-                                Module,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Module,
                         },
                         kind: TestMod {
                             path: "root_tests::nested_tests_0::nested_tests_2",
@@ -912,16 +796,9 @@ mod root_tests {
                                 0,
                             ),
                             full_range: 235..276,
-                            focus_range: Some(
-                                258..271,
-                            ),
+                            focus_range: 258..271,
                             name: "nested_test_2",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Test {
                             test_id: Path(
@@ -957,16 +834,9 @@ fn test_foo1() {}
                                 0,
                             ),
                             full_range: 1..50,
-                            focus_range: Some(
-                                36..45,
-                            ),
+                            focus_range: 36..45,
                             name: "test_foo1",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Test {
                             test_id: Path(
@@ -1009,16 +879,9 @@ fn test_foo1() {}
                                 0,
                             ),
                             full_range: 1..72,
-                            focus_range: Some(
-                                58..67,
-                            ),
+                            focus_range: 58..67,
                             name: "test_foo1",
-                            kind: Some(
-                                Function,
-                            ),
-                            container_name: None,
-                            description: None,
-                            docs: None,
+                            kind: Function,
                         },
                         kind: Test {
                             test_id: Path(
-- 
cgit v1.2.3