fix(whkd): ensure rwin bindings are not overridden

Author: akozlev

core/src/lib.rs

@@ -12,26 +12,60 @@ pub struct Whkdrc {
 
 impl Whkdrc {
     pub fn add_rwin_bindings(&mut self) {
+        let initial_rwin_bindings: Vec<_> = self
+            .bindings
+            .iter()
+            .filter(|b| b.keys.iter().any(|k| k == "rwin"))
+            .collect();
+
         let mut rwin_bindings = vec![];
-        for binding in &mut self.bindings {
-            if let Some(i) = binding.keys.iter().position(|key| key == "win") {
-                let mut rwin_binding = binding.clone();
-                rwin_binding.keys[i] = "rwin".to_string();
-                rwin_bindings.push(rwin_binding);
+        for binding in &self.bindings {
+            let Some(key_idx) = binding.keys.iter().position(|key| key == "win") else {
+                continue;
+            };
+
+            let mut rwin_binding = binding.clone();
+            rwin_binding.keys[key_idx] = "rwin".to_string();
+
+            // skip any hotkeys that are already specified
+            if initial_rwin_bindings
+                .iter()
+                .any(|b| b.keys == rwin_binding.keys)
+            {
+                continue;
             }
+
+            rwin_bindings.push(rwin_binding);
         }
         self.bindings.extend(rwin_bindings);
 
+        let initial_rwin_app_bindings: Vec<_> = self
+            .app_bindings
+            .iter()
+            .filter(|b| b.0.iter().any(|k| k == "rwin"))
+            .collect();
+
         let mut rwin_app_bindings = vec![];
-        for binding in &mut self.app_bindings {
-            if let Some(i) = binding.0.iter().position(|key| key == "win") {
-                let mut rwin_binding = binding.clone();
-                rwin_binding.0[i] = "rwin".to_string();
-                for app_binding in &mut rwin_binding.1 {
-                    app_binding.keys[i] = "rwin".to_string();
-                }
-                rwin_app_bindings.push(rwin_binding);
+        for binding in &self.app_bindings {
+            let Some(key_idx) = binding.0.iter().position(|key| key == "win") else {
+                continue;
+            };
+
+            let mut rwin_binding = binding.clone();
+            rwin_binding.0[key_idx] = "rwin".to_string();
+            for app_binding in &mut rwin_binding.1 {
+                app_binding.keys[key_idx] = "rwin".to_string();
             }
+
+            // skip any hotkeys that are already specified
+            if initial_rwin_app_bindings
+                .iter()
+                .any(|b| b.0 == rwin_binding.0)
+            {
+                continue;
+            }
+
+            rwin_app_bindings.push(rwin_binding);
         }
         self.app_bindings.extend(rwin_app_bindings);
     }
@@ -72,3 +106,62 @@ pub struct HotkeyBinding {
     pub command: String,
     pub process_name: Option<String>,
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn hb(keys: &str, cmd: &str) -> HotkeyBinding {
+        HotkeyBinding {
+            keys: keys.split(" + ").map(String::from).collect(),
+            command: String::from(cmd),
+            process_name: None,
+        }
+    }
+
+    #[test]
+    fn test_add_rwin_binding() {
+        let mut config = Whkdrc {
+            bindings: vec![hb("win + j", "win + j"), hb("alt + j", "alt + j")],
+            shell: Shell::Pwsh,
+            app_bindings: vec![],
+            pause_binding: None,
+            pause_hook: None,
+        };
+
+        config.add_rwin_bindings();
+
+        let expected = vec![
+            hb("win + j", "win + j"),
+            hb("alt + j", "alt + j"),
+            hb("rwin + j", "win + j"),
+        ];
+
+        assert_eq!(config.bindings, expected);
+    }
+
+    #[test]
+    fn test_use_provided_rwin() {
+        let mut config = Whkdrc {
+            bindings: vec![
+                hb("win + j", "win + j"),
+                hb("rwin + j", "rwin + j"),
+                hb("alt + j", "alt + j"),
+            ],
+            shell: Shell::Pwsh,
+            app_bindings: vec![],
+            pause_binding: None,
+            pause_hook: None,
+        };
+
+        config.add_rwin_bindings();
+
+        let expected = vec![
+            hb("win + j", "win + j"),
+            hb("rwin + j", "rwin + j"),
+            hb("alt + j", "alt + j"),
+        ];
+
+        assert_eq!(config.bindings, expected);
+    }
+}