Skip to content

chore: simplify completion #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Migorithm merged 3 commits into from
Aug 5, 2025
Merged

chore: simplify completion #784

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac88e97
simplify completion
Migorithm Aug 5, 2025
2f1d46d
repeating pattern
Migorithm Aug 5, 2025
2c1454e
empty line
Migorithm Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 37 additions & 76 deletions duva-client/src/cli/editor/completion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,27 @@ impl Completer for DuvaHinter {
return Ok((start, candidates));
}

macro_rules! suggest_by_pos {
(
[$($args:expr),+]) => {
let suggestions = [$($args),+];
if previous_words.len() > 0 && previous_words.len() <= suggestions.len() {
candidates.push(new_pair!(suggestions[previous_words.len() - 1]));
}
};
([$($args:expr),+], repeat_last) => {
let suggestions = [$($args),+];
if previous_words.len() > 0 {
let idx = if previous_words.len() <= suggestions.len() {
previous_words.len() - 1
} else {
suggestions.len() - 1 // Keep repeating the last argument
};
candidates.push(new_pair!(suggestions[idx]));
}
};
};

let command = previous_words[0].to_lowercase();
match command.as_str() {
| "cluster" => {
Expand Down Expand Up @@ -122,103 +143,43 @@ impl Completer for DuvaHinter {
);
}
},

| "set" => {
if previous_words.len() == 1 {
// Suggest "key" after set
candidates.push(new_pair!("key"));
} else if previous_words.len() == 2 {
// Suggest "value" after set key
candidates.push(new_pair!("value"));
} else if previous_words.len() == 3 {
// Suggest "px expr" after set key value
candidates.push(new_pair!("px expr"));
}
suggest_by_pos!(["key", "value", "px expr"]);
},

| "lset" => {
if previous_words.len() == 1 {
candidates.push(new_pair!("key"));
} else if previous_words.len() == 2 {
candidates.push(new_pair!("index"));
} else if previous_words.len() == 3 {
candidates.push(new_pair!("value"));
}
suggest_by_pos!(["key", "index", "value"]);
},

| "incrby" | "decrby" => {
if previous_words.len() == 1 {
// Suggest "key" after set
candidates.push(new_pair!("key"));
} else if previous_words.len() == 2 {
// Suggest "value" after set key
if command == "incrby" {
candidates.push(new_pair!("increment"));
} else {
candidates.push(new_pair!("decrement"));
}
}
| "incrby" => {
suggest_by_pos!(["key", "increment"]);
},

| "decrby" => {
suggest_by_pos!(["key", "decrement"]);
},
| "exists" | "del" | "mget" => {
if !previous_words.is_empty() {
// Suggest "key" for these commands
candidates.push(new_pair!("key"));
}
suggest_by_pos!(["key"], repeat_last);
},
| "lpush" | "lpushx" | "rpush" | "rpushx" => {
if previous_words.len() == 1 {
// Suggest "key" after set
candidates.push(new_pair!("key"));
} else if previous_words.len() > 1 {
// Suggest "value" after set key
candidates.push(new_pair!("value"));
}
suggest_by_pos!(["key", "value"], repeat_last);
},
| "lpop" | "rpop" => {
if previous_words.len() == 1 {
// Suggest "index" after get key
candidates.push(new_pair!("key"));
} else if previous_words.len() == 2 {
// Suggest "port" after replicaof host
candidates.push(new_pair!("count"));
}
suggest_by_pos!(["key", "count"]);
},

| "get" | "incr" | "decr" | "ttl" | "llen" => {
if previous_words.len() == 1 {
// Suggest "index" after get key
candidates.push(new_pair!("key"));
}
suggest_by_pos!(["key"]);
},
| "keys" => {
if previous_words.len() == 1 {
// Suggest "pattern" after keys
candidates.push(new_pair!("pattern"));
}
suggest_by_pos!(["pattern"]);
},
| "replicaof" => {
if previous_words.len() == 1 {
// Suggest "host port" after replicaof
candidates.push(new_pair!("host"));
} else if previous_words.len() == 2 {
// Suggest "port" after replicaof host
candidates.push(new_pair!("port"));
}
suggest_by_pos!(["host port"]);
},
| "lrange" | "ltrim" => {
if previous_words.len() == 1 {
candidates.push(new_pair!("key"));
} else if previous_words.len() == 2 {
candidates.push(new_pair!("start"));
} else if previous_words.len() == 3 {
candidates.push(new_pair!("end"));
}
},
| "lindex" => {
if previous_words.len() == 1 {
candidates.push(new_pair!("key"))
} else if previous_words.len() == 2 {
candidates.push(new_pair!("index"));
}
suggest_by_pos!(["key", "start", "end"]);
},

| _ => {},
Expand Down
Loading