first return all-hyphens & all_underscores

frewsxcv · Jul 31, 2023 · 6b66356 · 6b66356
1 parent b63ec37
commit 6b66356
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/names.rs b/src/names.rs
@@ -60,8 +60,11 @@ impl Iterator for Names {
                         return None;
                     }
 
+                    //map the count so the first value is the last one (all "-"), the second one is the first one (all "_")...
+                    let used_count = *count as isize - 1 + self.max_count as isize;
+
                     for (sep_index, char_index) in self.separator_indexes[..self.separator_count].iter().enumerate() {
-                        let char = if *count & (1 << sep_index) == 0 { b'-' } else { b'_' };
+                        let char = if used_count & (1 << sep_index) == 0 { b'_' } else { b'-' };
                         // SAFETY: We validated that `char_index` is a valid UTF-8 codepoint
                         #[allow(unsafe_code)]
                         unsafe {

diff --git a/tests/names/mod.rs b/tests/names/mod.rs
@@ -46,19 +46,25 @@ fn max_permutation_count_causes_error() {
 fn permutations() {
     for (name, expected) in [
         ("parking_lot", &["parking_lot", "parking-lot"] as &[_]), // the input name is always the first one returned.
+        (
+            "a-b_c-d", // input name -> all-hyphens -> all_underscores -> rest
+            &[
+                "a-b_c-d", "a-b-c-d", "a_b_c_d", "a-b_c_d", "a_b-c_d", "a-b-c_d", "a_b_c-d", "a_b-c-d",
+            ],
+        ),
         ("a_b", &["a_b", "a-b"]),
         ("a-b", &["a-b", "a_b"]),
-        ("a-b-c", &["a-b-c", "a_b-c", "a-b_c", "a_b_c"]),
+        ("a-b-c", &["a-b-c", "a_b_c", "a-b_c", "a_b-c"]),
         (
             "a-b-c-d",
             &[
-                "a-b-c-d", "a_b-c-d", "a-b_c-d", "a_b_c-d", "a-b-c_d", "a_b-c_d", "a-b_c_d", "a_b_c_d",
+                "a-b-c-d", "a_b_c_d", "a-b_c_d", "a_b-c_d", "a-b-c_d", "a_b_c-d", "a-b_c-d", "a_b-c-d",
             ],
         ),
         (
             "a_b_c_d",
             &[
-                "a_b_c_d", "a-b-c-d", "a_b-c-d", "a-b_c-d", "a_b_c-d", "a-b-c_d", "a_b-c_d", "a-b_c_d",
+                "a_b_c_d", "a-b-c-d", "a-b_c_d", "a_b-c_d", "a-b-c_d", "a_b_c-d", "a-b_c-d", "a_b-c-d",
             ],
         ),
     ] {