summaryrefslogtreecommitdiff
path: root/src/systems/cmd/processer.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/systems/cmd/processer.rs')
-rw-r--r--src/systems/cmd/processer.rs17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/systems/cmd/processer.rs b/src/systems/cmd/processer.rs
index d357e44..7c464a2 100644
--- a/src/systems/cmd/processer.rs
+++ b/src/systems/cmd/processer.rs
@@ -4,17 +4,24 @@ use crate::systems::cmd::errors::CmdProcessError;
use crate::systems::cmd::renderer::JVRenderResult;
pub async fn jv_cmd_process(
- args: Vec<String>,
+ args: &Vec<String>,
ctx: JVCommandContext,
renderer_override: String,
) -> Result<JVRenderResult, CmdProcessError> {
let nodes = jv_cmd_nodes();
- let command = args.join(" ");
- // Find nodes that match the beginning of the command
+ // Why add a space?
+ // Add a space at the end of the command string for precise command prefix matching.
+ // For example: when the input command is "bananas", if there are two commands "banana" and "bananas",
+ // without a space it might incorrectly match "banana" (because "bananas".starts_with("banana") is true).
+ // After adding a space, "bananas " will not match "banana ", thus avoiding ambiguity caused by overlapping prefixes.
+ let command = format!("{} ", args.join(" "));
+
+ // Find all nodes that match the command prefix
let matching_nodes: Vec<&String> = nodes
.iter()
- .filter(|node| command.starts_with(node.as_str()))
+ // Also add a space to the node string to ensure consistent matching logic
+ .filter(|node| command.starts_with(&format!("{} ", node)))
.collect();
match matching_nodes.len() {
@@ -25,7 +32,7 @@ pub async fn jv_cmd_process(
1 => {
let matched_prefix = matching_nodes[0];
let prefix_len = matched_prefix.split_whitespace().count();
- let trimmed_args: Vec<String> = args.into_iter().skip(prefix_len).collect();
+ let trimmed_args: Vec<String> = args.into_iter().cloned().skip(prefix_len).collect();
return jv_cmd_process_node(matched_prefix, trimmed_args, ctx, renderer_override).await;
}
_ => {