diff options
Diffstat (limited to 'crates/rust-analyzer/src/handlers.rs')
-rw-r--r-- | crates/rust-analyzer/src/handlers.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs index 25bcd80af..3cb532b62 100644 --- a/crates/rust-analyzer/src/handlers.rs +++ b/crates/rust-analyzer/src/handlers.rs | |||
@@ -415,7 +415,7 @@ pub(crate) fn handle_runnables( | |||
415 | let source_file = snap.analysis.parse(file_id)?; | 415 | let source_file = snap.analysis.parse(file_id)?; |
416 | algo::find_node_at_offset::<ast::MacroCall>(source_file.syntax(), offset) | 416 | algo::find_node_at_offset::<ast::MacroCall>(source_file.syntax(), offset) |
417 | .and_then(|it| it.path()?.segment()?.name_ref()) | 417 | .and_then(|it| it.path()?.segment()?.name_ref()) |
418 | .map_or(false, |it| it.text() == "expect") | 418 | .map_or(false, |it| it.text() == "expect" || it.text() == "expect_file") |
419 | } | 419 | } |
420 | None => false, | 420 | None => false, |
421 | }; | 421 | }; |
@@ -1045,7 +1045,7 @@ pub(crate) fn handle_call_hierarchy_incoming( | |||
1045 | let item = params.item; | 1045 | let item = params.item; |
1046 | 1046 | ||
1047 | let doc = TextDocumentIdentifier::new(item.uri); | 1047 | let doc = TextDocumentIdentifier::new(item.uri); |
1048 | let frange = from_proto::file_range(&snap, doc, item.range)?; | 1048 | let frange = from_proto::file_range(&snap, doc, item.selection_range)?; |
1049 | let fpos = FilePosition { file_id: frange.file_id, offset: frange.range.start() }; | 1049 | let fpos = FilePosition { file_id: frange.file_id, offset: frange.range.start() }; |
1050 | 1050 | ||
1051 | let call_items = match snap.analysis.incoming_calls(fpos)? { | 1051 | let call_items = match snap.analysis.incoming_calls(fpos)? { |
@@ -1080,7 +1080,7 @@ pub(crate) fn handle_call_hierarchy_outgoing( | |||
1080 | let item = params.item; | 1080 | let item = params.item; |
1081 | 1081 | ||
1082 | let doc = TextDocumentIdentifier::new(item.uri); | 1082 | let doc = TextDocumentIdentifier::new(item.uri); |
1083 | let frange = from_proto::file_range(&snap, doc, item.range)?; | 1083 | let frange = from_proto::file_range(&snap, doc, item.selection_range)?; |
1084 | let fpos = FilePosition { file_id: frange.file_id, offset: frange.range.start() }; | 1084 | let fpos = FilePosition { file_id: frange.file_id, offset: frange.range.start() }; |
1085 | 1085 | ||
1086 | let call_items = match snap.analysis.outgoing_calls(fpos)? { | 1086 | let call_items = match snap.analysis.outgoing_calls(fpos)? { |