zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-11-26 10:55:12 +03:00
Code Issues Projects Releases Wiki Activity

fix(plugins): various cwd fixes (#3545)

Browse Source 
* fix(plugins): various cwd fixes

* fix tests
This commit is contained in:
Aram Drevekenin 2024-08-07 13:46:08 +02:00 committed by GitHub
parent 47caeb66a6
commit 8080050aac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zellij-server/src/plugins/unit/plugin_tests.rs
View File

@ -6873,5 +6873,9 @@ pub fn open_command_pane_background_plugin_command() {
}
})
.clone();
assert_snapshot!(format!("{:#?}", new_tab_event));
// we do the replace below to avoid the randomness of the temporary folder in the snapshot
// while still testing it
assert_snapshot!(
format!("{:#?}", new_tab_event).replace(&format!("{:?}", temp_folder.path()), "\"CWD\"")
);
}

8
zellij-server/src/plugins/unit/snapshots/zellij_server__plugins__plugin_tests__open_command_pane_background_plugin_command.snap
View File

@ -1,7 +1,7 @@
---
source: zellij-server/src/plugins/./unit/plugin_tests.rs
assertion_line: 6876
expression: "format!(\"{:#?}\", new_tab_event)"
assertion_line: 6878
expression: "format!(\"{:#?}\",\n new_tab_event).replace(&format!(\"{:?}\", temp_folder.path()),\n \"\\\"CWD\\\"\")"
---
Some(
SpawnTerminal(
@ -13,7 +13,9 @@ Some(
"arg1",
"arg2",
],
cwd: None,
cwd: Some(
"CWD",
),
hold_on_close: true,
hold_on_start: false,
originating_plugin: Some(

5
zellij-server/src/plugins/zellij_exports.rs
View File

@ -660,7 +660,10 @@ fn open_command_pane_background(
context: BTreeMap<String, String>,
) {
let command = command_to_run.path;
let cwd = command_to_run.cwd.map(|cwd| env.plugin_cwd.join(cwd));
let cwd = command_to_run
.cwd
.map(|cwd| env.plugin_cwd.join(cwd))
.or_else(|| Some(env.plugin_cwd.clone()));
let args = command_to_run.args;
let direction = None;
let hold_on_close = true;

6
zellij-utils/src/kdl/kdl_layout_parser.rs
View File

@ -1177,6 +1177,9 @@ impl<'a> KdlLayoutParser<'a> {
};
if let Some(cwd_prefix) = &self.cwd_prefix(tab_cwd.as_ref())? {
pane_layout.add_cwd_to_layout(&cwd_prefix);
for floating_pane in child_floating_panes.iter_mut() {
floating_pane.add_cwd_to_layout(&cwd_prefix);
}
}
Ok((is_focused, tab_name, pane_layout, child_floating_panes))
}
@ -1583,6 +1586,9 @@ impl<'a> KdlLayoutParser<'a> {
}
if let Some(cwd_prefix) = self.cwd_prefix(tab_cwd.as_ref())? {
tab_layout.add_cwd_to_layout(&cwd_prefix);
for floating_pane in tab_template_floating_panes.iter_mut() {
floating_pane.add_cwd_to_layout(&cwd_prefix);
}
}
tab_layout.external_children_index = None;
Ok((