diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs index b9c2b52f9847010b6bd20cb6a18f9ace664b567b..e0ff6254445150ca93d88bb14f0a2bcfaaa5624d 100644 --- a/crates/language/src/language.rs +++ b/crates/language/src/language.rs @@ -869,7 +869,7 @@ impl LanguageRegistry { cx: &mut AppContext, ) -> Option { let server_id = self.state.write().next_language_server_id(); - println!( + log::info!( "starting language server {:?}, path: {root_path:?}, id: {server_id}", adapter.name.0 ); @@ -954,7 +954,6 @@ impl LanguageRegistry { task.await?; } - println!("starting server"); let server = lsp::LanguageServer::new( server_id, binaries, @@ -985,7 +984,8 @@ impl LanguageRegistry { adapter: Arc, cx: &mut AppContext, ) -> Task<()> { - println!("deleting server container"); + log::info!("deleting server container"); + let mut lock = self.lsp_binary_paths.lock(); lock.remove(&adapter.name); @@ -1066,7 +1066,6 @@ async fn get_binaries( task.await?; } - println!("fetching binary"); let binary = fetch_latest_binary( adapter.clone(), language.clone(), diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index e0ce91e772e7ed2d81bbb176bec6592fd49e1710..2536c94225f719b9153dc42ae7ec76323438d9f6 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -2480,7 +2480,7 @@ impl Project { Ok(server) => Some(server), Err(err) => { - println!("failed to start language server {:?}: {}", server_name, err); + log::error!("failed to start language server {:?}: {}", server_name, err); if let Some(this) = this.upgrade(&cx) { if let Some(container_dir) = container_dir { @@ -2518,7 +2518,7 @@ impl Project { server_id: LanguageServerId, cx: &mut ModelContext, ) -> Option> { - println!("starting to reinstall server"); + log::info!("beginning to reinstall server"); let (language, adapter, server) = match self.language_servers.remove(&server_id) { Some(LanguageServerState::Running { language, @@ -2543,7 +2543,7 @@ impl Project { Some(cx.spawn(move |this, mut cx| async move { if let Some(task) = server.and_then(|server| server.shutdown()) { - println!("shutting down existing server"); + log::info!("shutting down existing server"); task.await; } @@ -2565,7 +2565,6 @@ impl Project { let worktree_id = worktree.id(); let root_path = worktree.abs_path(); - println!("prompting server start: {:?}", &adapter.name.0); this.start_language_server( worktree_id, root_path, @@ -3082,7 +3081,8 @@ impl Project { cx: &mut ModelContext, ) { cx.spawn(|this, mut cx| async move { - println!("About to spawn test binary"); + log::info!("About to spawn test binary"); + // A lack of test binary counts as a failure let process = installation_test_binary.and_then(|binary| { smol::process::Command::new(&binary.path) @@ -3103,18 +3103,21 @@ impl Project { if let Some(mut process) = process { futures::select! { status = process.status().fuse() => match status { - Ok(status) => errored = !dbg!(status.success()), + Ok(status) => errored = !status.success(), Err(_) => errored = true, }, - _ = timeout => { println!("test binary time-ed out"); } + _ = timeout => { + log::info!("test binary time-ed out, this counts as a success"); + } } } else { - println!("test binary failed to launch"); + log::warn!("test binary failed to launch"); errored = true; } if errored { + log::warn!("test binary check failed"); let task = this.update(&mut cx, move |this, mut cx| { this.reinstall_language_server(server_id, &mut cx) });