Chat: improve handling of at mentions (#3114)

Author: abeatrix

lib/ui/src/Chat.tsx

@@ -424,7 +424,7 @@ export const Chat: React.FunctionComponent<ChatProps> = ({
             }
 
             // At mention should start with @ and contains no whitespaces
-            const isAtMention = (word: string) => /^@/.test(word) && !word.includes(' ')
+            const isAtMention = (word: string) => /^@[^ ]*$/.test(word)
 
             // Extract mention query by splitting input value into before/after caret sections.
             const extractMentionQuery = (input: string, caretPos: number) => {
@@ -442,6 +442,14 @@ export const Chat: React.FunctionComponent<ChatProps> = ({
             const mentionQuery = extractMentionQuery(inputValue, caretPosition)
             const query = mentionQuery.replace(/^@/, '')
 
+            // Cover cases where user prefer to type the file without tabbing the selection
+            if (contextSelection?.length) {
+                if (currentChatContextQuery === query.trimEnd()) {
+                    onChatContextSelected(contextSelection[0])
+                    return
+                }
+            }
+
             // Filters invalid queries and sets context query state accordingly:
             // Sets the current chat context query state if a valid mention is detected.
             // Otherwise resets the context selection and query state.
@@ -454,7 +462,13 @@ export const Chat: React.FunctionComponent<ChatProps> = ({
             setCurrentChatContextQuery(query)
             postMessage({ command: 'getUserContext', query })
         },
-        [postMessage, resetContextSelection]
+        [
+            postMessage,
+            resetContextSelection,
+            contextSelection,
+            currentChatContextQuery,
+            onChatContextSelected,
+        ]
     )
 
     const inputHandler = useCallback(

vscode/test/e2e/chat-atFile.test.ts

@@ -5,7 +5,7 @@ import { isWindows } from '@sourcegraph/cody-shared'
 import * as mockServer from '../fixtures/mock-server'
 
 import { sidebarSignin } from './common'
-import { assertEvents, test, withPlatformSlashes } from './helpers'
+import { assertEvents, getMetaKeyByOS, test, withPlatformSlashes } from './helpers'
 
 /**
  * Tests for @-file & @#-symbol in chat
@@ -178,6 +178,18 @@ test('@-file & @#-symbol in chat view', async ({ page, sidebar }) => {
     await chatInput.press('Backspace')
     await expect(noMatches).toBeVisible()
 
+    // Typing out the whole file path without pressing tab/enter should still include the
+    // file as context
+    const osKey = getMetaKeyByOS()
+    await chatInput.press(`${osKey}+/`) // start a new chat
+    await chatInput.fill('@index.htm')
+    await chatInput.press('l')
+    await expect(chatPanelFrame.getByRole('button', { name: 'index.html' })).toBeVisible()
+    await chatInput.press('Space')
+    await page.keyboard.type('explain.', { delay: 50 })
+    await chatInput.press('Enter')
+    await expect(chatPanelFrame.getByText(/^✨ Context:/)).toHaveCount(1)
+
     const expectedEvents = [
         'CodyVSCodeExtension:at-mention:executed',
         'CodyVSCodeExtension:at-mention:file:executed',

vscode/test/e2e/helpers.ts

@@ -360,3 +360,8 @@ export async function newChat(page: Page): Promise<FrameLocator> {
 export function withPlatformSlashes(input: string) {
     return input.replaceAll(path.posix.sep, path.sep)
 }
+
+const isPlatform = (platform: string) => process.platform === platform
+export function getMetaKeyByOS(): string {
+    return isPlatform('darwin') ? 'Meta' : 'Control'
+}