From 7e549cdbd5e0df712419802f2d2517f82c34e4a7 Mon Sep 17 00:00:00 2001
From: Aram Drevekenin <aram@poor.dev>
Date: Wed, 7 Feb 2024 10:39:51 +0100
Subject: fix(cli): respect cwd in zellij run and zellij plugin (#3116)

* fix(cli): respect cwd in zellij run and zellij plugin commands

* style(fmt): rustfmt

* fix tests
---
 zellij-utils/src/plugin_api/action.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'zellij-utils/src/plugin_api/action.rs')

diff --git a/zellij-utils/src/plugin_api/action.rs b/zellij-utils/src/plugin_api/action.rs
index 82de4c7ee..e97c24334 100644
--- a/zellij-utils/src/plugin_api/action.rs
+++ b/zellij-utils/src/plugin_api/action.rs
@@ -439,6 +439,7 @@ impl TryFrom<ProtobufAction> for Action {
                         should_float,
                         should_open_in_place,
                         skip_plugin_cache,
+                        None,
                     ))
                 },
                 _ => Err("Wrong payload for Action::LaunchOrFocusPlugin"),
@@ -548,6 +549,7 @@ impl TryFrom<ProtobufAction> for Action {
                             run_plugin,
                             pane_name,
                             skip_plugin_cache,
+                            None,
                         ))
                     },
                     _ => Err("Wrong payload for Action::NewTiledPluginPane"),
@@ -570,6 +572,7 @@ impl TryFrom<ProtobufAction> for Action {
                             run_plugin,
                             pane_name,
                             skip_plugin_cache,
+                            None,
                         ))
                     },
                     _ => Err("Wrong payload for Action::MiddleClick"),
@@ -1043,6 +1046,7 @@ impl TryFrom<Action> for ProtobufAction {
                 should_float,
                 should_open_in_place,
                 skip_plugin_cache,
+                cwd,
             ) => {
                 let url: Url = Url::from(&run_plugin.location);
                 Ok(ProtobufAction {
@@ -1137,7 +1141,7 @@ impl TryFrom<Action> for ProtobufAction {
                 name: ProtobufActionName::QueryTabNames as i32,
                 optional_payload: None,
             }),
-            Action::NewTiledPluginPane(run_plugin, pane_name, skip_plugin_cache) => {
+            Action::NewTiledPluginPane(run_plugin, pane_name, skip_plugin_cache, _cwd) => {
                 let plugin_url: Url = Url::from(&run_plugin.location);
                 Ok(ProtobufAction {
                     name: ProtobufActionName::NewTiledPluginPane as i32,
@@ -1150,7 +1154,7 @@ impl TryFrom<Action> for ProtobufAction {
                     )),
                 })
             },
-            Action::NewFloatingPluginPane(run_plugin, pane_name, skip_plugin_cache) => {
+            Action::NewFloatingPluginPane(run_plugin, pane_name, skip_plugin_cache, _cwd) => {
                 let plugin_url: Url = Url::from(&run_plugin.location);
                 Ok(ProtobufAction {
                     name: ProtobufActionName::NewFloatingPluginPane as i32,
-- 
cgit v1.2.3