summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorheyrict <xiezh0831@yahoo.co.jp>2020-04-25 22:52:27 +0800
committerheyrict <xiezh0831@yahoo.co.jp>2020-04-25 22:52:27 +0800
commit444334ad206a68132fa6257b83c3992b7b790981 (patch)
treea2838314b83e94f75b32f5d1fb9cb059d2db3251 /src
parent479d4a72fa58fd8aa777acd8228d4834407a7b6a (diff)
parent9796a66a9679597676e7fd859197fd542e8042dc (diff)
Merge branch 'positional-segments' into style-variables
Diffstat (limited to 'src')
-rw-r--r--src/formatter/string_formatter.rs13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/formatter/string_formatter.rs b/src/formatter/string_formatter.rs
index 682cfcf3b..e7977cbdc 100644
--- a/src/formatter/string_formatter.rs
+++ b/src/formatter/string_formatter.rs
@@ -216,7 +216,7 @@ mod tests {
use super::*;
use ansi_term::Color;
- // match_next(result: Iter<Segment>, value, style)
+ // match_next(result: IterMut<Segment>, value, style)
macro_rules! match_next {
($iter:ident, $value:literal, $($style:tt)+) => {
let _next = $iter.next().unwrap();
@@ -398,6 +398,17 @@ mod tests {
}
#[test]
+ fn test_variable_holder() {
+ const FORMAT_STR: &str = "($a [($b) $c](none $s)) $d [t]($t)";
+ let expected_variables =
+ BTreeSet::from_iter(vec!["a", "b", "c", "d"].into_iter().map(String::from));
+
+ let formatter = StringFormatter::new(FORMAT_STR).unwrap().map(empty_mapper);
+ let variables = formatter.get_variables();
+ assert_eq!(variables, expected_variables);
+ }
+
+ #[test]
fn test_parse_error() {
// brackets without escape
{