codewhisperer: dial up java utg support #3710

Author: Will-ShaoHua

.changes/next-release/Feature-7fd62dd9-139d-489b-ab89-0bd6a4490423.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "CodeWhisperer: Improve file context fetching for Java test files"
+}

src/codewhisperer/util/supplementalContext/utgUtils.ts

@@ -24,6 +24,27 @@ import { CodeWhispererUserGroupSettings } from '../userGroupUtil'
 import { UserGroup } from '../../models/constants'
 import { getOpenFilesInWindow } from '../../../shared/utilities/editorUtilities'
 
+type UtgSupportedLanguage = keyof typeof utgLanguageConfigs
+
+function isUtgSupportedLanguage(languageId: vscode.TextDocument['languageId']): languageId is UtgSupportedLanguage {
+    return languageId in utgLanguageConfigs
+}
+
+export function shouldFetchUtgContext(
+    languageId: vscode.TextDocument['languageId'],
+    userGroup: UserGroup
+): boolean | undefined {
+    if (!isUtgSupportedLanguage(languageId)) {
+        return undefined
+    }
+
+    if (languageId === 'java') {
+        return true
+    } else {
+        return userGroup === UserGroup.CrossFile
+    }
+}
+
 /**
  * This function attempts to find a focal file for the given trigger file.
  * Attempt 1: If naming patterns followed correctly, source file can be found by name referencing.
@@ -37,24 +58,16 @@ export async function fetchSupplementalContextForTest(
     editor: vscode.TextEditor,
     cancellationToken: vscode.CancellationToken
 ): Promise<CodeWhispererSupplementalContextItem[] | undefined> {
-    // TODO: Add metrices
-    // 1. Total number of calls to fetchSupplementalContextForTest
-    // 2. Success count for fetchSourceFileByName (find source file by name)
-    // 3. Success count for fetchSourceFileByContent (find source file by content)
-    // 4. Failure count - when unable to find focal file (supplemental context empty)
+    const shouldProceed = shouldFetchUtgContext(
+        editor.document.languageId,
+        CodeWhispererUserGroupSettings.instance.userGroup
+    )
 
-    const languageConfig = utgLanguageConfigs[editor.document.languageId]
-    if (!languageConfig) {
-        // This is required because we are launching this support for even smaller subset of
-        // supported languages.
-        // TODO: Add a metrics to see number of calls falling in this bucket.
-        // TODO: Either catch this error upstream or here.
-        return undefined
+    if (!shouldProceed) {
+        return shouldProceed === undefined ? undefined : []
     }
 
-    if (CodeWhispererUserGroupSettings.instance.userGroup !== UserGroup.CrossFile) {
-        return []
-    }
+    const languageConfig = utgLanguageConfigs[editor.document.languageId]
 
     // TODO (Metrics): 1. Total number of calls to fetchSupplementalContextForTest
     throwIfCancelled(cancellationToken)

src/test/codewhisperer/util/utgUtils.test.ts

@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as utgUtils from '../../../codewhisperer/util/supplementalContext/utgUtils'
+import { UserGroup } from '../../../codewhisperer/models/constants'
+
+describe('shouldFetchUtgContext', () => {
+    it('fully supported language', function () {
+        assert.ok(utgUtils.shouldFetchUtgContext('java', UserGroup.Control))
+        assert.ok(utgUtils.shouldFetchUtgContext('java', UserGroup.CrossFile))
+    })
+
+    it('partially supported language', () => {
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('python', UserGroup.Control), false)
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('python', UserGroup.CrossFile), true)
+    })
+
+    it('not supported language', () => {
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('typescript', UserGroup.Control), undefined)
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('typescript', UserGroup.CrossFile), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('javascript', UserGroup.Control), undefined)
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('javascript', UserGroup.CrossFile), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('javascriptreact', UserGroup.Control), undefined)
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('javascriptreact', UserGroup.CrossFile), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('typescriptreact', UserGroup.Control), undefined)
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('typescriptreact', UserGroup.CrossFile), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('scala', UserGroup.Control), undefined)
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('scala', UserGroup.CrossFile), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('shellscript', UserGroup.Control), undefined)
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('shellscript', UserGroup.CrossFile), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('csharp', UserGroup.Control), undefined)
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('csharp', UserGroup.CrossFile), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('c', UserGroup.Control), undefined)
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('c', UserGroup.CrossFile), undefined)
+    })
+})