Merge master into feature/emr

Author: aws-toolkit-automation

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

@@ -96,7 +96,7 @@ describe('crossFileContextUtil', function () {
             assert.strictEqual(actual.supplementalContextItems[3].content.split('\n').length, 50)
         })
 
-        it('for t2 group, should return global bm25 context and no repomap', async function () {
+        it.skip('for t2 group, should return global bm25 context and no repomap', async function () {
             await toTextEditor(aStringWithLineCount(200), 'CrossFile.java', tempFolder, { preview: false })
             const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
                 preview: false,

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

@@ -284,14 +284,8 @@ function getSupplementalContextConfig(languageId: vscode.TextDocument['languageI
 
     const group = FeatureConfigProvider.instance.getProjectContextGroup()
     switch (group) {
-        case 'control':
-            return 'opentabs'
-
-        case 't1':
+        default:
             return 'codemap'
-
-        case 't2':
-            return 'bm25'
     }
 }