aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDenis Maximov <denismaximov98@gmail.com>2021-01-06 10:30:01 +0200
committerGitHub <noreply@github.com>2021-01-06 10:30:01 +0200
commit610545f54aad4a1d1a8c03de1cdb5a7debd92ea5 (patch)
tree728c8191fb69ac8b2e9c641a9175bb4e06638eda /src
parentfix(style): Deduplicate a massive chunk of code (diff)
parentwip: added a test (diff)
downloadsl0ppij-610545f54aad4a1d1a8c03de1cdb5a7debd92ea5.tar.gz
sl0ppij-610545f54aad4a1d1a8c03de1cdb5a7debd92ea5.tar.xz
sl0ppij-610545f54aad4a1d1a8c03de1cdb5a7debd92ea5.zip
Merge pull request #131 from mosaic-org/mosaic#130
fix: fixes #130 by adding overflowing_sub
Diffstat (limited to 'src')
-rw-r--r--src/terminal_pane/scroll.rs2
-rw-r--r--src/tests/fixtures/emacs_longbuf_tutorialbin0 -> 9781 bytes
-rw-r--r--src/tests/integration/compatibility.rs23
-rw-r--r--src/tests/integration/snapshots/mosaic__tests__integration__compatibility__emacs_longbuf-2.snap64
-rw-r--r--src/tests/integration/snapshots/mosaic__tests__integration__compatibility__emacs_longbuf-3.snap64
-rw-r--r--src/tests/integration/snapshots/mosaic__tests__integration__compatibility__emacs_longbuf.snap64
6 files changed, 216 insertions, 1 deletions
diff --git a/src/terminal_pane/scroll.rs b/src/terminal_pane/scroll.rs
index 6301c7c1..0bf4c731 100644
--- a/src/terminal_pane/scroll.rs
+++ b/src/terminal_pane/scroll.rs
@@ -266,7 +266,7 @@ impl CursorPosition {
self.column_index += count;
}
pub fn move_backwards(&mut self, count: usize) {
- self.column_index -= count;
+ self.column_index = u32::overflowing_sub(self.column_index as u32, count as u32).0 as usize;
}
pub fn move_to_next_linewrap(&mut self) {
self.line_index.1 += 1;
diff --git a/src/tests/fixtures/emacs_longbuf_tutorial b/src/tests/fixtures/emacs_longbuf_tutorial
new file mode 100644
index 00000000..f383e6d1
--- /dev/null
+++ b/src/tests/fixtures/emacs_longbuf_tutorial
Binary files differ
diff --git a/src/tests/integration/compatibility.rs b/src/tests/integration/compatibility.rs
index e42a26fb..e9b379ab 100644
--- a/src/tests/integration/compatibility.rs
+++ b/src/tests/integration/compatibility.rs
@@ -461,3 +461,26 @@ pub fn git_diff_scrollup() {
assert_snapshot!(snapshot);
}
}
+
+#[test]
+pub fn emacs_longbuf() {
+ let fake_win_size = PositionAndSize {
+ columns: 284,
+ rows: 60,
+ x: 0,
+ y: 0,
+ };
+ let fixture_name = "emacs_longbuf_tutorial";
+ 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__emacs_longbuf-2.snap b/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__emacs_longbuf-2.snap
new file mode 100644
index 00000000..6ab342a0
--- /dev/null
+++ b/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__emacs_longbuf-2.snap
@@ -0,0 +1,64 @@
+---
+source: src/tests/integration/compatibility.rs
+expression: snapshot
+---
+➜ mosaic git:(mosaic#130) emacs
+➜ mosaic git:(mosaic#130) emacs -nw
+➜ mosaic git:(mosaic#130) exit
+█
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__emacs_longbuf-3.snap b/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__emacs_longbuf-3.snap
new file mode 100644
index 00000000..644e2213
--- /dev/null
+++ b/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__emacs_longbuf-3.snap
@@ -0,0 +1,64 @@
+---
+source: src/tests/integration/compatibility.rs
+expression: snapshot
+---
+➜ mosaic git:(mosaic#130) emacs -nw
+➜ mosaic git:(mosaic#130) exit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Bye from Mosaic!█
diff --git a/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__emacs_longbuf.snap b/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__emacs_longbuf.snap
new file mode 100644
index 00000000..8741ce12
--- /dev/null
+++ b/src/tests/integration/snapshots/mosaic__tests__integration__compatibility__emacs_longbuf.snap
@@ -0,0 +1,64 @@
+---
+source: src/tests/integration/compatibility.rs
+expression: snapshot
+---
+█
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+