mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-03 17:44:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Direnv warn (#18850)

Browse source 
Follow-up fixes to #18567

Release Notes:

- N/A
This commit is contained in:
Thorsten Ball 2024-10-08 11:54:28 +02:00 committed by GitHub
parent fa85238c69
commit be531653a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/activity_indicator/src/activity_indicator.rs
View file

@ -195,7 +195,8 @@ impl ActivityIndicator {
on_click: Some(Arc::new(move |this, cx| { on_click: Some(Arc::new(move |this, cx| {
this.project.update(cx, |project, cx| { this.project.update(cx, |project, cx| {
project.remove_environment_error(cx, worktree_id); project.remove_environment_error(cx, worktree_id);
}) });
cx.dispatch_action(Box::new(workspace::OpenLog));
})), })),
}); });
} }

4
crates/project/src/environment.rs
View file

@ -134,7 +134,7 @@ impl ProjectEnvironment {
let load_direnv = ProjectSettings::get_global(cx).load_direnv.clone(); let load_direnv = ProjectSettings::get_global(cx).load_direnv.clone();
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
let (mut shell_env, error) = cx let (mut shell_env, error_message) = cx
.background_executor() .background_executor()
.spawn({ .spawn({
let cwd = worktree_abs_path.clone(); let cwd = worktree_abs_path.clone();
@ -152,7 +152,7 @@ impl ProjectEnvironment {
set_origin_marker(shell_env, EnvironmentOrigin::WorktreeShell); set_origin_marker(shell_env, EnvironmentOrigin::WorktreeShell);
} }
if let Some(error) = error { if let Some(error) = error_message {
this.update(&mut cx, |this, _| { this.update(&mut cx, |this, _| {
this.environment_error_messages.insert(worktree_id, error); this.environment_error_messages.insert(worktree_id, error);
}) })