summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRyan Geary <rtgnj42@gmail.com>2022-04-23 15:16:32 -0400
committerRyan Geary <7076013+theryangeary@users.noreply.github.com>2022-04-23 17:26:21 -0400
commitbd32530e84c960897c56f856448c93e0480ffc4d (patch)
tree47828e6a78305dbdfba959a1e15697f15eaa3454 /src
parent97b3abf5204badf60eb79be6be07285bdef83049 (diff)
Fix positive start, negative end, length 1 choice is empty
Diffstat (limited to 'src')
-rw-r--r--src/choice/mod.rs2
-rw-r--r--src/choice/test/get_negative_start_end.rs10
-rw-r--r--src/choice/test/print_choice.rs30
3 files changed, 42 insertions, 0 deletions
diff --git a/src/choice/mod.rs b/src/choice/mod.rs
index 4a4e88f..b835eb8 100644
--- a/src/choice/mod.rs
+++ b/src/choice/mod.rs
@@ -140,6 +140,8 @@ impl Choice {
handle.write_choice(*word, config, true)?;
}
handle.write_choice(vec[end], config, false)?;
+ } else if start == end && self.start < vec.len().try_into()? {
+ handle.write_choice(vec[start], config, false)?;
}
}
diff --git a/src/choice/test/get_negative_start_end.rs b/src/choice/test/get_negative_start_end.rs
index deef6ea..edbc5bb 100644
--- a/src/choice/test/get_negative_start_end.rs
+++ b/src/choice/test/get_negative_start_end.rs
@@ -132,6 +132,16 @@ fn positive_negative_some() {
}
#[test]
+fn positive_negative_same() {
+ let config = Config::from_iter(vec!["choose", "1:-3"]);
+ let slice = &[0, 1, 2, 3];
+ assert_eq!(
+ Some((1, 1)),
+ config.opt.choices[0].get_negative_start_end(slice).unwrap()
+ );
+}
+
+#[test]
fn error_when_choice_is_isize_min() {
let isize_min = format!("{}", isize::MIN);
let config = Config::from_iter(vec!["choose", &isize_min]);
diff --git a/src/choice/test/print_choice.rs b/src/choice/test/print_choice.rs
index 31fa941..63a63b5 100644
--- a/src/choice/test/print_choice.rs
+++ b/src/choice/test/print_choice.rs
@@ -1000,3 +1000,33 @@ fn print_after_to_after_empty() {
fn print_negative_end_to_negative_end_empty() {
test_fn(vec!["choose", "-1:-1"], "", "");
}
+
+#[test]
+fn print_positive_to_following_negative() {
+ test_fn(vec!["choose", "1:-3"], "a b c d e", "b c");
+}
+
+#[test]
+fn print_positive_to_same_as_negative() {
+ test_fn(vec!["choose", "1:-4"], "a b c d e", "b");
+}
+
+#[test]
+fn print_positive_to_preceding_negative() {
+ test_fn(vec!["choose", "1:-5"], "a b c d e", "");
+}
+
+#[test]
+fn print_end_to_last_negative_is_last() {
+ test_fn(vec!["choose", "4:-1"], "a b c d e", "e");
+}
+
+#[test]
+fn print_after_end_to_last_negative_is_empty() {
+ test_fn(vec!["choose", "5:-1"], "a b c d e", "");
+}
+
+#[test]
+fn print_after_end_to_second_to_last_negative_is_empty() {
+ test_fn(vec!["choose", "5:-2"], "a b c d e", "");
+}