nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-11 06:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #447

Browse Source 
447: Show types when hovering patterns as well r=flodiebold a=flodiebold



Co-authored-by: Florian Diebold <flodiebold@gmail.com>
This commit is contained in:
bors[bot] 2019-01-06 22:12:54 +00:00
commit 3c945ceb5e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ra_analysis/src/hover.rs
View File

@ -3,7 +3,7 @@ use ra_editor::find_node_at_offset;
use ra_syntax::{
AstNode, SyntaxNode,
ast::{self, NameOwner},
algo::{find_covering_node, visit::{visitor, Visitor}},
algo::{find_covering_node, find_leaf_at_offset, visit::{visitor, Visitor}},
};
use crate::{db::RootDatabase, RangeInfo, FilePosition, FileRange, NavigationTarget};
@ -26,13 +26,17 @@ pub(crate) fn hover(
}
}
if range.is_none() {
let expr: ast::Expr = ctry!(find_node_at_offset(file.syntax(), position.offset));
let node = find_leaf_at_offset(file.syntax(), position.offset).find_map(|leaf| {
leaf.ancestors()
.find(|n| ast::Expr::cast(*n).is_some() || ast::Pat::cast(*n).is_some())
});
let node = ctry!(node);
let frange = FileRange {
file_id: position.file_id,
range: expr.syntax().range(),
range: node.range(),
};
res.extend(type_of(db, frange)?);
range = Some(expr.syntax().range());
range = Some(node.range());
};
let range = ctry!(range);
@ -192,6 +196,13 @@ mod tests {
assert_eq!(hover.info, "i32");
}
#[test]
fn hover_for_local_variable_pat() {
let (analysis, position) = single_file_with_position("fn func(fo<|>o: i32) {}");
let hover = analysis.hover(position).unwrap().unwrap();
assert_eq!(hover.info, "i32");
}
#[test]
fn test_type_of_for_function() {
let (analysis, range) = single_file_with_range(