Merge #193

193: Inline modules r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 5 insertions, 3 deletions

diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index c853ff653..2219a0036 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -218,11 +218,13 @@ pub fn handle_goto_definition(
 
 pub fn handle_parent_module(
     world: ServerWorld,
-    params: TextDocumentIdentifier,
+    params: req::TextDocumentPositionParams,
 ) -> Result<Vec<Location>> {
-    let file_id = params.try_conv_with(&world)?;
+    let file_id = params.text_document.try_conv_with(&world)?;
+    let line_index = world.analysis().file_line_index(file_id);
+    let offset = params.position.conv_with(&line_index);
     let mut res = Vec::new();
-    for (file_id, symbol) in world.analysis().parent_module(file_id)? {
+    for (file_id, symbol) in world.analysis().parent_module(file_id, offset)? {
         let line_index = world.analysis().file_line_index(file_id);
         let location = to_location(file_id, symbol.node_range, &world, &line_index)?;
         res.push(location);