aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_lsp_server/src/bin/main.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_lsp_server/src/bin/main.rs')
-rw-r--r--crates/ra_lsp_server/src/bin/main.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_lsp_server/src/bin/main.rs b/crates/ra_lsp_server/src/bin/main.rs
index e25d54a0d..69e709a25 100644
--- a/crates/ra_lsp_server/src/bin/main.rs
+++ b/crates/ra_lsp_server/src/bin/main.rs
@@ -4,8 +4,8 @@
4mod args; 4mod args;
5 5
6use lsp_server::Connection; 6use lsp_server::Connection;
7use ra_lsp_server::{cli, from_json, show_message, Result, ServerConfig};
8use ra_prof; 7use ra_prof;
8use rust_analyzer::{cli, from_json, show_message, Result, ServerConfig};
9 9
10use crate::args::HelpPrinted; 10use crate::args::HelpPrinted;
11 11
@@ -51,7 +51,7 @@ fn run_server() -> Result<()> {
51 log::info!("lifecycle: server started"); 51 log::info!("lifecycle: server started");
52 52
53 let (connection, io_threads) = Connection::stdio(); 53 let (connection, io_threads) = Connection::stdio();
54 let server_capabilities = serde_json::to_value(ra_lsp_server::server_capabilities()).unwrap(); 54 let server_capabilities = serde_json::to_value(rust_analyzer::server_capabilities()).unwrap();
55 55
56 let initialize_params = connection.initialize(server_capabilities)?; 56 let initialize_params = connection.initialize(server_capabilities)?;
57 let initialize_params = 57 let initialize_params =
@@ -84,7 +84,7 @@ fn run_server() -> Result<()> {
84 }) 84 })
85 .unwrap_or_default(); 85 .unwrap_or_default();
86 86
87 ra_lsp_server::main_loop( 87 rust_analyzer::main_loop(
88 workspace_roots, 88 workspace_roots,
89 initialize_params.capabilities, 89 initialize_params.capabilities,
90 server_config, 90 server_config,