* claim: #2757 * fix(params): autocomplete offers a parameter for any part of its name (#2757) Typing `side` now offers `cab_side_thickness`: parameters match the word anywhere in their name, after those that start with it, both in the expression boxes and in parameters.complete. Functions, constants and units still match from the start. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: bherbruck <brennen.herbruck@gmail.com>
This commit is contained in:
@@ -348,11 +348,16 @@ fn complete(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let text = str_(p, "prefix").unwrap_or("");
|
||||
// The identifier being typed: trailing letters, digits and underscores.
|
||||
let word: String = text.chars().rev().take_while(|c| c.is_alphanumeric() || *c == '_').collect::<Vec<_>>().into_iter().rev().collect();
|
||||
let starts = |n: &str| word.is_empty() || n.to_ascii_lowercase().starts_with(&word.to_ascii_lowercase());
|
||||
let lower = word.to_ascii_lowercase();
|
||||
let starts = |n: &str| word.is_empty() || n.to_ascii_lowercase().starts_with(&lower);
|
||||
// A parameter matches wherever the word appears in its name (`side` finds
|
||||
// `cab_side_thickness`, #2757); functions, constants and units match from the start.
|
||||
let within = |n: &str| word.is_empty() || n.to_ascii_lowercase().contains(&lower);
|
||||
let mut out: Vec<Value> = Vec::new();
|
||||
let mut rows: Vec<solidcraft_doc::ParamRow> = s.doc.param_rows().into_iter().filter(|r| starts(&r.name)).collect();
|
||||
// Favourites, then user parameters, then the rest.
|
||||
rows.sort_by_key(|r| (!r.favorite, r.source != "user"));
|
||||
let mut rows: Vec<solidcraft_doc::ParamRow> = s.doc.param_rows().into_iter().filter(|r| within(&r.name)).collect();
|
||||
// Names that start with the word, then the rest; within each, favourites, then user
|
||||
// parameters, then the others.
|
||||
rows.sort_by_key(|r| (!starts(&r.name), !r.favorite, r.source != "user"));
|
||||
for r in rows.into_iter().take(200) {
|
||||
let v = r.value.map(|v| format!("{v:.4} {}", r.unit).trim().to_string()).unwrap_or_else(|| "error".into());
|
||||
let mut detail = format!("{} = {v}", r.expression);
|
||||
|
||||
@@ -212,6 +212,27 @@ fn favorites_comments_and_completion() {
|
||||
assert!(c["suggestions"].as_array().unwrap().iter().any(|x| x["text"] == "atan2("), "{c}");
|
||||
}
|
||||
|
||||
/// #2757: a parameter is suggested for a word anywhere in its name, not only at its start;
|
||||
/// names that start with the word come first. Functions still match from the start.
|
||||
#[test]
|
||||
fn completion_matches_parameters_anywhere_in_their_name() {
|
||||
let mut s = Session::default();
|
||||
for (name, e) in [("cab_side_thickness", "18 mm"), ("side", "40 mm"), ("door_width", "300 mm")] {
|
||||
run(&mut s, "parameters.add", json!({"name": name, "expression": e}));
|
||||
}
|
||||
let texts = |c: &Value| -> Vec<String> {
|
||||
c["suggestions"].as_array().unwrap().iter().filter(|x| x["kind"] == "parameter").map(|x| x["text"].as_str().unwrap().to_string()).collect()
|
||||
};
|
||||
let c = run(&mut s, "parameters.complete", json!({"prefix": "2 * side"}));
|
||||
assert_eq!(texts(&c), ["side", "cab_side_thickness"], "the name starting with it first: {c}");
|
||||
let c = run(&mut s, "parameters.complete", json!({"prefix": "THICK"}));
|
||||
assert_eq!(texts(&c), ["cab_side_thickness"], "any case: {c}");
|
||||
assert!(texts(&run(&mut s, "parameters.complete", json!({"prefix": "xyz"}))).is_empty());
|
||||
// Functions keep matching from the start: `in` is not `sin(`.
|
||||
let c = run(&mut s, "parameters.complete", json!({"prefix": "in"}));
|
||||
assert!(!c["suggestions"].as_array().unwrap().iter().any(|x| x["text"] == "sin("), "{c}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn csv_and_json_round_trip() {
|
||||
let mut s = Session::default();
|
||||
|
||||
Reference in New Issue
Block a user