add 50ms timeout concurrent

Author: leigaol

packages/core/src/codewhisperer/util/commonUtil.ts

@@ -30,6 +30,17 @@ export function asyncCallWithTimeout<T>(asyncPromise: Promise<T>, message: strin
     })
 }
 
+export function asyncCallWithTimeoutSwallowErrors<T>(asyncPromise: Promise<T>, timeLimit: number): Promise<T> {
+    let timeoutHandle: NodeJS.Timeout
+    const timeoutPromise = new Promise((resolve) => {
+        timeoutHandle = setTimeout(() => resolve(undefined), timeLimit)
+    })
+    return Promise.race([asyncPromise, timeoutPromise]).then((result) => {
+        clearTimeout(timeoutHandle)
+        return result as T
+    })
+}
+
 export function isInlineCompletionEnabled() {
     return getInlineSuggestEnabled() && !isCloud9()
 }

packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts

@@ -8,15 +8,19 @@ import { FeatureConfigProvider, fs } from '../../../shared'
 import path = require('path')
 import { BM25Document, BM25Okapi } from './rankBm25'
 import { ToolkitError } from '../../../shared/errors'
-import { crossFileContextConfig, supplementalContextTimeoutInMs, supplemetalContextFetchingTimeoutMsg } from '../../models/constants'
+import {
+    crossFileContextConfig,
+    supplementalContextTimeoutInMs,
+    supplemetalContextFetchingTimeoutMsg,
+} from '../../models/constants'
 import { CancellationError } from '../../../shared/utilities/timeoutUtils'
 import { isTestFile } from './codeParsingUtil'
 import { getFileDistance } from '../../../shared/filesystemUtilities'
 import { getOpenFilesInWindow } from '../../../shared/utilities/editorUtilities'
 import { getLogger } from '../../../shared/logger/logger'
 import { CodeWhispererSupplementalContext, CodeWhispererSupplementalContextItem } from '../../models/model'
 import { LspController } from '../../../amazonq/lsp/lspController'
-import { asyncCallWithTimeout } from '../commonUtil'
+import { asyncCallWithTimeoutSwallowErrors } from '../commonUtil'
 
 type CrossFileSupportedLanguage =
     | 'java'
@@ -63,13 +67,16 @@ export async function fetchSupplementalContextForSrc(
     if (supplementalContextConfig === 'v1') {
         return fetchSupplementalContextForSrcV1(editor, cancellationToken)
     }
-    try {
-        return asyncCallWithTimeout(fetchSupplementalContextForSrcV2(editor), "time out when fetching supplemental context", supplementalContextTimeoutInMs)
-    } catch (e) {
-        getLogger().error(`Failed to fetch supplemental context from LSP ${e}`)
-        return fetchSupplementalContextForSrcV1(editor, cancellationToken)
-    }
-
+    const promiseV1 = asyncCallWithTimeoutSwallowErrors(
+        fetchSupplementalContextForSrcV1(editor, cancellationToken),
+        supplementalContextTimeoutInMs
+    )
+    const promiseV2 = asyncCallWithTimeoutSwallowErrors(
+        fetchSupplementalContextForSrcV2(editor),
+        supplementalContextTimeoutInMs
+    )
+    const [resultV1, resultV2] = await Promise.all([promiseV1, promiseV2])
+    return resultV2 ?? resultV1
 }
 
 export async function fetchSupplementalContextForSrcV2(