2 files changed, 27 insertions, 10 deletions

diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs
index ad00abe49..df877c324 100644
--- a/crates/ra_ide_api/src/hover.rs
+++ b/crates/ra_ide_api/src/hover.rs
@@ -95,6 +95,8 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
     if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(file.syntax(), position.offset) {
         let analyzer = hir::SourceAnalyzer::new(db, position.file_id, name_ref.syntax(), None);
 
+        let mut no_fallback = false;
+
         match classify_name_ref(db, &analyzer, name_ref) {
             Some(Method(it)) => res.extend(from_def_source(db, it)),
             Some(Macro(it)) => {
@@ -142,11 +144,9 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
                     })
                 }
             }
-            Some(Pat(_)) => {
-                res.extend(None);
-            }
-            Some(SelfParam(_)) => {
-                res.extend(None);
+            Some(Pat(_)) | Some(SelfParam(_)) => {
+                // Hover for these shows type names
+                no_fallback = true;
             }
             Some(GenericParam(_)) => {
                 // FIXME: Hover for generic param
@@ -154,7 +154,7 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
             None => {}
         }
 
-        if res.is_empty() {
+        if res.is_empty() && !no_fallback {
             // Fallback index based approach:
             let symbols = crate::symbol_index::index_resolve(db, name_ref);
             for sym in symbols {
@@ -675,4 +675,21 @@ fn func(foo: i32) { if true { <|>foo; }; }
         assert_eq!(trim_markup_opt(hover.info.first()), Some("enum Thing"));
         assert_eq!(hover.info.is_exact(), true);
     }
+
+    #[test]
+    fn test_hover_shadowing_pat() {
+        let (analysis, position) = single_file_with_position(
+            "
+            fn x() {}
+
+            fn y() {
+                let x = 0i32;
+                x<|>;
+            }
+            ",
+        );
+        let hover = analysis.hover(position).unwrap().unwrap();
+        assert_eq!(trim_markup_opt(hover.info.first()), Some("i32"));
+        assert_eq!(hover.info.is_exact(), true);
+    }
 }
diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md
index 1cf498094..cf714d659 100644
--- a/docs/dev/architecture.md
+++ b/docs/dev/architecture.md
@@ -50,15 +50,15 @@ processes. These are outlined below:
   the grammar described in [grammar.ron]:
   - [ast/generated.rs][ast generated] in `ra_syntax` based on
     [ast/generated.tera.rs][ast source]
-  - [syntax_kinds/generated.rs][syntax_kinds generated] in `ra_syntax` based on
-    [syntax_kinds/generated.tera.rs][syntax_kinds source]
+  - [syntax_kind/generated.rs][syntax_kind generated] in `ra_syntax` based on
+    [syntax_kind/generated.tera.rs][syntax_kind source]
 
 [tera]: https://tera.netlify.com/
 [grammar.ron]: ../../crates/ra_syntax/src/grammar.ron
 [ast generated]: ../../crates/ra_syntax/src/ast/generated.rs
 [ast source]: ../../crates/ra_syntax/src/ast/generated.rs.tera
-[syntax_kinds generated]: ../../crates/ra_syntax/src/syntax_kinds/generated.rs
-[syntax_kinds source]: ../../crates/ra_syntax/src/syntax_kinds/generated.rs.tera
+[syntax_kind generated]: ../../crates/ra_parser/src/syntax_kind/generated.rs
+[syntax_kind source]: ../../crates/ra_parser/src/syntax_kind/generated.rs.tera
 
 
 ## Code Walk-Through