feat(codewhisperer): enable UTG (Unit test generator) for java/python (#3651)

* Enable UTG (unit test generator) feature flag for CrossFile userGroup
* Make changes to ensure supplemental context telemetry being sent regardless the userGroup it belongs (we need `metadata.codewhispererSupplementalContextIsUtg` field to differentiate UTG feature acceptance rate vs. CrossFile feature)

Author: Will-ShaoHua

.changes/next-release/Feature-efc3928c-3e15-4e06-96e0-13d10c3496ab.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "CodeWhisperer: Improve suggestion quality with enhanced file context fetching"
+}

src/codewhisperer/util/editorContext.ts

@@ -16,9 +16,6 @@ import {
     fetchSupplementalContext,
 } from './supplementalContext/supplementalContextUtil'
 import { supplementalContextTimeoutInMs } from '../models/constants'
-import { CodeWhispererUserGroupSettings } from './userGroupUtil'
-import { isTestFile } from './supplementalContext/codeParsingUtil'
-import { DependencyGraphFactory } from './dependencyGraph/dependencyGraphFactory'
 import { selectFrom } from '../../shared/utilities/tsUtils'
 
 let tabSize: number = getTabSizeSetting()
@@ -90,14 +87,7 @@ export async function buildListRecommendationRequest(
         tokenSource.cancel()
     }, supplementalContextTimeoutInMs)
 
-    // Send Cross file context to CodeWhisperer service if and only if
-    // (1) User is CrossFile user group
-    // (2) The supplemental context is from Supplemental Context but not UTG(unit test generator)
-    const isUtg = await isTestFile(editor, DependencyGraphFactory.getDependencyGraph(editor.document.languageId))
-    const supplementalContexts: CodeWhispererSupplementalContext | undefined =
-        CodeWhispererUserGroupSettings.getUserGroup() === CodeWhispererConstants.UserGroup.CrossFile && !isUtg
-            ? await fetchSupplementalContext(editor, tokenSource.token)
-            : undefined
+    const supplementalContexts = await fetchSupplementalContext(editor, tokenSource.token)
 
     const suppelmetalMetadata: Omit<CodeWhispererSupplementalContext, 'supplementalContextItems'> | undefined =
         supplementalContexts

src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts

@@ -9,9 +9,10 @@ import { DependencyGraph } from '../dependencyGraph/dependencyGraph'
 import { BM25Document, BM25Okapi } from './rankBm25'
 import { isRelevant } from './editorFilesUtil'
 import { ToolkitError } from '../../../shared/errors'
-import { crossFileContextConfig, supplemetalContextFetchingTimeoutMsg } from '../../models/constants'
+import { UserGroup, crossFileContextConfig, supplemetalContextFetchingTimeoutMsg } from '../../models/constants'
 import { CancellationError } from '../../../shared/utilities/timeoutUtils'
 import { CodeWhispererSupplementalContextItem } from './supplementalContextUtil'
+import { CodeWhispererUserGroupSettings } from '../userGroupUtil'
 
 const crossFileLanguageConfigs = ['java']
 interface Chunk {
@@ -30,6 +31,10 @@ export async function fetchSupplementalContextForSrc(
         return undefined
     }
 
+    if (CodeWhispererUserGroupSettings.instance.userGroup !== UserGroup.CrossFile) {
+        return []
+    }
+
     // Step 1: Get relevant cross files to refer
     const relevantCrossFilePaths = await getRelevantCrossFiles(editor, dependencyGraph)
     throwIfCancelled(cancellationToken)

src/codewhisperer/util/supplementalContext/utgUtils.ts

@@ -21,6 +21,8 @@ import { supplemetalContextFetchingTimeoutMsg } from '../../models/constants'
 import { CancellationError } from '../../../shared/utilities/timeoutUtils'
 import { CodeWhispererSupplementalContextItem } from './supplementalContextUtil'
 import { utgConfig } from '../../models/constants'
+import { CodeWhispererUserGroupSettings } from '../userGroupUtil'
+import { UserGroup } from '../../models/constants'
 
 /**
  * This function attempts to find a focal file for the given trigger file.
@@ -51,6 +53,10 @@ export async function fetchSupplementalContextForTest(
         return undefined
     }
 
+    if (CodeWhispererUserGroupSettings.instance.userGroup !== UserGroup.CrossFile) {
+        return []
+    }
+
     // TODO (Metrics): 1. Total number of calls to fetchSupplementalContextForTest
     throwIfCancelled(cancellationToken)