Add manual tab names with selected-pane fallback
This commit is contained in:
+134
-3
@@ -647,6 +647,15 @@ impl Server {
|
||||
self.refresh_directories();
|
||||
self.dirty = true;
|
||||
}
|
||||
ClientMessage::RenameTab { tab, name } => {
|
||||
self.tabs
|
||||
.iter_mut()
|
||||
.find(|entry| entry.id == tab)
|
||||
.context("unknown tab")?
|
||||
.manual_title = name.and_then(clean_title);
|
||||
self.refresh_directories();
|
||||
self.dirty = true;
|
||||
}
|
||||
ClientMessage::Hello { .. } | ClientMessage::Shutdown => unreachable!(),
|
||||
}
|
||||
Ok(())
|
||||
@@ -881,6 +890,7 @@ impl Server {
|
||||
self.tabs.push(TabInfo {
|
||||
id,
|
||||
title: "Shell".into(),
|
||||
manual_title: None,
|
||||
panes: vec![pane],
|
||||
active_pane: pane,
|
||||
stacks: vec![single_pane_stack(pane)],
|
||||
@@ -939,9 +949,11 @@ impl Server {
|
||||
fn snapshot(&mut self) -> Snapshot {
|
||||
self.revision += 1;
|
||||
for tab in &mut self.tabs {
|
||||
if let Some(pane) = self.panes.get(&tab.active_pane) {
|
||||
tab.title = pane.title();
|
||||
}
|
||||
tab.title = tab
|
||||
.manual_title
|
||||
.clone()
|
||||
.or_else(|| self.panes.get(&tab.active_pane).map(Pane::title))
|
||||
.unwrap_or_else(|| "Shell".into());
|
||||
for stack in &mut tab.stacks {
|
||||
for entry in &mut stack.panes {
|
||||
if let Some(pane) = self.panes.get(&entry.id) {
|
||||
@@ -1942,6 +1954,125 @@ mod tests {
|
||||
assert!(automatic.panes[0].manual_title.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn manual_tab_names_override_selected_panes_and_survive_clients_and_exit() {
|
||||
let server = TestServer::start();
|
||||
let mut client = server.client();
|
||||
send(&mut client, ClientMessage::Attach);
|
||||
let initial = snapshot(&mut client, |s| s.panes.len() == 1);
|
||||
let tab = initial.active_tab;
|
||||
let first = initial.panes[0].id;
|
||||
assert!(active_tab(&initial).manual_title.is_none());
|
||||
assert_eq!(active_tab(&initial).title, initial.panes[0].title);
|
||||
|
||||
input(&mut client, first, "printf '\\033]2;Codex\\007'\n");
|
||||
snapshot(&mut client, |s| active_tab(s).title == "Codex");
|
||||
send(
|
||||
&mut client,
|
||||
ClientMessage::NewStackPane {
|
||||
pane: None,
|
||||
direction: VerticalDirection::Down,
|
||||
cwd: None,
|
||||
},
|
||||
);
|
||||
let stacked = snapshot(&mut client, |s| active_tab(s).panes.len() == 2);
|
||||
let second = active_tab(&stacked).active_pane;
|
||||
send(
|
||||
&mut client,
|
||||
ClientMessage::RenamePane {
|
||||
pane: second,
|
||||
name: Some("Build".into()),
|
||||
},
|
||||
);
|
||||
snapshot(&mut client, |s| active_tab(s).title == "Build");
|
||||
send(
|
||||
&mut client,
|
||||
ClientMessage::RenameTab {
|
||||
tab,
|
||||
name: Some(" Pro\nject\t\u{7} ".into()),
|
||||
},
|
||||
);
|
||||
let named = snapshot(&mut client, |s| active_tab(s).title == "Project");
|
||||
assert_eq!(active_tab(&named).manual_title.as_deref(), Some("Project"));
|
||||
assert_eq!(named.panes[0].title, "Build");
|
||||
|
||||
send(&mut client, ClientMessage::FocusPane { pane: first });
|
||||
input(&mut client, first, "printf '\\033]2;Editor\\007'\n");
|
||||
let changed = snapshot(&mut client, |s| s.panes[0].title == "Editor");
|
||||
assert_eq!(active_tab(&changed).title, "Project");
|
||||
send(&mut client, ClientMessage::FocusPane { pane: second });
|
||||
input(&mut client, second, "exit\n");
|
||||
let exited = snapshot(&mut client, |s| active_tab(s).panes.len() == 1);
|
||||
assert_eq!(active_tab(&exited).active_pane, first);
|
||||
assert_eq!(active_tab(&exited).title, "Project");
|
||||
|
||||
send(&mut client, ClientMessage::NewTab { cwd: None });
|
||||
let another = snapshot(&mut client, |s| s.tabs.len() == 2);
|
||||
let other_tab = another.active_tab;
|
||||
assert!(active_tab(&another).manual_title.is_none());
|
||||
assert_eq!(active_tab(&another).title, another.panes[0].title);
|
||||
// An independent client can rename an inactive tab without stealing
|
||||
// focus. All attached views receive the server's name immediately.
|
||||
let mut other = server.client();
|
||||
send(
|
||||
&mut other,
|
||||
ClientMessage::RenameTab {
|
||||
tab,
|
||||
name: Some("Server name".into()),
|
||||
},
|
||||
);
|
||||
let renamed = snapshot(&mut client, |s| {
|
||||
s.tabs
|
||||
.iter()
|
||||
.any(|entry| entry.id == tab && entry.title == "Server name")
|
||||
});
|
||||
assert_eq!(renamed.active_tab, other_tab);
|
||||
send(&mut client, ClientMessage::Detach);
|
||||
drop(client);
|
||||
let mut client = server.client();
|
||||
send(&mut client, ClientMessage::Attach);
|
||||
let reattached = snapshot(&mut client, |s| s.tabs.len() == 2);
|
||||
let saved = reattached
|
||||
.tabs
|
||||
.iter()
|
||||
.find(|entry| entry.id == tab)
|
||||
.unwrap();
|
||||
assert_eq!(saved.title, "Server name");
|
||||
assert_eq!(saved.manual_title.as_deref(), Some("Server name"));
|
||||
|
||||
send(&mut client, ClientMessage::FocusTab { tab });
|
||||
send(
|
||||
&mut client,
|
||||
ClientMessage::RenameTab {
|
||||
tab,
|
||||
name: Some(" \n\t ".into()),
|
||||
},
|
||||
);
|
||||
let automatic = snapshot(&mut client, |s| active_tab(s).title == "Editor");
|
||||
assert!(active_tab(&automatic).manual_title.is_none());
|
||||
input(&mut client, first, "printf '\\033]2;Changed\\007'\n");
|
||||
snapshot(&mut client, |s| active_tab(s).title == "Changed");
|
||||
send(
|
||||
&mut client,
|
||||
ClientMessage::RenamePane {
|
||||
pane: first,
|
||||
name: Some("Pane override".into()),
|
||||
},
|
||||
);
|
||||
snapshot(&mut client, |s| active_tab(s).title == "Pane override");
|
||||
send(
|
||||
&mut client,
|
||||
ClientMessage::RenameTab {
|
||||
tab,
|
||||
name: Some("Pinned again".into()),
|
||||
},
|
||||
);
|
||||
snapshot(&mut client, |s| active_tab(s).title == "Pinned again");
|
||||
send(&mut client, ClientMessage::RenameTab { tab, name: None });
|
||||
let automatic = snapshot(&mut client, |s| active_tab(s).title == "Pane override");
|
||||
assert!(active_tab(&automatic).manual_title.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn displayed_titles_are_bounded_single_line_text() {
|
||||
assert_eq!(
|
||||
|
||||
Reference in New Issue
Block a user