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
39 changes: 28 additions & 11 deletions packages/amazonq/src/app/inline/recommendationService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,16 @@ import {
import { CancellationToken, InlineCompletionContext, Position, TextDocument } from 'vscode'
import { LanguageClient } from 'vscode-languageclient'
import { SessionManager } from './sessionManager'
import { AuthUtil, CodeWhispererStatusBarManager, vsCodeState } from 'aws-core-vscode/codewhisperer'
import {
AuthUtil,
CodeWhispererConstants,
CodeWhispererStatusBarManager,
vsCodeState,
} from 'aws-core-vscode/codewhisperer'
import { TelemetryHelper } from './telemetryHelper'
import { ICursorUpdateRecorder } from './cursorUpdateManager'
import { getLogger } from 'aws-core-vscode/shared'
import { asyncCallWithTimeout } from '../../util/timeoutUtil'

export interface GetAllRecommendationsOptions {
emitTelemetry?: boolean
Expand All @@ -35,6 +41,23 @@ export class RecommendationService {
this.cursorUpdateRecorder = recorder
}

async getRecommendationsWithTimeout(
languageClient: LanguageClient,
request: InlineCompletionWithReferencesParams,
token: CancellationToken
) {
const resultPromise: Promise<InlineCompletionListWithReferences> = languageClient.sendRequest(
inlineCompletionWithReferencesRequestType.method,
request,
token
)
return await asyncCallWithTimeout<InlineCompletionListWithReferences>(
resultPromise,
`${inlineCompletionWithReferencesRequestType.method} time out`,
CodeWhispererConstants.promiseTimeoutLimit * 1000
)
}

async getAllRecommendations(
languageClient: LanguageClient,
document: TextDocument,
Expand Down Expand Up @@ -93,11 +116,9 @@ export class RecommendationService {
},
})
const t0 = performance.now()
const result: InlineCompletionListWithReferences = await languageClient.sendRequest(
inlineCompletionWithReferencesRequestType.method,
request,
token
)

const result = await this.getRecommendationsWithTimeout(languageClient, request, token)

getLogger().info('Received inline completion response from LSP: %O', {
sessionId: result.sessionId,
latency: performance.now() - t0,
Expand Down Expand Up @@ -181,11 +202,7 @@ export class RecommendationService {
while (nextToken) {
const request = { ...initialRequest, partialResultToken: nextToken }

const result: InlineCompletionListWithReferences = await languageClient.sendRequest(
inlineCompletionWithReferencesRequestType.method,
request,
token
)
const result = await this.getRecommendationsWithTimeout(languageClient, 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) {
Expand Down
15 changes: 15 additions & 0 deletions packages/amazonq/src/util/timeoutUtil.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*!
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/

export function asyncCallWithTimeout<T>(asyncPromise: Promise<T>, message: string, timeLimit: number): Promise<T> {
let timeoutHandle: NodeJS.Timeout
const timeoutPromise = new Promise((_resolve, reject) => {
timeoutHandle = setTimeout(() => reject(new Error(message)), timeLimit)
})
return Promise.race([asyncPromise, timeoutPromise]).then((result) => {
clearTimeout(timeoutHandle)
return result as T
})
}
Loading