swap to vec of pairs to store all jump labels to make code cleaner.

helix-term/src/commands.rs

@@ -6160,43 +6160,28 @@ fn jump_to_label(cx: &mut Context, labels: Vec<Range>, behaviour: Movement) {
     let alphabet = &cx.editor.config().jump_label_alphabet;
     let follow_blacklist = &cx.editor.config().jump_label_follow_blacklist;
     let jump_label_lookup = follow_blacklist.get_allow_list(alphabet);
-    let partial_sums = jump_label_lookup
+    let mut used_first_chars = vec![];
-        .alphabet
-        .iter()
-        .map(|c| jump_label_lookup.follow_whitelist.get(c).unwrap())
-        .map(|v| v.len())
-        .fold(vec![0], |mut acc, curr| {
-            acc.push(acc.last().unwrap() + curr);
-            acc
-        });
 
-    let make_jump_label = |i| {
+    let mut make_jump_label = |i| {
-        // finding, based on the total number of overlays generated so far, what the index into the
+        let (first_ch, second_ch) =
-        // first characters and second characters respectively should be.
+            jump_label_lookup
-        let first_i = partial_sums.iter().take_while(|p| p <= &&i).count() - 1;
+                .allowed_jump_labels
-
+                .get(i)
-        let second_i = i - partial_sums
+                .unwrap_or_else(|| {
-            .get(first_i)
-            .unwrap_or_else(|| panic!("first_i outside of partial_sums indices."));
-
-        let first = *jump_label_lookup.alphabet.get(first_i).unwrap_or_else(|| {
                     panic!(
-                "alphabet_char called with i ({}) greater than the number of valid pairs ({}).",
+                        "{} is outside the bounds of allowed_jump_labels ({})",
                         i,
-                partial_sums.last().unwrap()
+                        jump_label_lookup.allowed_jump_labels.len()
                     )
                 });
 
-        let second = jump_label_lookup.follow_whitelist.get(&first)
+        used_first_chars.push(*first_ch);
-                .unwrap_or_else(|| {
-                    panic!("there should not be any first chars created which don't have entries in follow_whitelist.")
-                })[second_i];
 
         let mut first_res = Tendril::new();
         let mut second_res = Tendril::new();
 
-        first_res.push(first);
+        first_res.push(*first_ch);
-        second_res.push(second);
+        second_res.push(*second_ch);
         (first_res, second_res)
     };
 
@@ -6228,36 +6213,28 @@ fn jump_to_label(cx: &mut Context, labels: Vec<Range>, behaviour: Movement) {
     let view = view.id;
     let doc = doc.id();
     cx.on_next_key(move |cx, event| {
-        let Some((first_ch, i)) = event.char().and_then(|ch| {
+        let Some(first_ch) = event.char() else {
-            jump_label_lookup
-                .alphabet
-                .iter()
-                .position(|&it| it == ch)
-                .map(|i| (ch, i))
-        }) else {
             doc_mut!(cx.editor, &doc).remove_jump_labels(view);
             return;
         };
-        let outer = partial_sums[i];
         // Bail if the given character cannot be a jump label.
-        if outer > labels.len() {
+        if !used_first_chars.contains(&first_ch) {
             doc_mut!(cx.editor, &doc).remove_jump_labels(view);
             return;
         }
+
         cx.on_next_key(move |cx, event| {
             doc_mut!(cx.editor, &doc).remove_jump_labels(view);
-            let Some(inner) = event.char().and_then(|ch| {
+            let Some(index) = event.char().and_then(|ch| {
                 jump_label_lookup
-                    .follow_whitelist
+                    .allowed_jump_labels
-                    .get(&first_ch)
-                    .unwrap_or(&vec![])
                     .iter()
-                    .position(|&it| it == ch)
+                    .position(|&it| it == (first_ch, ch))
             }) else {
                 return;
             };
 
-            if let Some(mut range) = labels.get(outer + inner).copied() {
+            if let Some(mut range) = labels.get(index).copied() {
                 range = if behaviour == Movement::Extend {
                     let anchor = if range.anchor < range.head {
                         let from = primary_selection.from();
@@ -6290,11 +6267,8 @@ fn jump_to_word(cx: &mut Context, behaviour: Movement) {
     let alphabet = &cx.editor.config().jump_label_alphabet;
     let follow_blacklist = &cx.editor.config().jump_label_follow_blacklist;
     let jump_label_lookup = follow_blacklist.get_allow_list(alphabet);
-    let jump_label_limit = jump_label_lookup
+    let jump_label_limit = jump_label_lookup.allowed_jump_labels.len();
-        .follow_whitelist
+
-        .values()
-        .map(|v| v.len())
-        .sum();
     let mut words = Vec::with_capacity(jump_label_limit);
     let (view, doc) = current_ref!(cx.editor);
     let text = doc.text().slice(..);

helix-view/src/editor.rs

@@ -21,7 +21,7 @@
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
 use std::{
-    borrow::{Borrow, Cow},
+    borrow::Cow,
     cell::Cell,
     collections::{BTreeMap, HashMap, HashSet},
     fs,
@@ -354,8 +354,8 @@ pub struct Config {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct JumpLabelLookup {
-    pub alphabet: Vec<char>,
+    pub start_alphabet: Vec<char>,
-    pub follow_whitelist: HashMap<char, Vec<char>>,
+    pub allowed_jump_labels: Vec<(char, char)>,
 }
 
 impl JumpLabelFollowBlacklist {
@@ -364,44 +364,32 @@ pub fn get(&self, c: char) -> Option<&Vec<char>> {
     }
 
     pub fn get_allow_list(&self, alphabet: &Vec<char>) -> JumpLabelLookup {
-        let follow_whitelist: HashMap<_, _> = alphabet
+        let mut start_alphabet = vec![];
-            .iter()
+
-            .filter_map(|c| {
+        let allowed_jump_labels: Vec<_> = alphabet
-                let unique_chars: HashSet<_> = alphabet.iter().copied().collect();
+            .iter()
-                let blacklist_chars: Option<HashSet<_>> =
+            .flat_map(|first_c| {
-                    self.get(*c).and_then(|v| Some(v.iter().copied().collect()));
+                let unique_chars: HashSet<_> = alphabet.iter().copied().collect();
+                let blacklist_chars: Option<HashSet<_>> = self
+                    .get(*first_c)
+                    .and_then(|v| Some(v.iter().copied().collect()));
+
+                if let Some(blacklist_chars) = blacklist_chars {
+                    start_alphabet.push(*first_c);
 
-                let whitelist_chars = if let Some(blacklist_chars) = blacklist_chars {
                     unique_chars
                         .symmetric_difference(&blacklist_chars)
-                        .map(|c| *c)
+                        .map(|c| (*first_c, *c))
-                        .collect()
+                        .collect::<Vec<_>>()
                 } else {
-                    alphabet.clone()
+                    alphabet.iter().map(|c| (*first_c, *c)).collect()
-                };
-
-                if whitelist_chars.len() > 0 {
-                    Some((*c, whitelist_chars))
-                } else {
-                    None
-                }
-            })
-            .collect();
-
-        let alphabet = alphabet
-            .iter()
-            .filter_map(|c| {
-                if follow_whitelist.contains_key(c) {
-                    Some(*c)
-                } else {
-                    None
                 }
             })
             .collect();
 
         JumpLabelLookup {
-            alphabet,
+            start_alphabet,
-            follow_whitelist,
+            allowed_jump_labels,
         }
     }
 }