language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #1394

Browse source 
1394: Fix hover for pat that shadows items r=matklad a=sinkuu

```rust
fn x() {}

fn y() {
    let x = 0i32;
    x; // hover on `x` is expected to be `i32`, but the actual result was `fn x()`
}
```

This was because: if [`res.is_empty()`](656a0fa9f9/crates/ra_ide_api/src/hover.rs (L205)), it fallbacks to "index based approach" and adds `fn x()` to `res`, which makes [`res.extend(type_of)` below](656a0fa9f9/crates/ra_ide_api/src/hover.rs (L260-L266)) not happen.

Co-authored-by: Shotaro Yamada <sinkuu@sinkuu.xyz>
This commit is contained in:
bors[bot] 2019-06-11 17:24:28 +00:00
commit 98020ef2f3
1 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/ra_ide_api/src/hover.rs
View file

@ -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) { 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 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) { match classify_name_ref(db, &analyzer, name_ref) {
Some(Method(it)) => res.extend(from_def_source(db, it)), Some(Method(it)) => res.extend(from_def_source(db, it)),
Some(Macro(it)) => { Some(Macro(it)) => {
@ -142,11 +144,9 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
}) })
} }
} }
Some(Pat(_)) => { Some(Pat(_)) | Some(SelfParam(_)) => {
res.extend(None); // Hover for these shows type names
} no_fallback = true;
Some(SelfParam(_)) => {
res.extend(None);
} }
Some(GenericParam(_)) => { Some(GenericParam(_)) => {
// FIXME: Hover for generic param // FIXME: Hover for generic param
@ -154,7 +154,7 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
None => {} None => {}
} }
if res.is_empty() { if res.is_empty() && !no_fallback {
// Fallback index based approach: // Fallback index based approach:
let symbols = crate::symbol_index::index_resolve(db, name_ref); let symbols = crate::symbol_index::index_resolve(db, name_ref);
for sym in symbols { 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!(trim_markup_opt(hover.info.first()), Some("enum Thing"));
assert_eq!(hover.info.is_exact(), true); 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);
}
} }