Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

agent_ui: Trigger @-mention menu after opening brackets (#55504)

Kunall Banerjee85f410004cf5
diff --git a/crates/agent_ui/src/completion_provider.rs b/crates/agent_ui/src/completion_provider.rs
index 3a4ae6ecc2b..acc08541100 100644
--- a/crates/agent_ui/src/completion_provider.rs
+++ b/crates/agent_ui/src/completion_provider.rs
@@ -1868,10 +1868,11 @@ impl MentionCompletion {
offset_to_line: usize,
supported_modes: &[PromptContextType],
) -> Option<Self> {
- // Find the rightmost '@' that has a word boundary before it and no whitespace immediately after
+ // Find the rightmost '@' that has a boundary before it and no whitespace immediately after.
+ // A boundary is the start of the line, whitespace, or an opening bracket.
let mut last_mention_start = None;
for (idx, _) in line.rmatch_indices('@') {
- // No whitespace immediately after '@'
+ // No whitespace immediately after '@'.
if line[idx + 1..]
.chars()
.next()
@@ -1880,12 +1881,11 @@ impl MentionCompletion {
continue;
}
- // Must be a word boundary before '@'
if idx > 0
&& line[..idx]
.chars()
.last()
- .is_some_and(|c| !c.is_whitespace())
+ .is_some_and(|c| !c.is_whitespace() && !matches!(c, '(' | '[' | '{'))
{
continue;
}
@@ -2960,6 +2960,39 @@ mod tests {
}),
"Should parse URL ending with @ (even if URL is incomplete)"
);
+
+ // Bracketed mentions: opening brackets count as a boundary before '@' so
+ // typing `(@`, `[@`, or `{@` still opens the completion menu.
+
+ assert_eq!(
+ MentionCompletion::try_parse("(@", 0, &supported_modes),
+ Some(MentionCompletion {
+ source_range: 1..2,
+ mode: None,
+ argument: None,
+ }),
+ "Should parse mention immediately after '('"
+ );
+
+ assert_eq!(
+ MentionCompletion::try_parse("[@", 0, &supported_modes),
+ Some(MentionCompletion {
+ source_range: 1..2,
+ mode: None,
+ argument: None,
+ }),
+ "Should parse mention immediately after '['"
+ );
+
+ assert_eq!(
+ MentionCompletion::try_parse("{@", 0, &supported_modes),
+ Some(MentionCompletion {
+ source_range: 1..2,
+ mode: None,
+ argument: None,
+ }),
+ "Should parse mention immediately after '{{'"
+ );
}
#[gpui::test]