Skip to content

Use tab pos instead of tab idx for ScreenInstruction::RenameTab #4179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use tab pos instead of tab idx for ScreenInstruction::RenameTab #4179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions zellij-server/src/plugins/zellij_exports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1805,9 +1805,9 @@ fn rename_plugin_pane(env: &PluginEnv, plugin_pane_id: u32, new_name: &str) {
apply_action!(rename_pane_action, error_msg, env);
}

fn rename_tab(env: &PluginEnv, tab_index: u32, new_name: &str) {
fn rename_tab(env: &PluginEnv, tab_position: u32, new_name: &str) {
let error_msg = || format!("Failed to rename tab");
let rename_tab_action = Action::RenameTab(tab_index, new_name.as_bytes().to_vec());
let rename_tab_action = Action::RenameTab(tab_position, new_name.as_bytes().to_vec());
apply_action!(rename_tab_action, error_msg, env);
}

Expand Down
10 changes: 7 additions & 3 deletions zellij-server/src/screen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4727,13 +4727,17 @@ pub(crate) fn screen_thread_main(
}
screen.log_and_report_session_state()?;
},
ScreenInstruction::RenameTab(tab_index, new_name) => {
match screen.tabs.get_mut(&tab_index.saturating_sub(1)) {
ScreenInstruction::RenameTab(tab_position, new_name) => {
match screen
.tabs
.values_mut()
.find(|t| t.position == tab_position)
{
Some(tab) => {
tab.name = String::from_utf8_lossy(&new_name).to_string();
},
None => {
log::error!("Failed to find tab with index: {:?}", tab_index);
log::error!("Failed to find tab with position: {:?}", tab_position);
},
}
screen.log_and_report_session_state()?;
Expand Down
8 changes: 4 additions & 4 deletions zellij-utils/src/plugin_api/action.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,9 +664,9 @@ impl TryFrom<ProtobufAction> for Action {
},
Some(ProtobufActionName::RenameTab) => match protobuf_action.optional_payload {
Some(OptionalPayload::RenameTabPayload(payload)) => {
let tab_index = payload.id;
let tab_position = payload.id;
let new_tab_name = payload.name;
Ok(Action::RenameTab(tab_index, new_tab_name))
Ok(Action::RenameTab(tab_position, new_tab_name))
},
_ => Err("Wrong payload for Action::RenameTab"),
},
Expand Down Expand Up @@ -1215,11 +1215,11 @@ impl TryFrom<Action> for ProtobufAction {
id: plugin_pane_id,
})),
}),
Action::RenameTab(tab_index, new_name) => Ok(ProtobufAction {
Action::RenameTab(tab_position, new_name) => Ok(ProtobufAction {
name: ProtobufActionName::RenameTab as i32,
optional_payload: Some(OptionalPayload::RenameTabPayload(IdAndName {
name: new_name,
id: tab_index,
id: tab_position,
})),
}),
Action::BreakPane => Ok(ProtobufAction {
Expand Down