fix comments

Author: leigaol

packages/core/src/amazonq/lsp/lspClient.ts

@@ -109,8 +109,8 @@ export class LspClient {
                 query: query,
                 filePath: path,
             })
-            const encrpted = await this.encrypt(request)
-            const resp: any = await this.client?.sendRequest(QueryInlineProjectContextRequestType, encrpted)
+            const encrypted = await this.encrypt(request)
+            const resp: any = await this.client?.sendRequest(QueryInlineProjectContextRequestType, encrypted)
             return resp
         } catch (e) {
             getLogger().error(`LspClient: queryInlineProjectContext error: ${e}`)

packages/core/src/amazonq/lsp/lspController.ts

@@ -66,7 +66,7 @@ export interface Manifest {
 }
 const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json'
 // this LSP client in Q extension is only going to work with these LSP server versions
-const supportedLspServerVersions = ['0.1.20', '0.1.19']
+const supportedLspServerVersions = ['0.1.22', '0.1.19']
 
 const nodeBinName = process.platform === 'win32' ? 'node.exe' : 'node'
 
@@ -364,14 +364,15 @@ export class LspController {
                 //     reason: `Unknown`,
                 // })
             }
-        } catch (e) {
+        } catch (error) {
+            //TODO: use telemetry.run()q
             getLogger().error(`LspController: Failed to build index of project`)
             telemetry.amazonq_indexWorkspace.emit({
                 duration: performance.now() - start,
                 result: 'Failed',
                 amazonqIndexFileCount: 0,
                 amazonqIndexFileSizeInMB: 0,
-                reason: `${e}`,
+                reason: `Error when building index. ${error instanceof Error ? error.message : error}`,
             })
         } finally {
             this._isIndexingInProgress = false

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

@@ -30,17 +30,6 @@ 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

@@ -13,14 +13,13 @@ import {
     supplementalContextTimeoutInMs,
     supplemetalContextFetchingTimeoutMsg,
 } from '../../models/constants'
-import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { tryTimeout, 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 { asyncCallWithTimeoutSwallowErrors } from '../commonUtil'
 
 type CrossFileSupportedLanguage =
     | 'java'
@@ -67,14 +66,11 @@ export async function fetchSupplementalContextForSrc(
     if (supplementalContextConfig === 'v1') {
         return fetchSupplementalContextForSrcV1(editor, cancellationToken)
     }
-    const promiseV1 = asyncCallWithTimeoutSwallowErrors(
+    const promiseV1 = tryTimeout(
         fetchSupplementalContextForSrcV1(editor, cancellationToken),
         supplementalContextTimeoutInMs
     )
-    const promiseV2 = asyncCallWithTimeoutSwallowErrors(
-        fetchSupplementalContextForSrcV2(editor),
-        supplementalContextTimeoutInMs
-    )
+    const promiseV2 = tryTimeout(fetchSupplementalContextForSrcV2(editor), supplementalContextTimeoutInMs)
     const [resultV1, resultV2] = await Promise.all([promiseV1, promiseV2])
     return resultV2 ?? resultV1
 }

packages/core/src/shared/utilities/timeoutUtils.ts

@@ -387,3 +387,21 @@ export class TimeLag {
         globals.clock.clearInterval(this.intervalRef)
     }
 }
+/**
+ * Tries to execute an asynchronous Promise with a specified time limit.
+ * If the Promise is not resolved within the time limit, it returns `undefined`.
+ *
+ * @param {Promise<T>} asyncPromise - The asynchronous Promise to execute.
+ * @param {number} timeLimit - The time limit in milliseconds.
+ * @returns {Promise<T | undefined>} A Promise that resolves with the result of the original Promise if it completes within the time limit, or `undefined` if the time limit is exceeded.
+ */
+export function tryTimeout<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
+    })
+}