language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix original_source find order

Browse source
This commit is contained in:
Edwin Cheng 2019-12-15 01:20:07 +08:00
parent 7238037de4
commit 61360fdfec
5 changed files with 109 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/ra_ide/src/goto_definition.rs
View file

@ -209,7 +209,7 @@ fn named_target(db: &RootDatabase, node: InFile<&SyntaxNode>) -> Option<Navigati
#[cfg(test)]
mod tests {
use test_utils::covers;
use test_utils::{assert_eq_text, covers};
use crate::mock_analysis::analysis_and_position;
@ -222,6 +222,24 @@ mod tests {
nav.assert_match(expected);
}
fn check_goto_with_range_content(fixture: &str, expected: &str, expected_range: &str) {
let (analysis, pos) = analysis_and_position(fixture);
let mut navs = analysis.goto_definition(pos).unwrap().unwrap().info;
assert_eq!(navs.len(), 1);
let nav = navs.pop().unwrap();
let file_text = analysis.file_text(pos.file_id).unwrap();
let actual_full_range = &file_text[nav.full_range()];
let actual_range = &file_text[nav.range()];
test_utils::assert_eq_text!(
&format!("{}|{}", actual_full_range, actual_range),
expected_range
);
nav.assert_match(expected);
}
#[test]
fn goto_definition_works_in_items() {
check_goto(
@ -339,28 +357,27 @@ mod tests {
#[test]
fn goto_definition_works_for_macro_defined_fn_with_arg() {
check_goto(
check_goto_with_range_content(
"
//- /lib.rs
macro_rules! define_fn {
($name:ident) => (fn $name() {})
}
define_fn!(
foo
)
define_fn!(foo);
fn bar() {
<|>foo();
}
",
"foo FN_DEF FileId(1) [80; 83) [80; 83)",
"foo FN_DEF FileId(1) [64; 80) [75; 78)",
"define_fn!(foo);|foo",
);
}
#[test]
fn goto_definition_works_for_macro_defined_fn_no_arg() {
check_goto(
check_goto_with_range_content(
"
//- /lib.rs
macro_rules! define_fn {
@ -373,7 +390,8 @@ mod tests {
<|>foo();
}
",
"foo FN_DEF FileId(1) [39; 42) [39; 42)",
"foo FN_DEF FileId(1) [51; 64) [51; 64)",
"define_fn!();|define_fn!();",
);
}