diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-17 10:02:54 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-17 10:02:54 +0000 |
commit | 93d28fb50c8496d00bfb457a42fb5ee66f83d7b5 (patch) | |
tree | 47a1d15302d542932af992d5243640fff88aa0a4 /crates/ra_lsp_server | |
parent | 429fa445b7aa4dcea8c2456aeb07321fe22c000a (diff) | |
parent | f8f454ab5c19c6e7d91b3a4e6bb63fb9bf5f2673 (diff) |
Merge #3099
3099: Init implementation of structural search replace r=matklad a=mikhail-m1
next steps:
* ignore space and other minor difference
* add support to ra_cli
* call rust parser to check pattern
* documentation
original issue #2267
Co-authored-by: Mikhail Modin <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop.rs | 1 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 5 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/req.rs | 13 |
3 files changed, 19 insertions, 0 deletions
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs index 1e70cea13..7ae2e1e6f 100644 --- a/crates/ra_lsp_server/src/main_loop.rs +++ b/crates/ra_lsp_server/src/main_loop.rs | |||
@@ -527,6 +527,7 @@ fn on_request( | |||
527 | .on::<req::CallHierarchyPrepare>(handlers::handle_call_hierarchy_prepare)? | 527 | .on::<req::CallHierarchyPrepare>(handlers::handle_call_hierarchy_prepare)? |
528 | .on::<req::CallHierarchyIncomingCalls>(handlers::handle_call_hierarchy_incoming)? | 528 | .on::<req::CallHierarchyIncomingCalls>(handlers::handle_call_hierarchy_incoming)? |
529 | .on::<req::CallHierarchyOutgoingCalls>(handlers::handle_call_hierarchy_outgoing)? | 529 | .on::<req::CallHierarchyOutgoingCalls>(handlers::handle_call_hierarchy_outgoing)? |
530 | .on::<req::Ssr>(handlers::handle_ssr)? | ||
530 | .finish(); | 531 | .finish(); |
531 | Ok(()) | 532 | Ok(()) |
532 | } | 533 | } |
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 3893430c0..ae51141cb 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -882,6 +882,11 @@ pub fn handle_document_highlight( | |||
882 | )) | 882 | )) |
883 | } | 883 | } |
884 | 884 | ||
885 | pub fn handle_ssr(world: WorldSnapshot, params: req::SsrParams) -> Result<req::SourceChange> { | ||
886 | let _p = profile("handle_ssr"); | ||
887 | world.analysis().structural_search_replace(¶ms.arg)??.try_conv_with(&world) | ||
888 | } | ||
889 | |||
885 | pub fn publish_diagnostics(world: &WorldSnapshot, file_id: FileId) -> Result<DiagnosticTask> { | 890 | pub fn publish_diagnostics(world: &WorldSnapshot, file_id: FileId) -> Result<DiagnosticTask> { |
886 | let _p = profile("publish_diagnostics"); | 891 | let _p = profile("publish_diagnostics"); |
887 | let line_index = world.analysis().file_line_index(file_id)?; | 892 | let line_index = world.analysis().file_line_index(file_id)?; |
diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs index dc327f53d..7ff7f60b3 100644 --- a/crates/ra_lsp_server/src/req.rs +++ b/crates/ra_lsp_server/src/req.rs | |||
@@ -206,3 +206,16 @@ pub struct InlayHint { | |||
206 | pub kind: InlayKind, | 206 | pub kind: InlayKind, |
207 | pub label: String, | 207 | pub label: String, |
208 | } | 208 | } |
209 | |||
210 | pub enum Ssr {} | ||
211 | |||
212 | impl Request for Ssr { | ||
213 | type Params = SsrParams; | ||
214 | type Result = SourceChange; | ||
215 | const METHOD: &'static str = "rust-analyzer/ssr"; | ||
216 | } | ||
217 | |||
218 | #[derive(Debug, Deserialize, Serialize)] | ||
219 | pub struct SsrParams { | ||
220 | pub arg: String, | ||
221 | } | ||