Skip to content
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

Jump to bottom

Fix crash on renaming a floating pane (#1323) #1357

Merged
merged 6 commits into from
Apr 29, 2022
Merged

Fix crash on renaming a floating pane (#1323) #1357

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
274dad5
Fix crash on renaming a floating pane (#1323)
raphCode Apr 28, 2022
d939ae6
Add rename tests for embedded and floating panes
raphCode Apr 28, 2022
5d89671
Merge remote-tracking branch 'upstream/main' into fix_floating_rename
raphCode Apr 29, 2022
9646b11
docs(changelog): fix floating pane rename
raphCode Apr 29, 2022
a132766
Merge remote-tracking branch 'upstream/main' into fix_floating_rename
raphCode Apr 29, 2022
e55e5cf
delete merge conflict file
raphCode Apr 29, 2022
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
12 changes: 8 additions & 4 deletions zellij-server/src/tab/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1741,10 +1741,14 @@ impl Tab {

pub fn update_active_pane_name(&mut self, buf: Vec<u8>, client_id: ClientId) {
if let Some(active_terminal_id) = self.get_active_terminal_id(client_id) {
let active_terminal = self
.tiled_panes
.get_pane_mut(PaneId::Terminal(active_terminal_id))
.unwrap();
let active_terminal = if self.are_floating_panes_visible() {
self.floating_panes
.get_pane_mut(PaneId::Terminal(active_terminal_id))
} else {
self.tiled_panes
.get_pane_mut(PaneId::Terminal(active_terminal_id))
}
.unwrap();

// It only allows printable unicode, delete and backspace keys.
let is_updatable = buf.iter().all(|u| matches!(u, 0x20..=0x7E | 0x08 | 0x7F));
Expand Down
25 changes: 25 additions & 0 deletions ...c/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__rename_embedded_pane.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
source: zellij-server/src/tab/./unit/tab_integration_tests.rs
expression: snapshot
---
00 (C): ┌ Renamed empedded pane ────────────────────────────────────────────────────────────────────────────────────────────────┐
01 (C): │ │
02 (C): │ │
03 (C): │ │
04 (C): │ I am an embedded pane │
05 (C): │ │
06 (C): │ │
07 (C): │ │
08 (C): │ │
09 (C): │ │
10 (C): │ │
11 (C): │ │
12 (C): │ │
13 (C): │ │
14 (C): │ │
15 (C): │ │
16 (C): │ │
17 (C): │ │
18 (C): │ │
19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘

25 changes: 25 additions & 0 deletions ...c/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__rename_floating_pane.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
source: zellij-server/src/tab/./unit/tab_integration_tests.rs
expression: snapshot
---
00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
01 (C): │ │
02 (C): │ │
03 (C): │ │
04 (C): │ │
05 (C): │ ┌ Renamed floating pane ───────────────────────────────────┐ │
06 (C): │ │ │ │
07 (C): │ │ │ │
08 (C): │ │ │ │
09 (C): │ │ I am a floating pane │ │
10 (C): │ │ │ │
11 (C): │ │ │ │
12 (C): │ │ │ │
13 (C): │ │ │ │
14 (C): │ └──────────────────────────────────────────────────────────┘ │
15 (C): │ │
16 (C): │ │
17 (C): │ │
18 (C): │ │
19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘

51 changes: 51 additions & 0 deletions zellij-server/src/tab/unit/tab_integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,3 +1093,54 @@ fn replacing_existing_wide_characters() {
);
assert_snapshot!(snapshot);
}

#[test]
fn rename_embedded_pane() {
let size = Size {
cols: 121,
rows: 20,
};
let client_id = 1;
let mut tab = create_new_tab(size);
let mut output = Output::default();
tab.handle_pty_bytes(
1,
Vec::from("\n\n\n I am an embedded pane".as_bytes()),
);
tab.update_active_pane_name("Renamed empedded pane".as_bytes().to_vec(), client_id);
tab.render(&mut output, None);
let snapshot = take_snapshot(
output.serialize().get(&client_id).unwrap(),
size.rows,
size.cols,
Palette::default(),
);
assert_snapshot!(snapshot);
}

#[test]
fn rename_floating_pane() {
let size = Size {
cols: 121,
rows: 20,
};
let client_id = 1;
let mut tab = create_new_tab(size);
let new_pane_id = PaneId::Terminal(2);
let mut output = Output::default();
tab.new_pane(new_pane_id, Some(client_id));
tab.handle_pty_bytes(
2,
Vec::from("\n\n\n I am a floating pane".as_bytes()),
);
tab.toggle_pane_embed_or_floating(client_id);
tab.update_active_pane_name("Renamed floating pane".as_bytes().to_vec(), client_id);
tab.render(&mut output, None);
let snapshot = take_snapshot(
output.serialize().get(&client_id).unwrap(),
size.rows,
size.cols,
Palette::default(),
);
assert_snapshot!(snapshot);
}