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

task: use full task label to distinguish a terminal (#10469)

Browse source 
Spotted by @SomeoneToIgnore, in #10468 I've used a shortened task label,
which might lead to collisions.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-04-12 13:25:46 +02:00 • committed by GitHub
parent 298e9c9387
commit a1cbc23fee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -296,9 +296,10 @@ impl TerminalPanel {
})
}
pub fn spawn_task(&mut self, spawn_in_terminal: &SpawnInTerminal, cx: &mut ViewContext<Self>) {
fn spawn_task(&mut self, spawn_in_terminal: &SpawnInTerminal, cx: &mut ViewContext<Self>) {
let mut spawn_task = SpawnTask {
id: spawn_in_terminal.id.clone(),
full_label: spawn_in_terminal.full_label.clone(),
label: spawn_in_terminal.label.clone(),
command: spawn_in_terminal.command.clone(),
args: spawn_in_terminal.args.clone(),
@ -334,7 +335,7 @@ impl TerminalPanel {
return;
}
let terminals_for_task = self.terminals_for_task(&spawn_in_terminal.label, cx);
let terminals_for_task = self.terminals_for_task(&spawn_in_terminal.full_label, cx);
if terminals_for_task.is_empty() {
self.spawn_in_new_terminal(spawn_task, working_directory, cx);
return;
@ -445,7 +446,7 @@ impl TerminalPanel {
.filter_map(|(index, item)| Some((index, item.act_as::<TerminalView>(cx)?)))
.filter_map(|(index, terminal_view)| {
let task_state = terminal_view.read(cx).terminal().read(cx).task()?;
if &task_state.label == label {
if &task_state.full_label == label {
Some((index, terminal_view))
} else {
None