diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-09 12:20:05 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-09 12:20:05 +0000 |
commit | 76b3985d70f850e22e6cc630230e56dd7cb96f9a (patch) | |
tree | d0d9586bcdf5d8efc1b7d031810ece7093c482d3 /crates/ra_lsp_server/src | |
parent | c0f48f9eb091b5054acb98575c69c67a0aeefb7b (diff) | |
parent | 0b8fbb4fad97d2980f0070a23f5365a5ed887e2a (diff) |
Merge #473
473: Partial typo fix r=matklad a=marcusklaas
This fixes some typos. Mostly in documentation, but also some code is affected (`defenition` was used in a few method names).
Co-authored-by: Marcus Klaas de Vries <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop.rs | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs index 96923fac7..7fc0b8f50 100644 --- a/crates/ra_lsp_server/src/main_loop.rs +++ b/crates/ra_lsp_server/src/main_loop.rs | |||
@@ -326,7 +326,7 @@ fn on_notification( | |||
326 | if pending_requests.remove(&id) { | 326 | if pending_requests.remove(&id) { |
327 | let response = RawResponse::err( | 327 | let response = RawResponse::err( |
328 | id, | 328 | id, |
329 | ErrorCode::RequestCancelled as i32, | 329 | ErrorCode::RequestCanceled as i32, |
330 | "canceled by client".to_string(), | 330 | "canceled by client".to_string(), |
331 | ); | 331 | ); |
332 | msg_sender.send(RawMessage::Response(response)).unwrap() | 332 | msg_sender.send(RawMessage::Response(response)).unwrap() |
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index a653c5ada..069e7f932 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -213,7 +213,7 @@ pub fn handle_goto_definition( | |||
213 | params: req::TextDocumentPositionParams, | 213 | params: req::TextDocumentPositionParams, |
214 | ) -> Result<Option<req::GotoDefinitionResponse>> { | 214 | ) -> Result<Option<req::GotoDefinitionResponse>> { |
215 | let position = params.try_conv_with(&world)?; | 215 | let position = params.try_conv_with(&world)?; |
216 | let navs = match world.analysis().goto_defenition(position)? { | 216 | let navs = match world.analysis().goto_definition(position)? { |
217 | None => return Ok(None), | 217 | None => return Ok(None), |
218 | Some(it) => it, | 218 | Some(it) => it, |
219 | }; | 219 | }; |