summaryrefslogtreecommitdiff
path: root/helix-term/tests/integration.rs
diff options
context:
space:
mode:
authorSkyler Hawthorne2022-03-17 03:34:21 +0000
committerSkyler Hawthorne2022-06-19 03:54:03 +0000
commit0f3c10a021bbe79e20bde1f55b87465edeec476d (patch)
treea2d54e96885b5761e806eddd9bd8206071d15e8c /helix-term/tests/integration.rs
parent502d3290fb88d8a871b0824adc7987a98104933d (diff)
Fix initial selection of Document in new view
When a new View of a Document is created, a default cursor of 0, 0 is created, and it does not get normalized to a single width cursor until at least one movement of the cursor happens. This appears to have no practical negative effect that I could find, but it makes tests difficult to work with, since the initial selection is not what you expect it to be. This changes the initial selection of a new View to be the width of the first grapheme in the text.
Diffstat (limited to 'helix-term/tests/integration.rs')
-rw-r--r--helix-term/tests/integration.rs112
1 files changed, 86 insertions, 26 deletions
diff --git a/helix-term/tests/integration.rs b/helix-term/tests/integration.rs
index 31a0d218..58883d40 100644
--- a/helix-term/tests/integration.rs
+++ b/helix-term/tests/integration.rs
@@ -2,9 +2,9 @@
mod integration {
use std::path::PathBuf;
- use helix_core::{syntax::AutoPairConfig, Position, Selection, Tendril, Transaction};
+ use helix_core::{syntax::AutoPairConfig, Position, Selection, Transaction};
use helix_term::{application::Application, args::Args, config::Config};
- use helix_view::{current, doc, input::parse_macro};
+ use helix_view::{doc, input::parse_macro};
use crossterm::event::{Event, KeyEvent};
use indoc::indoc;
@@ -25,14 +25,14 @@ mod integration {
let mut app =
app.unwrap_or_else(|| Application::new(Args::default(), Config::default()).unwrap());
- let (view, doc) = current!(app.editor);
+ let (view, doc) = helix_view::current!(app.editor);
+ let sel = doc.selection(view.id).clone();
+ // replace the initial text with the input text
doc.apply(
- &Transaction::insert(
- doc.text(),
- &Selection::single(1, 0),
- Tendril::from(&test_case.in_text),
- )
+ &Transaction::change_by_selection(&doc.text(), &sel, |_| {
+ (0, doc.text().len_chars(), Some((&test_case.in_text).into()))
+ })
.with_selection(test_case.in_selection.clone()),
view.id,
);
@@ -80,12 +80,12 @@ mod integration {
Args::default(),
Config::default(),
TestCase {
- in_text: String::new(),
+ in_text: "\n".into(),
in_selection: Selection::single(0, 1),
// TODO: fix incorrect selection on new doc
- in_keys: String::from("ihello world<esc>hl"),
- out_text: String::from("hello world\n"),
- out_selection: Selection::single(11, 12),
+ in_keys: "ihello world<esc>".into(),
+ out_text: "hello world\n".into(),
+ out_selection: Selection::single(12, 11),
},
)?;
@@ -93,16 +93,74 @@ mod integration {
}
#[tokio::test]
- async fn auto_pairs_basic() -> anyhow::Result<()> {
+ async fn insert_mode_cursor_position() -> anyhow::Result<()> {
test_key_sequence_text_result(
Args::default(),
Config::default(),
TestCase {
in_text: String::new(),
+ in_selection: Selection::single(0, 0),
+ in_keys: "i".into(),
+ out_text: String::new(),
+ out_selection: Selection::single(0, 0),
+ },
+ )?;
+
+ test_key_sequence_text_result(
+ Args::default(),
+ Config::default(),
+ TestCase {
+ in_text: "\n".into(),
+ in_selection: Selection::single(0, 1),
+ in_keys: "i".into(),
+ out_text: "\n".into(),
+ out_selection: Selection::single(1, 0),
+ },
+ )?;
+
+ test_key_sequence_text_result(
+ Args::default(),
+ Config::default(),
+ TestCase {
+ in_text: "\n".into(),
in_selection: Selection::single(0, 1),
- in_keys: String::from("i(<esc>hl"),
- out_text: String::from("()\n"),
- out_selection: Selection::single(1, 2),
+ in_keys: "i<esc>i".into(),
+ out_text: "\n".into(),
+ out_selection: Selection::single(1, 0),
+ },
+ )?;
+
+ Ok(())
+ }
+
+ #[tokio::test]
+ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
+ test_key_sequence_text_result(
+ Args::default(),
+ Config::default(),
+ TestCase {
+ in_text: "\n".into(),
+ in_selection: Selection::single(0, 1),
+ in_keys: "i".into(),
+ out_text: "\n".into(),
+ out_selection: Selection::single(1, 0),
+ },
+ )?;
+
+ Ok(())
+ }
+
+ #[tokio::test]
+ async fn auto_pairs_basic() -> anyhow::Result<()> {
+ test_key_sequence_text_result(
+ Args::default(),
+ Config::default(),
+ TestCase {
+ in_text: "\n".into(),
+ in_selection: Selection::single(0, 1),
+ in_keys: "i(<esc>".into(),
+ out_text: "()\n".into(),
+ out_selection: Selection::single(2, 1),
},
)?;
@@ -116,11 +174,11 @@ mod integration {
..Default::default()
},
TestCase {
- in_text: String::new(),
+ in_text: "\n".into(),
in_selection: Selection::single(0, 1),
- in_keys: String::from("i(<esc>hl"),
- out_text: String::from("(\n"),
- out_selection: Selection::single(1, 2),
+ in_keys: "i(<esc>".into(),
+ out_text: "(\n".into(),
+ out_selection: Selection::single(2, 1),
},
)?;
@@ -136,15 +194,17 @@ mod integration {
},
Config::default(),
TestCase {
- in_text: String::from("void foo() {}"),
- in_selection: Selection::single(12, 13),
- in_keys: String::from("i<ret><esc>"),
- out_text: String::from(indoc! {r#"
+ in_text: "void foo() {}\n".into(),
+ in_selection: Selection::single(13, 12),
+ in_keys: "i<ret><esc>".into(),
+ out_text: indoc! {r#"
void foo() {
}
- "#}),
- out_selection: Selection::single(15, 16),
+ "#}
+ .trim_start()
+ .into(),
+ out_selection: Selection::single(16, 15),
},
)?;