Merge pull request #807 from multiplex55/codex/update-safe-join-for-command-and-args

Safely normalize plugin query command/args joining for favorites

Author: multiplex55

src/gui/fav_dialog.rs

@@ -1,5 +1,7 @@
 use crate::gui::LauncherApp;
-use crate::plugins::fav::{load_favs, resolve_with_plugin, save_favs, FavEntry, FAV_FILE};
+use crate::plugins::fav::{
+    join_command_args, load_favs, resolve_with_plugin, save_favs, FavEntry, FAV_FILE,
+};
 use eframe::egui;
 
 #[derive(Default)]
@@ -129,10 +131,7 @@ impl FavDialog {
                                             Some(self.args.clone())
                                         };
                                         if let Some(q) = cmd.strip_prefix("query:") {
-                                            let mut q = q.to_string();
-                                            if let Some(ref a) = args {
-                                                q.push_str(a);
-                                            }
+                                            let q = join_command_args(q, args.as_deref());
                                             if let Some(res) = plugin.search(&q).into_iter().next()
                                             {
                                                 cmd = res.action;

src/plugins/fav.rs

@@ -86,17 +86,28 @@ pub fn resolve_with_plugin(
     command: &str,
     args: Option<&str>,
 ) -> (String, Option<String>) {
-    let mut query = command.to_string();
-    if let Some(a) = args {
-        query.push_str(a);
-    }
+    let query = join_command_args(command, args);
     if let Some(res) = plugin.search(&query).into_iter().next() {
         (res.action, res.args)
     } else {
         (command.to_string(), args.map(|s| s.to_string()))
     }
 }
 
+pub fn join_command_args(command: &str, args: Option<&str>) -> String {
+    let command = command.trim_end();
+    let Some(args) = args else {
+        return command.to_string();
+    };
+
+    let args = args.trim_start();
+    if args.is_empty() {
+        command.to_string()
+    } else {
+        format!("{command} {args}")
+    }
+}
+
 pub fn run_fav(label: &str) -> anyhow::Result<()> {
     let list = load_favs(FAV_FILE).unwrap_or_default();
     if let Some(entry) = list.iter().find(|e| e.label.eq_ignore_ascii_case(label)) {
@@ -263,3 +274,65 @@ impl Plugin for FavPlugin {
         ]
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::{join_command_args, resolve_with_plugin};
+    use crate::{actions::Action, plugin::Plugin};
+
+    struct TestPlugin;
+
+    impl Plugin for TestPlugin {
+        fn search(&self, query: &str) -> Vec<Action> {
+            vec![Action {
+                label: query.to_string(),
+                desc: String::new(),
+                action: query.to_string(),
+                args: None,
+            }]
+        }
+
+        fn name(&self) -> &str {
+            "test"
+        }
+
+        fn description(&self) -> &str {
+            "test plugin"
+        }
+
+        fn capabilities(&self) -> &[&str] {
+            &["search"]
+        }
+
+        fn commands(&self) -> Vec<Action> {
+            Vec::new()
+        }
+    }
+
+    #[test]
+    fn join_command_and_args_for_tokenized_query() {
+        assert_eq!(join_command_args("todo", Some("list")), "todo list");
+    }
+
+    #[test]
+    fn join_keeps_command_when_args_empty() {
+        assert_eq!(join_command_args("todo", None), "todo");
+        assert_eq!(join_command_args("todo", Some("   ")), "todo");
+    }
+
+    #[test]
+    fn join_normalizes_whitespace_between_command_and_args() {
+        assert_eq!(
+            join_command_args("todo   ", Some("   list now")),
+            "todo list now"
+        );
+    }
+
+    #[test]
+    fn resolve_with_plugin_uses_safe_joined_query() {
+        let plugin = TestPlugin;
+        let (action, args) = resolve_with_plugin(&plugin, "todo  ", Some("  list"));
+        assert_eq!(action, "todo list");
+        assert!(args.is_none());
+    }
+}