Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable forceful sorting of the slash command argument completions (#16240)

Browse source 
Also bubble up the current active tab's path in the \tab argument
completions.

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2024-08-14 22:34:25 +03:00 • committed by GitHub
parent b55e8383c8
commit e8bae839ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 113 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

76
crates/assistant/src/slash_command/tab_command.rs
View file

@ -62,6 +62,16 @@ impl SlashCommand for TabSlashCommand {
if has_all_tabs_completion_item {
return Task::ready(Ok(Vec::new()));
}
let active_item_path = workspace.as_ref().and_then(|workspace| {
workspace
.update(cx, |workspace, cx| {
let snapshot = active_item_buffer(workspace, cx).ok()?;
snapshot.resolve_file_path(cx, true)
})
.ok()
.flatten()
});
let current_query = arguments.last().cloned().unwrap_or_default();
let tab_items_search =
tab_items_for_queries(workspace, &[current_query], cancel, false, cx);
@ -73,6 +83,9 @@ impl SlashCommand for TabSlashCommand {
if argument_set.contains(&path_string) {
return None;
}
if active_item_path.is_some() && active_item_path == path {
return None;
}
Some(ArgumentCompletion {
label: path_string.clone().into(),
new_text: path_string,
@ -81,15 +94,26 @@ impl SlashCommand for TabSlashCommand {
})
});
Ok(Some(ArgumentCompletion {
label: ALL_TABS_COMPLETION_ITEM.into(),
new_text: ALL_TABS_COMPLETION_ITEM.to_owned(),
replace_previous_arguments: false,
run_command: true,
})
.into_iter()
.chain(tab_completion_items)
.collect::<Vec<_>>())
let active_item_completion = active_item_path.as_deref().map(|active_item_path| {
let path_string = active_item_path.to_string_lossy().to_string();
ArgumentCompletion {
label: path_string.clone().into(),
new_text: path_string,
replace_previous_arguments: false,
run_command,
}
});
Ok(active_item_completion
.into_iter()
.chain(Some(ArgumentCompletion {
label: ALL_TABS_COMPLETION_ITEM.into(),
new_text: ALL_TABS_COMPLETION_ITEM.to_owned(),
replace_previous_arguments: false,
run_command: true,
}))
.chain(tab_completion_items)
.collect())
})
}
@ -162,19 +186,7 @@ fn tab_items_for_queries(
.context("no workspace")?
.update(&mut cx, |workspace, cx| {
if strict_match && empty_query {
let active_editor = workspace
.active_item(cx)
.context("no active item")?
.downcast::<Editor>()
.context("active item is not an editor")?;
let snapshot = active_editor
.read(cx)
.buffer()
.read(cx)
.as_singleton()
.context("active editor is not a singleton buffer")?
.read(cx)
.snapshot();
let snapshot = active_item_buffer(workspace, cx)?;
let full_path = snapshot.resolve_file_path(cx, true);
return anyhow::Ok(vec![(full_path, snapshot, 0)]);
}
@ -279,3 +291,23 @@ fn tab_items_for_queries(
.await
})
}
fn active_item_buffer(
workspace: &mut Workspace,
cx: &mut ui::ViewContext<Workspace>,
) -> anyhow::Result<BufferSnapshot> {
let active_editor = workspace
.active_item(cx)
.context("no active item")?
.downcast::<Editor>()
.context("active item is not an editor")?;
let snapshot = active_editor
.read(cx)
.buffer()
.read(cx)
.as_singleton()
.context("active editor is not a singleton buffer")?
.read(cx)
.snapshot();
Ok(snapshot)
}