Merge branch 'master' into open_tab

Author: leigaol

buildspec/linuxTests.yml

@@ -48,7 +48,7 @@ phases:
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
-            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info
+            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info || true
 
 reports:
     unit-test:

packages/amazonq/src/app/inline/recommendationService.ts

@@ -12,11 +12,17 @@ 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 { getOpenFilesInWindow } from 'aws-core-vscode/utils'
+import { asyncCallWithTimeout } from '../../util/timeoutUtil'
 
 export interface GetAllRecommendationsOptions {
     emitTelemetry?: boolean
@@ -36,6 +42,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,
@@ -95,11 +118,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,
@@ -183,11 +204,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) {

packages/amazonq/src/util/timeoutUtil.ts

@@ -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
+    })
+}