Cody completion: Mega bug bash thread

client/cody/CHANGELOG.md

@@ -12,6 +12,8 @@ All notable changes to Sourcegraph Cody will be documented in this file.
 
 ### Changed
 
+- Various Cody completions related improvements [pull/52365](https://github.com/sourcegraph/sourcegraph/pull/52365)
+
 ## [0.1.4]
 
 ### Added

client/cody/src/completions/cache.test.ts

@@ -25,4 +25,18 @@ describe('CompletionsCache', () => {
         expect(cache.get('foo \n')).toEqual([{ prefix: 'foo \n', content: 'bar', messages: [] }])
         expect(cache.get('foo ')).toEqual(undefined)
     })
+
+    it('has a lookup function for untrimmed prefixes', () => {
+        const cache = new CompletionsCache()
+        cache.add([{ prefix: 'foo\n  ', content: 'baz', messages: [] }])
+
+        expect(cache.get('foo\n  ', false)).toEqual([
+            {
+                prefix: 'foo\n  ',
+                content: 'baz',
+                messages: [],
+            },
+        ])
+        expect(cache.get('foo\n ', false)).toEqual(undefined)
+    })
 })

client/cody/src/completions/cache.ts

@@ -11,8 +11,8 @@ export class CompletionsCache {
     // account. We need to add additional information like file path or suffix
     // to make sure the cache does not return undesired results for other files
     // in the same project.
-    public get(prefix: string): Completion[] | undefined {
-        const trimmedPrefix = trimEndAfterLastNewline(prefix)
+    public get(prefix: string, trim: boolean = true): Completion[] | undefined {
+        const trimmedPrefix = trim ? trimEndAfterLastNewline(prefix) : prefix
         const results = this.cache.get(trimmedPrefix)
         if (results) {
             return results.map(result => {
@@ -47,17 +47,27 @@ export class CompletionsCache {
                 maxCharsAppended = completion.content.length
             }
 
+            // We also cache the completion with the exact (= untrimmed) prefix
+            // for the separate lookup mode used for deletions
+            if (trimEndAfterLastNewline(completion.prefix) !== completion.prefix) {
+                this.insertCompletion(completion.prefix, completion)
+            }
+
             for (let i = 0; i <= maxCharsAppended; i++) {
                 const key = trimEndAfterLastNewline(completion.prefix) + completion.content.slice(0, i)
-                if (!this.cache.has(key)) {
-                    this.cache.set(key, [completion])
-                } else {
-                    const existingCompletions = this.cache.get(key)!
-                    existingCompletions.push(completion)
-                }
+                this.insertCompletion(key, completion)
             }
         }
     }
+
+    private insertCompletion(key: string, completion: Completion): void {
+        if (!this.cache.has(key)) {
+            this.cache.set(key, [completion])
+        } else {
+            const existingCompletions = this.cache.get(key)!
+            existingCompletions.push(completion)
+        }
+    }
 }
 
 function trimEndAfterLastNewline(text: string): string {

client/cody/src/completions/index.ts

@@ -1,9 +1,11 @@
+import { LRUCache } from 'lru-cache'
 import * as vscode from 'vscode'
 
 import { Message } from '@sourcegraph/cody-shared/src/sourcegraph-api'
 import { SourcegraphNodeCompletionsClient } from '@sourcegraph/cody-shared/src/sourcegraph-api/completions/nodeClient'
 
 import { logEvent } from '../event-logger'
+import { debug } from '../log'
 
 import { CompletionsCache } from './cache'
 import { getContext } from './context'
@@ -19,7 +21,6 @@ function lastNLines(text: string, n: number): string {
     return lines.slice(Math.max(0, lines.length - n)).join('\n')
 }
 
-const estimatedLLMResponseLatencyMS = 700
 const inlineCompletionsCache = new CompletionsCache()
 
 export class CodyCompletionItemProvider implements vscode.InlineCompletionItemProvider {
@@ -28,6 +29,9 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
     private maxSuffixTokens: number
     private abortOpenInlineCompletions: () => void = () => {}
     private abortOpenMultilineCompletion: () => void = () => {}
+    private lastContentChanges: LRUCache<string, 'add' | 'del'> = new LRUCache<string, 'add' | 'del'>({
+        max: 10,
+    })
 
     constructor(
         private webviewErrorMessager: (error: string) => Promise<void>,
@@ -43,6 +47,13 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
         this.promptTokens = this.contextWindowTokens - this.responseTokens
         this.maxPrefixTokens = Math.floor(this.promptTokens * this.prefixPercentage)
         this.maxSuffixTokens = Math.floor(this.promptTokens * this.suffixPercentage)
+
+        vscode.workspace.onDidChangeTextDocument(event => {
+            const document = event.document
+            const text = event.contentChanges[0].text
+
+            this.lastContentChanges.set(document.fileName, text.length > 0 ? 'add' : 'del')
+        })
     }
 
     public async provideInlineCompletionItems(
@@ -54,12 +65,11 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
         try {
             return await this.provideInlineCompletionItemsInner(document, position, context, token)
         } catch (error) {
-            console.error(error)
-
             if (error.message === 'aborted') {
                 return []
             }
-
+            console.error(error)
+            debug('CodyCompletionProvider:inline:error', `${error.toString()}\n${error.stack}`)
             return []
         }
     }
@@ -96,6 +106,21 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
 
         const { prefix, suffix, prevLine: precedingLine } = docContext
 
+        // Avoid showing completions when we're deleting code (Cody can only insert code at the
+        // moment)
+        const lastChange = this.lastContentChanges.get(document.fileName) ?? 'add'
+        if (lastChange === 'del') {
+            // When a line was deleted, only look up cached items and only include them if the
+            // untruncated prefix matches. This fixes some weird issues where the completion would
+            // render if you insert whitespace but not on the original place when you delete it
+            // again
+            const cachedCompletions = inlineCompletionsCache.get(prefix, false)
+            if (cachedCompletions) {
+                return cachedCompletions.map(toInlineCompletionItem)
+            }
+            return []
+        }
+
         const cachedCompletions = inlineCompletionsCache.get(prefix)
         if (cachedCompletions) {
             return cachedCompletions.map(toInlineCompletionItem)
@@ -125,7 +150,7 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
             contextChars
         )
 
-        let waitMs: number
+        let timeout: number
         const completers: CompletionProvider[] = []
 
         // VS Code does not show completions if we are in the process of writing a word or if a
@@ -138,17 +163,16 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
 
         // TODO(philipp-spiess): Add a better detection for start-of-block and don't require C like
         // languages.
-        // TODO(philipp-spiess): Temporary delete multi-line inline completions while I fix a bug
-        const multilineEnabledLanguage = false
-        // document.languageId === 'typescript' || document.languageId === 'javascript' || document.languageId === 'go'
+        const multilineEnabledLanguage =
+            document.languageId === 'typescript' || document.languageId === 'javascript' || document.languageId === 'go'
         if (
             multilineEnabledLanguage &&
             // Only trigger multiline inline suggestions for empty lines
             precedingLine.trim() === '' &&
             // Only trigger multiline inline suggestions for the beginning of blocks
             prefix.trim().at(prefix.trim().length - 1) === '{'
         ) {
-            waitMs = 500
+            timeout = 500
             completers.push(
                 new EndOfLineCompletionProvider(
                     this.completionsClient,
@@ -159,12 +183,12 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
                     suffix,
                     '',
                     3,
-                    true // multiline
+                    'block' // multiline
                 )
             )
         } else if (precedingLine.trim() === '') {
             // Start of line: medium debounce
-            waitMs = 500
+            timeout = 200
             completers.push(
                 new EndOfLineCompletionProvider(
                     this.completionsClient,
@@ -182,7 +206,7 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
             return []
         } else {
             // End of line: long debounce, complete until newline
-            waitMs = 1000
+            timeout = 500
             completers.push(
                 new EndOfLineCompletionProvider(
                     this.completionsClient,
@@ -209,11 +233,7 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
             )
         }
 
-        // TODO(beyang): trigger on context quality (better context means longer completion)
-
-        await new Promise<void>(resolve =>
-            setTimeout(() => resolve(), Math.max(0, waitMs - estimatedLLMResponseLatencyMS))
-        )
+        await new Promise<void>(resolve => setTimeout(resolve, timeout))
 
         // We don't need to make a request at all if the signal is already aborted after the
         // debounce
@@ -222,14 +242,19 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
         }
 
         logEvent('CodyVSCodeExtension:completion:started', LOG_INLINE, LOG_INLINE)
+        const start = Date.now()
 
-        const results = (await Promise.all(completers.map(c => c.generateCompletions(abortController.signal)))).flat()
-
-        inlineCompletionsCache.add(results)
-
-        logEvent('CodyVSCodeExtension:completion:suggested', LOG_INLINE, LOG_INLINE)
+        const results = rankCompletions(
+            (await Promise.all(completers.map(c => c.generateCompletions(abortController.signal)))).flat()
+        )
 
-        return results.map(toInlineCompletionItem)
+        if (hasVisibleCompletions(results)) {
+            const params = { ...LOG_INLINE, latency: Date.now() - start, timeout }
+            logEvent('CodyVSCodeExtension:completion:suggested', params, params)
+            inlineCompletionsCache.add(results)
+            return results.map(toInlineCompletionItem)
+        }
+        return []
     }
 
     public async fetchAndShowCompletions(): Promise<void> {
@@ -410,3 +435,12 @@ function toInlineCompletionItem(completion: Completion): vscode.InlineCompletion
         command: 'cody.completions.inline.accepted',
     })
 }
+
+function rankCompletions(completions: Completion[]): Completion[] {
+    // TODO(philipp-spiess): Improve ranking to something more complex then just length
+    return completions.sort((a, b) => b.content.split('\n').length - a.content.split('\n').length)
+}
+
+function hasVisibleCompletions(completions: Completion[]): boolean {
+    return completions.length > 0 && !!completions.find(c => c.content.trim() !== '')
+}