From 90e93d64bda7c00b70b7aa1c5dccf84358cb2dea Mon Sep 17 00:00:00 2001 From: Aram Drevekenin Date: Fri, 25 Aug 2023 19:47:23 +0200 Subject: fix(plugins): remove protobuf duplications (#2729) * fix(plugins): remove protobuf duplications * style(fmt): rustfmt --- zellij-utils/src/plugin_api/action.proto | 2 +- zellij-utils/src/plugin_api/action.rs | 8 +++--- zellij-utils/src/plugin_api/plugin_command.proto | 29 +++++++------------- zellij-utils/src/plugin_api/plugin_command.rs | 35 +++++++++++++----------- 4 files changed, 34 insertions(+), 40 deletions(-) (limited to 'zellij-utils/src/plugin_api') diff --git a/zellij-utils/src/plugin_api/action.proto b/zellij-utils/src/plugin_api/action.proto index 429c8432e..7e40bde24 100644 --- a/zellij-utils/src/plugin_api/action.proto +++ b/zellij-utils/src/plugin_api/action.proto @@ -61,7 +61,7 @@ message IdAndName { message PaneIdAndShouldFloat { uint32 pane_id = 1; - bool should_float_if_hidden = 2; + bool should_float = 2; } message NewPluginPanePayload { diff --git a/zellij-utils/src/plugin_api/action.rs b/zellij-utils/src/plugin_api/action.rs index b3bff6f84..0d70af692 100644 --- a/zellij-utils/src/plugin_api/action.rs +++ b/zellij-utils/src/plugin_api/action.rs @@ -562,7 +562,7 @@ impl TryFrom for Action { match protobuf_action.optional_payload { Some(OptionalPayload::FocusTerminalPaneWithIdPayload(payload)) => { let terminal_pane_id = payload.pane_id; - let should_float_if_hidden = payload.should_float_if_hidden; + let should_float_if_hidden = payload.should_float; Ok(Action::FocusTerminalPaneWithId( terminal_pane_id, should_float_if_hidden, @@ -575,7 +575,7 @@ impl TryFrom for Action { match protobuf_action.optional_payload { Some(OptionalPayload::FocusPluginPaneWithIdPayload(payload)) => { let plugin_pane_id = payload.pane_id; - let should_float_if_hidden = payload.should_float_if_hidden; + let should_float_if_hidden = payload.should_float; Ok(Action::FocusPluginPaneWithId( plugin_pane_id, should_float_if_hidden, @@ -1098,7 +1098,7 @@ impl TryFrom for ProtobufAction { optional_payload: Some(OptionalPayload::FocusTerminalPaneWithIdPayload( PaneIdAndShouldFloat { pane_id: terminal_pane_id, - should_float_if_hidden, + should_float: should_float_if_hidden, }, )), }) @@ -1109,7 +1109,7 @@ impl TryFrom for ProtobufAction { optional_payload: Some(OptionalPayload::FocusPluginPaneWithIdPayload( PaneIdAndShouldFloat { pane_id: plugin_pane_id, - should_float_if_hidden, + should_float: should_float_if_hidden, }, )), }) diff --git a/zellij-utils/src/plugin_api/plugin_command.proto b/zellij-utils/src/plugin_api/plugin_command.proto index 69d4c97bd..fed8ec54d 100644 --- a/zellij-utils/src/plugin_api/plugin_command.proto +++ b/zellij-utils/src/plugin_api/plugin_command.proto @@ -1,10 +1,10 @@ syntax = "proto3"; +import "action.proto"; import "event.proto"; import "file.proto"; import "command.proto"; import "message.proto"; -import "input_mode.proto"; import "resize.proto"; import "plugin_permission.proto"; @@ -99,7 +99,7 @@ message PluginCommand { PluginMessagePayload post_message_to_payload = 14; PluginMessagePayload post_message_to_plugin_payload = 15; bool show_self_payload = 16; - SwitchToModePayload switch_to_mode_payload = 17; + action.SwitchToModePayload switch_to_mode_payload = 17; string new_tabs_with_layout_payload = 18; ResizePayload resize_payload = 19; ResizePayload resize_with_direction_payload = 20; @@ -110,12 +110,12 @@ message PluginCommand { MovePayload move_pane_with_direction_payload = 25; string go_to_tab_name_payload = 26; string focus_or_create_tab_payload = 27; - int32 go_to_tab_payload = 28; + uint32 go_to_tab_payload = 28; string start_or_reload_plugin_payload = 29; - int32 close_terminal_pane_payload = 30; - int32 close_plugin_pane_payload = 31; - PaneIdAndShouldFloat focus_terminal_pane_payload = 32; - PaneIdAndShouldFloat focus_plugin_pane_payload = 33; + uint32 close_terminal_pane_payload = 30; + uint32 close_plugin_pane_payload = 31; + action.PaneIdAndShouldFloat focus_terminal_pane_payload = 32; + action.PaneIdAndShouldFloat focus_plugin_pane_payload = 33; IdAndNewName rename_terminal_pane_payload = 34; IdAndNewName rename_plugin_pane_payload = 35; IdAndNewName rename_tab_payload = 36; @@ -153,11 +153,11 @@ message OpenCommandPanePayload { } message SwitchTabToPayload { - int32 tab_index = 1; + uint32 tab_index = 1; } message SetTimeoutPayload { - float seconds = 1; + double seconds = 1; } message ExecCmdPayload { @@ -168,10 +168,6 @@ message PluginMessagePayload { api.message.Message message = 1; } -message SwitchToModePayload { - input_mode.InputModeMessage input_mode = 1; -} - message ResizePayload { resize.Resize resize = 1; } @@ -180,12 +176,7 @@ message MovePayload { resize.MoveDirection direction = 1; } -message PaneIdAndShouldFloat { - int32 pane_id = 1; - bool should_float = 2; -} - message IdAndNewName { - int32 id = 1; // pane id or tab index + uint32 id = 1; // pane id or tab index string new_name = 2; } diff --git a/zellij-utils/src/plugin_api/plugin_command.rs b/zellij-utils/src/plugin_api/plugin_command.rs index 71289a149..25773ba3a 100644 --- a/zellij-utils/src/plugin_api/plugin_command.rs +++ b/zellij-utils/src/plugin_api/plugin_command.rs @@ -1,11 +1,12 @@ pub use super::generated_api::api::{ + action::{PaneIdAndShouldFloat, SwitchToModePayload}, event::EventNameList as ProtobufEventNameList, + input_mode::InputMode as ProtobufInputMode, plugin_command::{ plugin_command::Payload, CommandName, ExecCmdPayload, IdAndNewName, MovePayload, - OpenCommandPanePayload, OpenFilePayload, PaneIdAndShouldFloat, - PluginCommand as ProtobufPluginCommand, PluginMessagePayload, - RequestPluginPermissionPayload, ResizePayload, SetTimeoutPayload, SubscribePayload, - SwitchSessionPayload, SwitchTabToPayload, SwitchToModePayload, UnsubscribePayload, + OpenCommandPanePayload, OpenFilePayload, PluginCommand as ProtobufPluginCommand, + PluginMessagePayload, RequestPluginPermissionPayload, ResizePayload, SetTimeoutPayload, + SubscribePayload, SwitchSessionPayload, SwitchTabToPayload, UnsubscribePayload, }, plugin_permission::PermissionType as ProtobufPermissionType, resize::ResizeAction as ProtobufResizeAction, @@ -179,8 +180,10 @@ impl TryFrom for PluginCommand { }, Some(CommandName::SwitchToMode) => match protobuf_plugin_command.payload { Some(Payload::SwitchToModePayload(switch_to_mode_payload)) => { - match switch_to_mode_payload.input_mode { - Some(input_mode) => Ok(PluginCommand::SwitchToMode(input_mode.try_into()?)), + match ProtobufInputMode::from_i32(switch_to_mode_payload.input_mode) { + Some(protobuf_input_mode) => { + Ok(PluginCommand::SwitchToMode(protobuf_input_mode.try_into()?)) + }, None => Err("Malformed switch to mode payload"), } }, @@ -597,7 +600,7 @@ impl TryFrom for ProtobufPluginCommand { PluginCommand::SwitchTabTo(tab_index) => Ok(ProtobufPluginCommand { name: CommandName::SwitchTabTo as i32, payload: Some(Payload::SwitchTabToPayload(SwitchTabToPayload { - tab_index: tab_index as i32, + tab_index: tab_index, })), }), PluginCommand::SetTimeout(seconds) => Ok(ProtobufPluginCommand { @@ -631,7 +634,7 @@ impl TryFrom for ProtobufPluginCommand { PluginCommand::SwitchToMode(input_mode) => Ok(ProtobufPluginCommand { name: CommandName::SwitchToMode as i32, payload: Some(Payload::SwitchToModePayload(SwitchToModePayload { - input_mode: Some(input_mode.try_into()?), + input_mode: ProtobufInputMode::try_from(input_mode)? as i32, })), }), PluginCommand::NewTabsWithLayout(raw_layout) => Ok(ProtobufPluginCommand { @@ -794,7 +797,7 @@ impl TryFrom for ProtobufPluginCommand { }), PluginCommand::GoToTab(tab_index) => Ok(ProtobufPluginCommand { name: CommandName::GoToTab as i32, - payload: Some(Payload::GoToTabPayload(tab_index as i32)), + payload: Some(Payload::GoToTabPayload(tab_index)), }), PluginCommand::StartOrReloadPlugin(url) => Ok(ProtobufPluginCommand { name: CommandName::StartOrReloadPlugin as i32, @@ -802,17 +805,17 @@ impl TryFrom for ProtobufPluginCommand { }), PluginCommand::CloseTerminalPane(pane_id) => Ok(ProtobufPluginCommand { name: CommandName::CloseTerminalPane as i32, - payload: Some(Payload::CloseTerminalPanePayload(pane_id as i32)), + payload: Some(Payload::CloseTerminalPanePayload(pane_id)), }), PluginCommand::ClosePluginPane(pane_id) => Ok(ProtobufPluginCommand { name: CommandName::ClosePluginPane as i32, - payload: Some(Payload::ClosePluginPanePayload(pane_id as i32)), + payload: Some(Payload::ClosePluginPanePayload(pane_id)), }), PluginCommand::FocusTerminalPane(pane_id, should_float_if_hidden) => { Ok(ProtobufPluginCommand { name: CommandName::FocusTerminalPane as i32, payload: Some(Payload::FocusTerminalPanePayload(PaneIdAndShouldFloat { - pane_id: pane_id as i32, + pane_id: pane_id, should_float: should_float_if_hidden, })), }) @@ -821,7 +824,7 @@ impl TryFrom for ProtobufPluginCommand { Ok(ProtobufPluginCommand { name: CommandName::FocusPluginPane as i32, payload: Some(Payload::FocusPluginPanePayload(PaneIdAndShouldFloat { - pane_id: pane_id as i32, + pane_id: pane_id, should_float: should_float_if_hidden, })), }) @@ -829,21 +832,21 @@ impl TryFrom for ProtobufPluginCommand { PluginCommand::RenameTerminalPane(pane_id, new_name) => Ok(ProtobufPluginCommand { name: CommandName::RenameTerminalPane as i32, payload: Some(Payload::RenameTerminalPanePayload(IdAndNewName { - id: pane_id as i32, + id: pane_id, new_name, })), }), PluginCommand::RenamePluginPane(pane_id, new_name) => Ok(ProtobufPluginCommand { name: CommandName::RenamePluginPane as i32, payload: Some(Payload::RenamePluginPanePayload(IdAndNewName { - id: pane_id as i32, + id: pane_id, new_name, })), }), PluginCommand::RenameTab(tab_index, new_name) => Ok(ProtobufPluginCommand { name: CommandName::RenameTab as i32, payload: Some(Payload::RenameTabPayload(IdAndNewName { - id: tab_index as i32, + id: tab_index, new_name, })), }), -- cgit v1.2.3