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

Merge #3228

Browse source 
3228: Use proper range for hover on macro arguments r=matklad a=edwin0cheng

This PR use `original_range` to remap the range of found syntax node in `hover` and thus it should return the proper text range now.

fixed #3000 
fixed #3135 


Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
This commit is contained in:
bors[bot] 2020-02-19 10:46:00 +00:00 • committed by GitHub
commit eb804261dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/ra_ide/src/hover.rs
View file

@ -13,7 +13,7 @@ use ra_syntax::{
use crate::{ use crate::{
display::{macro_label, rust_code_markup, rust_code_markup_with_doc, ShortLabel}, display::{macro_label, rust_code_markup, rust_code_markup_with_doc, ShortLabel},
expand::descend_into_macros, expand::{descend_into_macros, original_range},
references::{classify_name, classify_name_ref, NameKind, NameKind::*}, references::{classify_name, classify_name_ref, NameKind, NameKind::*},
FilePosition, FileRange, RangeInfo, FilePosition, FileRange, RangeInfo,
}; };
@ -148,17 +148,18 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
let mut res = HoverResult::new(); let mut res = HoverResult::new();
let mut sb = SourceBinder::new(db); let mut sb = SourceBinder::new(db);
if let Some((range, name_kind)) = match_ast! { if let Some((node, name_kind)) = match_ast! {
match (token.value.parent()) { match (token.value.parent()) {
ast::NameRef(name_ref) => { ast::NameRef(name_ref) => {
classify_name_ref(&mut sb, token.with_value(&name_ref)).map(|d| (name_ref.syntax().text_range(), d.kind)) classify_name_ref(&mut sb, token.with_value(&name_ref)).map(|d| (name_ref.syntax().clone(), d.kind))
}, },
ast::Name(name) => { ast::Name(name) => {
classify_name(&mut sb, token.with_value(&name)).map(|d| (name.syntax().text_range(), d.kind)) classify_name(&mut sb, token.with_value(&name)).map(|d| (name.syntax().clone(), d.kind))
}, },
_ => None, _ => None,
} }
} { } {
let range = original_range(db, token.with_value(&node)).range;
res.extend(hover_text_from_name_kind(db, name_kind)); res.extend(hover_text_from_name_kind(db, name_kind));
if !res.is_empty() { if !res.is_empty() {
@ -171,8 +172,7 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
.ancestors() .ancestors()
.find(|n| ast::Expr::cast(n.clone()).is_some() || ast::Pat::cast(n.clone()).is_some())?; .find(|n| ast::Expr::cast(n.clone()).is_some() || ast::Pat::cast(n.clone()).is_some())?;
// The following logic will not work if token is coming from a macro let frange = original_range(db, token.with_value(&node));
let frange = FileRange { file_id: position.file_id, range: node.text_range() };
res.extend(type_of(db, frange).map(rust_code_markup)); res.extend(type_of(db, frange).map(rust_code_markup));
if res.is_empty() { if res.is_empty() {
return None; return None;
@ -220,6 +220,7 @@ mod tests {
use crate::mock_analysis::{ use crate::mock_analysis::{
analysis_and_position, single_file_with_position, single_file_with_range, analysis_and_position, single_file_with_position, single_file_with_range,
}; };
use ra_db::FileLoader;
use ra_syntax::TextRange; use ra_syntax::TextRange;
fn trim_markup(s: &str) -> &str { fn trim_markup(s: &str) -> &str {
@ -230,7 +231,7 @@ mod tests {
s.map(trim_markup) s.map(trim_markup)
} }
fn check_hover_result(fixture: &str, expected: &[&str]) { fn check_hover_result(fixture: &str, expected: &[&str]) -> String {
let (analysis, position) = analysis_and_position(fixture); let (analysis, position) = analysis_and_position(fixture);
let hover = analysis.hover(position).unwrap().unwrap(); let hover = analysis.hover(position).unwrap().unwrap();
let mut results = Vec::from(hover.info.results()); let mut results = Vec::from(hover.info.results());
@ -243,6 +244,9 @@ mod tests {
} }
assert_eq!(hover.info.len(), expected.len()); assert_eq!(hover.info.len(), expected.len());
let content = analysis.db.file_text(position.file_id);
content[hover.range].to_string()
} }
#[test] #[test]
@ -711,7 +715,7 @@ fn func(foo: i32) { if true { <|>foo; }; }
#[test] #[test]
fn test_hover_through_macro() { fn test_hover_through_macro() {
check_hover_result( let hover_on = check_hover_result(
" "
//- /lib.rs //- /lib.rs
macro_rules! id { macro_rules! id {
@ -726,11 +730,13 @@ fn func(foo: i32) { if true { <|>foo; }; }
", ",
&["fn foo()"], &["fn foo()"],
); );
assert_eq!(hover_on, "foo")
} }
#[test] #[test]
fn test_hover_through_expr_in_macro() { fn test_hover_through_expr_in_macro() {
check_hover_result( let hover_on = check_hover_result(
" "
//- /lib.rs //- /lib.rs
macro_rules! id { macro_rules! id {
@ -742,6 +748,8 @@ fn func(foo: i32) { if true { <|>foo; }; }
", ",
&["u32"], &["u32"],
); );
assert_eq!(hover_on, "bar")
} }
#[test] #[test]