Improve slash commands (#16195)
This PR: - Makes slash commands easier to compose by adding a concept, `CompletionIntent`. When using `tab` on a completion in the assistant panel, that completion item will be expanded but the associated command will not be run. Using `enter` will still either run the completion item or continue command composition as before. - Fixes a bug where running `/diagnostics` on a project with no diagnostics will delete the entire command, rather than rendering an empty header. - Improves the autocomplete rendering for files, showing when directories are selected and re-arranging the results to have the file name or trailing directory show first. <img width="642" alt="Screenshot 2024-08-13 at 8 12 43 PM" src="https://github.com/user-attachments/assets/97c96cd2-741f-4f15-ad03-7cf78129a71c"> Release Notes: - N/A
This commit is contained in:
parent
5cb4de4ec6
commit
97469cd049
23 changed files with 326 additions and 190 deletions
|
@ -1,3 +1,4 @@
|
|||
use std::cmp;
|
||||
use std::sync::OnceLock;
|
||||
use std::{
|
||||
ffi::OsStr,
|
||||
|
@ -8,6 +9,9 @@ use std::{
|
|||
use globset::{Glob, GlobSet, GlobSetBuilder};
|
||||
use regex::Regex;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use unicase::UniCase;
|
||||
|
||||
use crate::{maybe, NumericPrefixWithSuffix};
|
||||
|
||||
/// Returns the path to the user's home directory.
|
||||
pub fn home_dir() -> &'static PathBuf {
|
||||
|
@ -266,10 +270,88 @@ impl PathMatcher {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn compare_paths(
|
||||
(path_a, a_is_file): (&Path, bool),
|
||||
(path_b, b_is_file): (&Path, bool),
|
||||
) -> cmp::Ordering {
|
||||
let mut components_a = path_a.components().peekable();
|
||||
let mut components_b = path_b.components().peekable();
|
||||
loop {
|
||||
match (components_a.next(), components_b.next()) {
|
||||
(Some(component_a), Some(component_b)) => {
|
||||
let a_is_file = components_a.peek().is_none() && a_is_file;
|
||||
let b_is_file = components_b.peek().is_none() && b_is_file;
|
||||
let ordering = a_is_file.cmp(&b_is_file).then_with(|| {
|
||||
let maybe_numeric_ordering = maybe!({
|
||||
let path_a = Path::new(component_a.as_os_str());
|
||||
let num_and_remainder_a = if a_is_file {
|
||||
path_a.file_stem()
|
||||
} else {
|
||||
path_a.file_name()
|
||||
}
|
||||
.and_then(|s| s.to_str())
|
||||
.and_then(NumericPrefixWithSuffix::from_numeric_prefixed_str)?;
|
||||
|
||||
let path_b = Path::new(component_b.as_os_str());
|
||||
let num_and_remainder_b = if b_is_file {
|
||||
path_b.file_stem()
|
||||
} else {
|
||||
path_b.file_name()
|
||||
}
|
||||
.and_then(|s| s.to_str())
|
||||
.and_then(NumericPrefixWithSuffix::from_numeric_prefixed_str)?;
|
||||
|
||||
num_and_remainder_a.partial_cmp(&num_and_remainder_b)
|
||||
});
|
||||
|
||||
maybe_numeric_ordering.unwrap_or_else(|| {
|
||||
let name_a = UniCase::new(component_a.as_os_str().to_string_lossy());
|
||||
let name_b = UniCase::new(component_b.as_os_str().to_string_lossy());
|
||||
|
||||
name_a.cmp(&name_b)
|
||||
})
|
||||
});
|
||||
if !ordering.is_eq() {
|
||||
return ordering;
|
||||
}
|
||||
}
|
||||
(Some(_), None) => break cmp::Ordering::Greater,
|
||||
(None, Some(_)) => break cmp::Ordering::Less,
|
||||
(None, None) => break cmp::Ordering::Equal,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn compare_paths_with_dots() {
|
||||
let mut paths = vec![
|
||||
(Path::new("test_dirs"), false),
|
||||
(Path::new("test_dirs/1.46"), false),
|
||||
(Path::new("test_dirs/1.46/bar_1"), true),
|
||||
(Path::new("test_dirs/1.46/bar_2"), true),
|
||||
(Path::new("test_dirs/1.45"), false),
|
||||
(Path::new("test_dirs/1.45/foo_2"), true),
|
||||
(Path::new("test_dirs/1.45/foo_1"), true),
|
||||
];
|
||||
paths.sort_by(|&a, &b| compare_paths(a, b));
|
||||
assert_eq!(
|
||||
paths,
|
||||
vec![
|
||||
(Path::new("test_dirs"), false),
|
||||
(Path::new("test_dirs/1.45"), false),
|
||||
(Path::new("test_dirs/1.45/foo_1"), true),
|
||||
(Path::new("test_dirs/1.45/foo_2"), true),
|
||||
(Path::new("test_dirs/1.46"), false),
|
||||
(Path::new("test_dirs/1.46/bar_1"), true),
|
||||
(Path::new("test_dirs/1.46/bar_2"), true),
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn path_with_position_parsing_positive() {
|
||||
let input_and_expected = [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue