Skip to content
Merged
Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions packages/amazonq/src/app/inline/completion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@ export class InlineCompletionManager implements Disposable {
const onInlineRejection = async () => {
try {
vsCodeState.isCodeWhispererEditing = true
if (this.sessionManager.getActiveSession() === undefined) {
return
}
const requestStartTime = this.sessionManager.getActiveSession()!.requestStartTime
const totalSessionDisplayTime = performance.now() - requestStartTime
await commands.executeCommand('editor.action.inlineSuggest.hide')
// TODO: also log the seen state for other suggestions in session
this.disposable.dispose()
Expand All @@ -185,6 +190,7 @@ export class InlineCompletionManager implements Disposable {
discarded: false,
},
},
totalSessionDisplayTime: totalSessionDisplayTime,
}
this.languageClient.sendNotification(this.logSessionResultMessageName, params)
// clear session manager states once rejected
Expand Down Expand Up @@ -313,6 +319,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
discarded: false,
},
},
totalSessionDisplayTime: performance.now() - prevSession.requestStartTime,
}
this.languageClient.sendNotification(this.logSessionResultMessageName, params)
this.sessionManager.clear()
Expand Down
13 changes: 9 additions & 4 deletions packages/amazonq/src/app/inline/recommendationService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import {
import { CancellationToken, InlineCompletionContext, Position, TextDocument } from 'vscode'
import { LanguageClient } from 'vscode-languageclient'
import { SessionManager } from './sessionManager'
import { AuthUtil, CodeWhispererStatusBarManager } from 'aws-core-vscode/codewhisperer'
import { AuthUtil, CodeWhispererStatusBarManager, vsCodeState } from 'aws-core-vscode/codewhisperer'
import { TelemetryHelper } from './telemetryHelper'
import { ICursorUpdateRecorder } from './cursorUpdateManager'
import { globals, getLogger } from 'aws-core-vscode/shared'
import { getLogger } from 'aws-core-vscode/shared'

export interface GetAllRecommendationsOptions {
emitTelemetry?: boolean
Expand Down Expand Up @@ -68,7 +68,7 @@ export class RecommendationService {
if (options.editsStreakToken) {
request = { ...request, partialResultToken: options.editsStreakToken }
}
const requestStartTime = globals.clock.Date.now()
const requestStartTime = performance.now()
const statusBar = CodeWhispererStatusBarManager.instance

// Only track telemetry if enabled
Expand Down Expand Up @@ -117,7 +117,7 @@ export class RecommendationService {
}
TelemetryHelper.instance.setFirstSuggestionShowTime()

const firstCompletionDisplayLatency = globals.clock.Date.now() - requestStartTime
const firstCompletionDisplayLatency = performance.now() - requestStartTime
this.sessionManager.startSession(
result.sessionId,
result.items,
Expand Down Expand Up @@ -183,6 +183,11 @@ export class RecommendationService {
request,
token
)
// when pagination is in progress, but user has already accepted or rejected an inline completion
// then stop pagination
if (this.sessionManager.getActiveSession() === undefined || vsCodeState.isCodeWhispererEditing) {
break
}
this.sessionManager.updateSessionSuggestions(result.items)
nextToken = result.partialResultToken
}
Expand Down
Loading