diff options
Diffstat (limited to 'crates/ra_lsp_server/src')
-rw-r--r-- | crates/ra_lsp_server/src/main.rs | 4 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop.rs | 1 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs index cdd925c9f..3879eeff2 100644 --- a/crates/ra_lsp_server/src/main.rs +++ b/crates/ra_lsp_server/src/main.rs | |||
@@ -47,6 +47,10 @@ fn run_server() -> Result<()> { | |||
47 | let initialize_params = connection.initialize(server_capabilities)?; | 47 | let initialize_params = connection.initialize(server_capabilities)?; |
48 | let initialize_params: lsp_types::InitializeParams = serde_json::from_value(initialize_params)?; | 48 | let initialize_params: lsp_types::InitializeParams = serde_json::from_value(initialize_params)?; |
49 | 49 | ||
50 | if let Some(client_info) = initialize_params.client_info { | ||
51 | log::info!("Client '{}' {}", client_info.name, client_info.version.unwrap_or_default()); | ||
52 | } | ||
53 | |||
50 | let cwd = std::env::current_dir()?; | 54 | let cwd = std::env::current_dir()?; |
51 | let root = initialize_params.root_uri.and_then(|it| it.to_file_path().ok()).unwrap_or(cwd); | 55 | let root = initialize_params.root_uri.and_then(|it| it.to_file_path().ok()).unwrap_or(cwd); |
52 | 56 | ||
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs index 7a49cad86..84012b99d 100644 --- a/crates/ra_lsp_server/src/main_loop.rs +++ b/crates/ra_lsp_server/src/main_loop.rs | |||
@@ -417,6 +417,7 @@ fn loop_turn( | |||
417 | let msg = format!("workspace loaded, {} rust packages", n_packages); | 417 | let msg = format!("workspace loaded, {} rust packages", n_packages); |
418 | show_message(req::MessageType::Info, msg, &connection.sender); | 418 | show_message(req::MessageType::Info, msg, &connection.sender); |
419 | } | 419 | } |
420 | world_state.check_watcher.update(); | ||
420 | } | 421 | } |
421 | 422 | ||
422 | if state_changed { | 423 | if state_changed { |
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index a592f0a12..d5a8bbe4d 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -710,6 +710,7 @@ pub fn handle_code_action( | |||
710 | title: command.title.clone(), | 710 | title: command.title.clone(), |
711 | kind: match assist.id { | 711 | kind: match assist.id { |
712 | AssistId("introduce_variable") => Some("refactor.extract.variable".to_string()), | 712 | AssistId("introduce_variable") => Some("refactor.extract.variable".to_string()), |
713 | AssistId("add_custom_impl") => Some("refactor.rewrite.add_custom_impl".to_string()), | ||
713 | _ => None, | 714 | _ => None, |
714 | }, | 715 | }, |
715 | diagnostics: None, | 716 | diagnostics: None, |