Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Merged
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions client/cody/src/completions/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { CompletionsDocumentProvider } from './docprovider'
import { History } from './history'
import { CompletionProvider, InlineCompletionProvider, ManualCompletionProvider } from './provider'

const LOG_INLINE = { type: 'inline' }
const LOG_MANUAL = { type: 'manual' }

function lastNLines(text: string, n: number): string {
Expand Down Expand Up @@ -161,6 +160,8 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
return []
}

let multilineMode: null | 'block' = null

// TODO(philipp-spiess): Add a better detection for start-of-block and don't require C like
// languages.
const multilineEnabledLanguage =
Expand All @@ -173,6 +174,7 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
prefix.trim().at(prefix.trim().length - 1) === '{'
) {
timeout = 500
multilineMode = 'block'
completers.push(
new InlineCompletionProvider(
this.completionsClient,
Expand All @@ -183,7 +185,7 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
suffix,
'',
3,
'block' // multiline
multilineMode
)
)
} else if (precedingLine.trim() === '') {
Expand Down Expand Up @@ -241,16 +243,21 @@ export class CodyCompletionItemProvider implements vscode.InlineCompletionItemPr
return []
}

logEvent('CodyVSCodeExtension:completion:started', LOG_INLINE, LOG_INLINE)
const logParams = {
type: 'inline',
multilineMode,
}

logEvent('CodyVSCodeExtension:completion:started', logParams, logParams)
const start = Date.now()

const results = rankCompletions(
(await Promise.all(completers.map(c => c.generateCompletions(abortController.signal)))).flat()
)

if (hasVisibleCompletions(results)) {
const params = { ...LOG_INLINE, latency: Date.now() - start, timeout }
logEvent('CodyVSCodeExtension:completion:suggested', params, params)
const logParamsWithTimings = { ...logParams, latency: Date.now() - start, timeout }
logEvent('CodyVSCodeExtension:completion:suggested', logParamsWithTimings, logParamsWithTimings)
inlineCompletionsCache.add(results)
return results.map(toInlineCompletionItem)
}
Expand Down