1 files changed, 15 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
index 09908458d..f5b4fee2b 100644
--- a/crates/rust-analyzer/src/bin/main.rs
+++ b/crates/rust-analyzer/src/bin/main.rs
@@ -74,12 +74,25 @@ fn run_server() -> Result<()> {
    log::info!("lifecycle: server started");
    let (connection, io_threads) = Connection::stdio();
-    let server_capabilities = serde_json::to_value(rust_analyzer::server_capabilities()).unwrap();
-    let initialize_params = connection.initialize(server_capabilities)?;
+    let (initialize_id, initialize_params) = connection.initialize_start()?;
    let initialize_params =
        from_json::<lsp_types::InitializeParams>("InitializeParams", initialize_params)?;
+    let server_capabilities = rust_analyzer::server_capabilities(&initialize_params.capabilities);
+    let initialize_result = lsp_types::InitializeResult {
+        capabilities: server_capabilities,
+        server_info: Some(lsp_types::ServerInfo {
+            name: String::from("rust-analyzer"),
+            version: None,
+        }),
+    };
+    let initialize_result = serde_json::to_value(initialize_result).unwrap();
+    connection.initialize_finish(initialize_id, initialize_result)?;
    if let Some(client_info) = initialize_params.client_info {
        log::info!("Client '{}' {}", client_info.name, client_info.version.unwrap_or_default());
    }

diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs index 09908458d..f5b4fee2b 100644 --- a/crates/rust-analyzer/src/bin/main.rs +++ b/crates/rust-analyzer/src/bin/main.rs
@@ -74,12 +74,25 @@ fn run_server() -> Result<()> {
74	log::info!("lifecycle: server started");	74	log::info!("lifecycle: server started");
75		75
76	let (connection, io_threads) = Connection::stdio();	76	let (connection, io_threads) = Connection::stdio();
77	let server_capabilities = serde_json::to_value(rust_analyzer::server_capabilities()).unwrap();
78		77
79	let initialize_params = connection.initialize(server_capabilities)?;	78	let (initialize_id, initialize_params) = connection.initialize_start()?;
80	let initialize_params =	79	let initialize_params =
81	from_json::<lsp_types::InitializeParams>("InitializeParams", initialize_params)?;	80	from_json::<lsp_types::InitializeParams>("InitializeParams", initialize_params)?;
82		81
		82	let server_capabilities = rust_analyzer::server_capabilities(&initialize_params.capabilities);
		83
		84	let initialize_result = lsp_types::InitializeResult {
		85	capabilities: server_capabilities,
		86	server_info: Some(lsp_types::ServerInfo {
		87	name: String::from("rust-analyzer"),
		88	version: None,
		89	}),
		90	};
		91
		92	let initialize_result = serde_json::to_value(initialize_result).unwrap();
		93
		94	connection.initialize_finish(initialize_id, initialize_result)?;
		95
83	if let Some(client_info) = initialize_params.client_info {	96	if let Some(client_info) = initialize_params.client_info {
84	log::info!("Client '{}' {}", client_info.name, client_info.version.unwrap_or_default());	97	log::info!("Client '{}' {}", client_info.name, client_info.version.unwrap_or_default());
85	}	98	}