From 97980d618f9a79321b511fd23a114eef88c8632f Mon Sep 17 00:00:00 2001
From: Aram Drevekenin <aram@poor.dev>
Date: Thu, 17 Dec 2020 16:33:18 +0100
Subject: [PATCH] fix(compatibility): fix bash linewrap (#109)

---
 src/terminal_pane/scroll.rs                   |   2 +-
 src/tests/fixtures/bash_cursor_linewrap       | Bin 0 -> 1346 bytes
 src/tests/integration/compatibility.rs        |  25 ++++++++++++++
 ...compatibility__bash_cursor_linewrap-2.snap |  32 ++++++++++++++++++
 ...__compatibility__bash_cursor_linewrap.snap |  32 ++++++++++++++++++
 5 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 src/tests/fixtures/bash_cursor_linewrap
 create mode 100644 src/tests/integration/snapshots/mosaic__tests__integration__compatibility__bash_cursor_linewrap-2.snap
 create mode 100644 src/tests/integration/snapshots/mosaic__tests__integration__compatibility__bash_cursor_linewrap.snap

diff --git a/src/terminal_pane/scroll.rs b/src/terminal_pane/scroll.rs
index 8bd304f1..f86cf5f8 100644
--- a/src/terminal_pane/scroll.rs
+++ b/src/terminal_pane/scroll.rs
@@ -384,7 +384,7 @@ impl Scroll {
             .get_mut(wrapped_fragment_index_in_line)
             .expect("cursor out of bounds");
 
-        if cursor_position_in_line <= self.total_columns {
+        if cursor_position_in_line < self.total_columns {
             current_wrapped_fragment.add_character(terminal_character, cursor_position_in_line);
             self.cursor_position.move_forward(1);
         } else {
diff --git a/src/tests/fixtures/bash_cursor_linewrap b/src/tests/fixtures/bash_cursor_linewrap
new file mode 100644
index 0000000000000000000000000000000000000000..2e183a1f56a6c5e71c4ab334b229111cbf2c60fa
GIT binary patch
literal 1346
zcmcgs%}#?r5awpngeTa`9z1w3VfkO$M2#H#03JvWTe=Df0|^ilFFt@K`WoJRr#^|Z
zbZODVhLGr9fSF;w`M#YQvS!QsyveAQRUj=<3$W5^D=nxRk*8-Qarx3;G9U?%i(CEa
zxFPJ`-}W~8|HnjdYLaAiCyNy8rfo$Pi%Z&OlHS+3EVsoI&C6ESB5m_WNt;X-g*i7!
za_unYWd@nV-1bokPe~HM?)BwLOQ3ae;n_;HblOvuv=<FP<fS(6K0eXDA_@26-tRH6
zg9T#?7VM*tq0M-V566p*4F<cTf_;n{9XiwS5qtyqdE=*w^JA2?>k|jVM3W&r>noj>
zC;~A^IXz>bq;UFLRC&Kj92{6g&<wyQvk4WpJqkM<U{A*53h$u%Nv=Ge;lcKT&GEX1
z1Aa;<u8JKEWX`pg$42NTu;?aG!H?WMX7_{IP&W^?l;r|vZLq15qlfO7*ZQ0qw&Qw!
M5c246UZ`n&0j_F2=Kufz

literal 0
HcmV?d00001

diff --git a/src/tests/integration/compatibility.rs b/src/tests/integration/compatibility.rs
index 467a99ca..65dc8da9 100644
--- a/src/tests/integration/compatibility.rs
+++ b/src/tests/integration/compatibility.rs
@@ -363,3 +363,28 @@ pub fn neovim_insert_mode() {
         assert_snapshot!(snapshot);
     }
 }
+
+#[test]
+pub fn bash_cursor_linewrap() {
+    // this test makes sure that when we enter a command that is beyond the screen border, that it
+    // immediately goes down one line
+    let fake_win_size = PositionAndSize {
+        columns: 116,
+        rows: 28,
+        x: 0,
+        y: 0,
+    };
+    let fixture_name = "bash_cursor_linewrap";
+    let mut fake_input_output = get_fake_os_input(&fake_win_size, fixture_name);
+    fake_input_output.add_terminal_input(&[&COMMAND_TOGGLE, &COMMAND_TOGGLE, &QUIT]);
+    start(Box::new(fake_input_output.clone()), Opt::default());
+    let output_frames = fake_input_output
+        .stdout_writer
+        .output_frames
+        .lock()
+        .unwrap();
+    let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size);
+    for snapshot in snapshots {
+        assert_snapshot!(snapshot);
+    }
+}
diff --git a/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__bash_cursor_linewrap-2.snap b/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__bash_cursor_linewrap-2.snap
new file mode 100644
index 00000000..a07cffba
--- /dev/null
+++ b/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__bash_cursor_linewrap-2.snap
@@ -0,0 +1,32 @@
+---
+source: src/tests/integration/compatibility.rs
+expression: snapshot
+---
+⋊> ~/c/mosaic on main ⨯ bash                                                                                16:00:06
+[aram@green mosaic]$ 12345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+Bye from Mosaic!█                                                                                                   
diff --git a/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__bash_cursor_linewrap.snap b/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__bash_cursor_linewrap.snap
new file mode 100644
index 00000000..2736e8b8
--- /dev/null
+++ b/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__bash_cursor_linewrap.snap
@@ -0,0 +1,32 @@
+---
+source: src/tests/integration/compatibility.rs
+expression: snapshot
+---
+Welcome to fish, the friendly interactive shell                                                                     
+⋊> ~/c/mosaic on main ⨯ bash                                                                                16:00:06
+[aram@green mosaic]$ 12345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345
+█                                                                                                                   
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+                                                                                                                    
+