diff options
author | Aleksey Kladov <[email protected]> | 2018-08-22 08:18:58 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-08-22 08:53:48 +0100 |
commit | 9909875bfe89d2b901c35c0667bed018338b44e1 (patch) | |
tree | cf33277e282f951c323d71236be0044cdb689739 /crates/server/src/main_loop | |
parent | ecc9df5f009deb8e8bbd8e52db9afbe41f8f880c (diff) |
parent module request
Diffstat (limited to 'crates/server/src/main_loop')
-rw-r--r-- | crates/server/src/main_loop/handlers.rs | 19 | ||||
-rw-r--r-- | crates/server/src/main_loop/mod.rs | 4 |
2 files changed, 22 insertions, 1 deletions
diff --git a/crates/server/src/main_loop/handlers.rs b/crates/server/src/main_loop/handlers.rs index 675f69bec..16cc92464 100644 --- a/crates/server/src/main_loop/handlers.rs +++ b/crates/server/src/main_loop/handlers.rs | |||
@@ -3,7 +3,7 @@ use std::collections::HashMap; | |||
3 | use languageserver_types::{ | 3 | use languageserver_types::{ |
4 | Diagnostic, DiagnosticSeverity, Url, DocumentSymbol, | 4 | Diagnostic, DiagnosticSeverity, Url, DocumentSymbol, |
5 | Command, TextDocumentIdentifier, WorkspaceEdit, | 5 | Command, TextDocumentIdentifier, WorkspaceEdit, |
6 | SymbolInformation, Position, | 6 | SymbolInformation, Position, Location, |
7 | }; | 7 | }; |
8 | use libanalysis::{Query}; | 8 | use libanalysis::{Query}; |
9 | use libeditor::{self, CursorPosition}; | 9 | use libeditor::{self, CursorPosition}; |
@@ -184,6 +184,23 @@ pub fn handle_goto_definition( | |||
184 | Ok(Some(req::GotoDefinitionResponse::Array(res))) | 184 | Ok(Some(req::GotoDefinitionResponse::Array(res))) |
185 | } | 185 | } |
186 | 186 | ||
187 | pub fn handle_parent_module( | ||
188 | world: ServerWorld, | ||
189 | params: TextDocumentIdentifier, | ||
190 | ) -> Result<Vec<Location>> { | ||
191 | let file_id = params.try_conv_with(&world)?; | ||
192 | let mut res = Vec::new(); | ||
193 | for (file_id, symbol) in world.analysis().parent_module(file_id) { | ||
194 | let line_index = world.analysis().file_line_index(file_id)?; | ||
195 | let location = to_location( | ||
196 | file_id, symbol.node_range, | ||
197 | &world, &line_index | ||
198 | )?; | ||
199 | res.push(location); | ||
200 | } | ||
201 | Ok(res) | ||
202 | } | ||
203 | |||
187 | pub fn handle_execute_command( | 204 | pub fn handle_execute_command( |
188 | world: ServerWorld, | 205 | world: ServerWorld, |
189 | mut params: req::ExecuteCommandParams, | 206 | mut params: req::ExecuteCommandParams, |
diff --git a/crates/server/src/main_loop/mod.rs b/crates/server/src/main_loop/mod.rs index 752d6ddb2..9499b826c 100644 --- a/crates/server/src/main_loop/mod.rs +++ b/crates/server/src/main_loop/mod.rs | |||
@@ -26,6 +26,7 @@ use { | |||
26 | handle_workspace_symbol, | 26 | handle_workspace_symbol, |
27 | handle_goto_definition, | 27 | handle_goto_definition, |
28 | handle_find_matching_brace, | 28 | handle_find_matching_brace, |
29 | handle_parent_module, | ||
29 | }, | 30 | }, |
30 | }; | 31 | }; |
31 | 32 | ||
@@ -141,6 +142,9 @@ fn on_request( | |||
141 | handle_request_on_threadpool::<req::GotoDefinition>( | 142 | handle_request_on_threadpool::<req::GotoDefinition>( |
142 | &mut req, pool, world, sender, handle_goto_definition, | 143 | &mut req, pool, world, sender, handle_goto_definition, |
143 | )?; | 144 | )?; |
145 | handle_request_on_threadpool::<req::ParentModule>( | ||
146 | &mut req, pool, world, sender, handle_parent_module, | ||
147 | )?; | ||
144 | dispatch::handle_request::<req::ExecuteCommand, _>(&mut req, |params, resp| { | 148 | dispatch::handle_request::<req::ExecuteCommand, _>(&mut req, |params, resp| { |
145 | io.send(RawMsg::Response(resp.into_response(Ok(None))?)); | 149 | io.send(RawMsg::Response(resp.into_response(Ok(None))?)); |
146 | 150 | ||