Merge master into feature/sdkv3

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Bug Fix-9575c7da-3e49-4051-ba29-6b292d3e399a.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Fix opentabs context possibly timeout due to race condition of misuse of different timeout functionalities"
+}

packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts

@@ -44,7 +44,7 @@ describe('crossFileContextUtil', function () {
             sinon.restore()
         })
 
-        it('for control group, should return opentabs context where there will be 3 chunks and each chunk should contains 50 lines', async function () {
+        it.skip('for control group, should return opentabs context where there will be 3 chunks and each chunk should contains 50 lines', async function () {
             sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('control')
             await toTextEditor(aStringWithLineCount(200), 'CrossFile.java', tempFolder, { preview: false })
             const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
@@ -61,7 +61,7 @@ describe('crossFileContextUtil', function () {
             assert.strictEqual(actual.supplementalContextItems[2].content.split('\n').length, 50)
         })
 
-        it.skip('for t1 group, should return repomap + opentabs context', async function () {
+        it('for t1 group, should return repomap + opentabs context', async function () {
             await toTextEditor(aStringWithLineCount(200), 'CrossFile.java', tempFolder, { preview: false })
             const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
                 preview: false,
@@ -312,7 +312,9 @@ describe('crossFileContextUtil', function () {
     })
 
     describe('full support', function () {
-        const fileExtLists = ['java', 'js', 'ts', 'py', 'tsx', 'jsx']
+        // TODO: fix it
+        // const fileExtLists = ['java', 'js', 'ts', 'py', 'tsx', 'jsx']
+        const fileExtLists = ['java']
 
         before(async function () {
             this.timeout(60000)
@@ -328,8 +330,18 @@ describe('crossFileContextUtil', function () {
         })
 
         fileExtLists.forEach((fileExt) => {
-            it('should be non empty', async function () {
+            it(`supplemental context for file ${fileExt} should be non empty`, async function () {
                 sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('control')
+                sinon
+                    .stub(LspController.instance, 'queryInlineProjectContext')
+                    .withArgs(sinon.match.any, sinon.match.any, 'codemap')
+                    .resolves([
+                        {
+                            content: 'foo',
+                            score: 0,
+                            filePath: 'q-inline',
+                        },
+                    ])
                 const editor = await toTextEditor('content-1', `file-1.${fileExt}`, tempFolder)
                 await toTextEditor('content-2', `file-2.${fileExt}`, tempFolder, { preview: false })
                 await toTextEditor('content-3', `file-3.${fileExt}`, tempFolder, { preview: false })

packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts

@@ -10,6 +10,7 @@ import * as crossFile from 'aws-core-vscode/codewhisperer'
 import { TestFolder, assertTabCount } from 'aws-core-vscode/test'
 import { FeatureConfigProvider } from 'aws-core-vscode/codewhisperer'
 import { toTextEditor } from 'aws-core-vscode/test'
+import { LspController } from 'aws-core-vscode/amazonq'
 
 describe('supplementalContextUtil', function () {
     let testFolder: TestFolder
@@ -31,6 +32,16 @@ describe('supplementalContextUtil', function () {
     describe('fetchSupplementalContext', function () {
         describe('openTabsContext', function () {
             it('opentabContext should include chunks if non empty', async function () {
+                sinon
+                    .stub(LspController.instance, 'queryInlineProjectContext')
+                    .withArgs(sinon.match.any, sinon.match.any, 'codemap')
+                    .resolves([
+                        {
+                            content: 'foo',
+                            score: 0,
+                            filePath: 'q-inline',
+                        },
+                    ])
                 await toTextEditor('class Foo', 'Foo.java', testFolder.path, { preview: false })
                 await toTextEditor('class Bar', 'Bar.java', testFolder.path, { preview: false })
                 await toTextEditor('class Baz', 'Baz.java', testFolder.path, { preview: false })
@@ -42,7 +53,7 @@ describe('supplementalContextUtil', function () {
                 await assertTabCount(4)
 
                 const actual = await crossFile.fetchSupplementalContext(editor, fakeCancellationToken)
-                assert.ok(actual?.supplementalContextItems.length === 3)
+                assert.ok(actual?.supplementalContextItems.length === 4)
             })
 
             it('opentabsContext should filter out empty chunks', async function () {

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

@@ -7,13 +7,7 @@ import * as vscode from 'vscode'
 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 { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { crossFileContextConfig, supplementalContextTimeoutInMs } from '../../models/constants'
 import { isTestFile } from './codeParsingUtil'
 import { getFileDistance } from '../../../shared/filesystemUtilities'
 import { getOpenFilesInWindow } from '../../../shared/utilities/editorUtilities'
@@ -77,9 +71,17 @@ export async function fetchSupplementalContextForSrc(
         return undefined
     }
 
+    // fallback to opentabs if projectContext timeout
+    const opentabsContextPromise = waitUntil(
+        async function () {
+            return await fetchOpentabsContext(editor, cancellationToken)
+        },
+        { timeout: supplementalContextTimeoutInMs, interval: 5, truthy: false }
+    )
+
     // opentabs context will use bm25 and users' open tabs to fetch supplemental context
     if (supplementalContextConfig === 'opentabs') {
-        const supContext = (await fetchOpentabsContext(editor, cancellationToken)) ?? []
+        const supContext = (await opentabsContextPromise) ?? []
         return {
             supplementalContextItems: supContext,
             strategy: supContext.length === 0 ? 'Empty' : 'opentabs',
@@ -126,14 +128,6 @@ export async function fetchSupplementalContextForSrc(
         }
     }
 
-    // fallback to opentabs if projectContext timeout for 'default' | 'bm25'
-    const opentabsContextPromise = waitUntil(
-        async function () {
-            return await fetchOpentabsContext(editor, cancellationToken)
-        },
-        { timeout: supplementalContextTimeoutInMs, interval: 5, truthy: false }
-    )
-
     // global bm25 without repomap
     if (supplementalContextConfig === 'bm25') {
         const projectBM25Promise = waitUntil(
@@ -207,14 +201,12 @@ export async function fetchOpentabsContext(
 
     // Step 1: Get relevant cross files to refer
     const relevantCrossFilePaths = await getCrossFileCandidates(editor)
-    throwIfCancelled(cancellationToken)
 
     // Step 2: Split files to chunks with upper bound on chunkCount
     // We restrict the total number of chunks to improve on latency.
     // Chunk linking is required as we want to pass the next chunk value for matched chunk.
     let chunkList: Chunk[] = []
     for (const relevantFile of relevantCrossFilePaths) {
-        throwIfCancelled(cancellationToken)
         const chunks: Chunk[] = await splitFileToChunks(relevantFile, crossFileContextConfig.numberOfLinesEachChunk)
         const linkedChunks = linkChunks(chunks)
         chunkList.push(...linkedChunks)
@@ -230,14 +222,11 @@ export async function fetchOpentabsContext(
     // and Find Best K chunks w.r.t input chunk using BM25
     const inputChunk: Chunk = getInputChunk(editor)
     const bestChunks: Chunk[] = findBestKChunkMatches(inputChunk, chunkList, crossFileContextConfig.topK)
-    throwIfCancelled(cancellationToken)
 
     // Step 4: Transform best chunks to supplemental contexts
     const supplementalContexts: CodeWhispererSupplementalContextItem[] = []
     let totalLength = 0
     for (const chunk of bestChunks) {
-        throwIfCancelled(cancellationToken)
-
         totalLength += chunk.nextContent.length
 
         if (totalLength > crossFileContextConfig.maximumTotalLength) {
@@ -390,9 +379,3 @@ export async function getCrossFileCandidates(editor: vscode.TextEditor): Promise
             return fileToDistance.file
         })
 }
-
-function throwIfCancelled(token: vscode.CancellationToken): void | never {
-    if (token.isCancellationRequested) {
-        throw new ToolkitError(supplemetalContextFetchingTimeoutMsg, { cause: new CancellationError('timeout') })
-    }
-}