From 2f960c4aba999b5ac069b5d20cbab9a06eb4dadd Mon Sep 17 00:00:00 2001 From: Thorsten Ball Date: Wed, 16 Oct 2024 14:12:45 +0200 Subject: [PATCH] project environment: Log when which env is used (#19270) This adds more logging for debugging purposes. Release Notes: - N/A --- crates/project/src/environment.rs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/crates/project/src/environment.rs b/crates/project/src/environment.rs index 69aba235a772992cfe3dc92afe05cd56bc2163b2..6153f41233757c14e3c5ec031f1b0553cc4f05e8 100644 --- a/crates/project/src/environment.rs +++ b/crates/project/src/environment.rs @@ -112,8 +112,18 @@ impl ProjectEnvironment { let worktree = worktree_id.zip(worktree_abs_path); let cli_environment = self.get_cli_environment(); - if cli_environment.is_some() { - Task::ready(cli_environment) + if let Some(environment) = cli_environment { + cx.spawn(|_, _| async move { + let path = environment + .get("PATH") + .map(|path| path.as_str()) + .unwrap_or_default(); + log::info!( + "using project environment variables from CLI. PATH={:?}", + path + ); + Some(environment) + }) } else if let Some((worktree_id, worktree_abs_path)) = worktree { self.get_worktree_env(worktree_id, worktree_abs_path, cx) } else { @@ -143,6 +153,15 @@ impl ProjectEnvironment { .await; if let Some(shell_env) = shell_env.as_mut() { + let path = shell_env + .get("PATH") + .map(|path| path.as_str()) + .unwrap_or_default(); + log::info!( + "using project environment variables shell launched in {:?}. PATH={:?}", + worktree_abs_path, + path + ); this.update(&mut cx, |this, _| { this.cached_shell_environments .insert(worktree_id, shell_env.clone());