Skip to content

Allow multi-word snippet prefixes #41126

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

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
+584 −191
Open

Allow multi-word snippet prefixes #41126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3a0e77e
wip
HactarCE Oct 17, 2025
88e997e
fix conflict
HactarCE Oct 17, 2025
248adce
fix compile
HactarCE Oct 17, 2025
e304282
wip
HactarCE Oct 17, 2025
6fe955e
Add `snippets_only` to `ShowCompletions`
HactarCE Oct 17, 2025
4165d1b
wip
HactarCE Oct 17, 2025
d5946c5
wip
HactarCE Oct 17, 2025
d404043
Merge remote-tracking branch 'origin/main' into ajf-snippet-fix
HactarCE Oct 23, 2025
67094c2
remove unnecessary todo!s
HactarCE Oct 23, 2025
4a7a21a
wip
HactarCE Oct 24, 2025
ce11794
Merge branch 'main' into ajf-snippet-fix
HactarCE Oct 24, 2025
edbe9f5
Remove todos
HactarCE Oct 24, 2025
b548319
Add test & fix bugs
HactarCE Oct 27, 2025
6f43bcc
fix clippy lints
HactarCE Oct 27, 2025
926afb0
Remove `snippets_only` and replicate similar behavior but only in `impl
HactarCE Oct 29, 2025
e6eb47d
fix compile
HactarCE Oct 29, 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
9 changes: 9 additions & 0 deletions crates/agent_ui/src/acp/completion_provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ impl ContextPickerCompletionProvider {
icon_path: Some(mode.icon().path().into()),
documentation: None,
source: project::CompletionSource::Custom,
match_start: None,
insert_text_mode: None,
// This ensures that when a user accepts this completion, the
// completion menu will still be shown after "@category " is
Expand Down Expand Up @@ -146,6 +147,7 @@ impl ContextPickerCompletionProvider {
documentation: None,
insert_text_mode: None,
source: project::CompletionSource::Custom,
match_start: None,
icon_path: Some(icon_for_completion),
confirm: Some(confirm_completion_callback(
thread_entry.title().clone(),
Expand Down Expand Up @@ -177,6 +179,7 @@ impl ContextPickerCompletionProvider {
documentation: None,
insert_text_mode: None,
source: project::CompletionSource::Custom,
match_start: None,
icon_path: Some(icon_path),
confirm: Some(confirm_completion_callback(
rule.title,
Expand Down Expand Up @@ -233,6 +236,7 @@ impl ContextPickerCompletionProvider {
documentation: None,
source: project::CompletionSource::Custom,
icon_path: Some(completion_icon_path),
match_start: None,
insert_text_mode: None,
confirm: Some(confirm_completion_callback(
file_name,
Expand Down Expand Up @@ -279,6 +283,7 @@ impl ContextPickerCompletionProvider {
documentation: None,
source: project::CompletionSource::Custom,
icon_path: Some(icon_path),
match_start: None,
insert_text_mode: None,
confirm: Some(confirm_completion_callback(
symbol.name.into(),
Expand Down Expand Up @@ -311,6 +316,7 @@ impl ContextPickerCompletionProvider {
documentation: None,
source: project::CompletionSource::Custom,
icon_path: Some(icon_path),
match_start: None,
insert_text_mode: None,
confirm: Some(confirm_completion_callback(
url_to_fetch.to_string().into(),
Expand Down Expand Up @@ -379,6 +385,7 @@ impl ContextPickerCompletionProvider {
icon_path: Some(action.icon().path().into()),
documentation: None,
source: project::CompletionSource::Custom,
match_start: None,
insert_text_mode: None,
// This ensures that when a user accepts this completion, the
// completion menu will still be shown after "@category " is
Expand Down Expand Up @@ -695,6 +702,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
buffer: &Entity<Buffer>,
buffer_position: Anchor,
_trigger: CompletionContext,
_text: Option<&str>,
_window: &mut Window,
cx: &mut Context<Editor>,
) -> Task<Result<Vec<CompletionResponse>>> {
Expand Down Expand Up @@ -751,6 +759,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
)),
source: project::CompletionSource::Custom,
icon_path: None,
match_start: None,
insert_text_mode: None,
confirm: Some(Arc::new({
let editor = editor.clone();
Expand Down
1 change: 1 addition & 0 deletions crates/agent_ui/src/acp/message_editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1670,6 +1670,7 @@ mod tests {
trigger_kind: CompletionTriggerKind::TRIGGER_CHARACTER,
trigger_character: Some("@".into()),
},
Some("@"),
window,
cx,
)
Expand Down
8 changes: 8 additions & 0 deletions crates/agent_ui/src/context_picker/completion_provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ impl ContextPickerCompletionProvider {
icon_path: Some(mode.icon().path().into()),
documentation: None,
source: project::CompletionSource::Custom,
match_start: None,
insert_text_mode: None,
// This ensures that when a user accepts this completion, the
// completion menu will still be shown after "@category " is
Expand Down Expand Up @@ -386,6 +387,7 @@ impl ContextPickerCompletionProvider {
icon_path: Some(action.icon().path().into()),
documentation: None,
source: project::CompletionSource::Custom,
match_start: None,
insert_text_mode: None,
// This ensures that when a user accepts this completion, the
// completion menu will still be shown after "@category " is
Expand Down Expand Up @@ -417,6 +419,7 @@ impl ContextPickerCompletionProvider {
replace_range: source_range.clone(),
new_text,
label: CodeLabel::plain(thread_entry.title().to_string(), None),
match_start: None,
documentation: None,
insert_text_mode: None,
source: project::CompletionSource::Custom,
Expand Down Expand Up @@ -484,6 +487,7 @@ impl ContextPickerCompletionProvider {
replace_range: source_range.clone(),
new_text,
label: CodeLabel::plain(rules.title.to_string(), None),
match_start: None,
documentation: None,
insert_text_mode: None,
source: project::CompletionSource::Custom,
Expand Down Expand Up @@ -524,6 +528,7 @@ impl ContextPickerCompletionProvider {
documentation: None,
source: project::CompletionSource::Custom,
icon_path: Some(IconName::ToolWeb.path().into()),
match_start: None,
insert_text_mode: None,
confirm: Some(confirm_completion_callback(
IconName::ToolWeb.path().into(),
Expand Down Expand Up @@ -612,6 +617,7 @@ impl ContextPickerCompletionProvider {
documentation: None,
source: project::CompletionSource::Custom,
icon_path: Some(completion_icon_path),
match_start: None,
insert_text_mode: None,
confirm: Some(confirm_completion_callback(
crease_icon_path,
Expand Down Expand Up @@ -690,6 +696,7 @@ impl ContextPickerCompletionProvider {
documentation: None,
source: project::CompletionSource::Custom,
icon_path: Some(IconName::Code.path().into()),
match_start: None,
insert_text_mode: None,
confirm: Some(confirm_completion_callback(
IconName::Code.path().into(),
Expand Down Expand Up @@ -738,6 +745,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
buffer: &Entity<Buffer>,
buffer_position: Anchor,
_trigger: CompletionContext,
_text: Option<&str>,
_window: &mut Window,
cx: &mut Context<Editor>,
) -> Task<Result<Vec<CompletionResponse>>> {
Expand Down
3 changes: 3 additions & 0 deletions crates/agent_ui/src/slash_command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ impl SlashCommandCompletionProvider {
new_text,
label: command.label(cx),
icon_path: None,
match_start: None,
insert_text_mode: None,
confirm,
source: CompletionSource::Custom,
Expand Down Expand Up @@ -232,6 +233,7 @@ impl SlashCommandCompletionProvider {
icon_path: None,
new_text,
documentation: None,
match_start: None,
confirm,
insert_text_mode: None,
source: CompletionSource::Custom,
Expand Down Expand Up @@ -263,6 +265,7 @@ impl CompletionProvider for SlashCommandCompletionProvider {
buffer: &Entity<Buffer>,
buffer_position: Anchor,
_: editor::CompletionContext,
_text: Option<&str>,
window: &mut Window,
cx: &mut Context<Editor>,
) -> Task<Result<Vec<project::CompletionResponse>>> {
Expand Down
3 changes: 3 additions & 0 deletions crates/debugger_ui/src/session/running/console.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ impl CompletionProvider for ConsoleQueryBarCompletionProvider {
buffer: &Entity<Buffer>,
buffer_position: language::Anchor,
_trigger: editor::CompletionContext,
_text: Option<&str>,
_window: &mut Window,
cx: &mut Context<Editor>,
) -> Task<Result<Vec<CompletionResponse>>> {
Expand Down Expand Up @@ -669,6 +670,7 @@ impl ConsoleQueryBarCompletionProvider {
),
new_text: string_match.string.clone(),
label: CodeLabel::plain(string_match.string.clone(), None),
match_start: None,
icon_path: None,
documentation: Some(CompletionDocumentation::MultiLineMarkdown(
variable_value.into(),
Expand Down Expand Up @@ -782,6 +784,7 @@ impl ConsoleQueryBarCompletionProvider {
documentation: completion.detail.map(|detail| {
CompletionDocumentation::MultiLineMarkdown(detail.into())
}),
match_start: None,
confirm: None,
source: project::CompletionSource::Dap { sort_text },
insert_text_mode: None,
Expand Down
1 change: 1 addition & 0 deletions crates/editor/src/code_completion_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ impl CompletionBuilder {
icon_path: None,
insert_text_mode: None,
confirm: None,
match_start: None,
}
}
}
Expand Down
Loading
Loading