Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Runnables: Add oneshot runnables (#8061)

Browse source 
/cc @SomeoneToIgnore 
Fixes #7460 and partially addresses #7108 
Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-02-20 23:13:09 +01:00 • committed by GitHub
parent 8a73bc4c7d
commit 2ec910f772
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 163 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/terminal_view/src/terminal_panel.rs
View file

@ -16,7 +16,7 @@ use search::{buffer_search::DivRegistrar, BufferSearchBar};
use serde::{Deserialize, Serialize};
use settings::Settings;
use terminal::{
terminal_settings::{TerminalDockPosition, TerminalSettings},
terminal_settings::{Shell, TerminalDockPosition, TerminalSettings},
SpawnRunnable,
};
use ui::{h_flex, ButtonCommon, Clickable, IconButton, IconSize, Selectable, Tooltip};
@ -300,13 +300,30 @@ impl TerminalPanel {
spawn_in_terminal: &runnable::SpawnInTerminal,
cx: &mut ViewContext<Self>,
) {
let spawn_runnable = SpawnRunnable {
let mut spawn_runnable = SpawnRunnable {
id: spawn_in_terminal.id.clone(),
label: spawn_in_terminal.label.clone(),
command: spawn_in_terminal.command.clone(),
args: spawn_in_terminal.args.clone(),
env: spawn_in_terminal.env.clone(),
};
if spawn_in_terminal.separate_shell {
let Some((shell, mut user_args)) = (match TerminalSettings::get_global(cx).shell.clone()
{
Shell::System => std::env::var("SHELL").ok().map(|shell| (shell, vec![])),
Shell::Program(shell) => Some((shell, vec![])),
Shell::WithArguments { program, args } => Some((program, args)),
}) else {
return;
};
let command = std::mem::take(&mut spawn_runnable.command);
let args = std::mem::take(&mut spawn_runnable.args);
spawn_runnable.command = shell;
user_args.extend(["-c".to_owned(), command]);
user_args.extend(args);
spawn_runnable.args = user_args;
}
let working_directory = spawn_in_terminal.cwd.clone();
let allow_concurrent_runs = spawn_in_terminal.allow_concurrent_runs;
let use_new_terminal = spawn_in_terminal.use_new_terminal;