zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix focusing terminal when running tasks (#13675)

Browse Source 
After removing the unnecessary reveal strategy handling:



[focus-task-fix.webm](https://github.com/zed-industries/zed/assets/39293/93afd332-8f22-47f5-914d-5bc040e24029)

When running tasks, the terminal was not focused when the terminal had
to be replaced. This is because the code for revealing the terminal had
been executed twise: once inside `replace_terminal` function and also at
the end of `spawn_task`.

Fixes #13674

Release Notes:

- Fixed focusing the terminal when re-spawning a task
([#13674](https://github.com/zed-industries/zed/issues/13674))
This commit is contained in:
Aleksei Gusev 2024-07-02 10:57:54 +03:00 committed by GitHub
parent ce48555f8d
commit 193be271a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/terminal_view/src/terminal_panel.rs
View File

@ -371,7 +371,6 @@ impl TerminalPanel {
spawn_task.args = user_args; spawn_task.args = user_args;
let spawn_task = spawn_task; let spawn_task = spawn_task;
let reveal = spawn_task.reveal;
let allow_concurrent_runs = spawn_in_terminal.allow_concurrent_runs; let allow_concurrent_runs = spawn_in_terminal.allow_concurrent_runs;
let use_new_terminal = spawn_in_terminal.use_new_terminal; let use_new_terminal = spawn_in_terminal.use_new_terminal;
@ -420,20 +419,6 @@ impl TerminalPanel {
.ok(); .ok();
}), }),
); );
match reveal {
RevealStrategy::Always => {
self.activate_terminal_view(existing_item_index, cx);
let task_workspace = self.workspace.clone();
cx.spawn(|_, mut cx| async move {
task_workspace
.update(&mut cx, |workspace, cx| workspace.focus_panel::<Self>(cx))
.ok()
})
.detach();
}
RevealStrategy::Never => {}
}
} }
} }