codewhisperer: enable complete .py .js .jsx .ts .tsx crossfile support (#3816)

Author: Will-ShaoHua

.changes/next-release/feature-29c5f9bc-a9ac-41a5-bab9-49f6ea0701c2.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "CodeWhisperer: Improve file context fetching for Python Typescript Javascript source files"
+}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererFileContextProvider.kt

@@ -23,6 +23,11 @@ import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJava
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJavaScript
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJsx
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererPython
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererTsx
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererTypeScript
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.Chunk
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.FileContextInfo
@@ -43,6 +48,7 @@ private val codewhispererCodeChunksIndex = GistManager.getInstance()
             FileContextProvider.getInstance(psiFile.project).extractCodeChunksFromFiles(psiFile, fileProducers)
         }
     }
+
 private object CodeWhispererCodeChunkExternalizer : DataExternalizer<List<Chunk>> {
     override fun save(out: DataOutput, value: List<Chunk>) {
         out.writeInt(value.size)
@@ -282,7 +288,13 @@ class DefaultCodeWhispererFileContextProvider(private val project: Project) : Fi
             }
 
             return when (language) {
-                is CodeWhispererJava -> true
+                is CodeWhispererJava,
+                is CodeWhispererPython,
+                is CodeWhispererJavaScript,
+                is CodeWhispererTypeScript,
+                is CodeWhispererJsx,
+                is CodeWhispererTsx -> true
+
                 else -> userGroup == CodeWhispererUserGroup.CrossFile
             }
         }

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererFileContextProviderTest.kt

@@ -124,44 +124,38 @@ class CodeWhispererFileContextProviderTest {
     fun `shouldFetchCrossfileContext - fully support`() {
         assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererJava.INSTANCE, CodeWhispererUserGroup.CrossFile)).isTrue
         assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererJava.INSTANCE, CodeWhispererUserGroup.Control)).isTrue
-    }
 
-    @Test
-    fun `shouldFetchCrossfileContext - partially support`() {
-        assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererPython.INSTANCE, CodeWhispererUserGroup.Control)).isFalse
         assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererPython.INSTANCE, CodeWhispererUserGroup.CrossFile)).isTrue
+        assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererPython.INSTANCE, CodeWhispererUserGroup.Control)).isTrue
 
-        assertThat(
-            DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(
-                CodeWhispererJavaScript.INSTANCE,
-                CodeWhispererUserGroup.Control
-            )
-        ).isFalse
         assertThat(
             DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(
                 CodeWhispererJavaScript.INSTANCE,
                 CodeWhispererUserGroup.CrossFile
             )
         ).isTrue
+        assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererJavaScript.INSTANCE, CodeWhispererUserGroup.Control)).isTrue
 
-        assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererJsx.INSTANCE, CodeWhispererUserGroup.Control)).isFalse
         assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererJsx.INSTANCE, CodeWhispererUserGroup.CrossFile)).isTrue
+        assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererJsx.INSTANCE, CodeWhispererUserGroup.Control)).isTrue
 
-        assertThat(
-            DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(
-                CodeWhispererTypeScript.INSTANCE,
-                CodeWhispererUserGroup.Control
-            )
-        ).isFalse
         assertThat(
             DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(
                 CodeWhispererTypeScript.INSTANCE,
                 CodeWhispererUserGroup.CrossFile
             )
         ).isTrue
+        assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererTypeScript.INSTANCE, CodeWhispererUserGroup.Control)).isTrue
 
-        assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererTsx.INSTANCE, CodeWhispererUserGroup.Control)).isFalse
         assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererTsx.INSTANCE, CodeWhispererUserGroup.CrossFile)).isTrue
+        assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererTsx.INSTANCE, CodeWhispererUserGroup.Control)).isTrue
+    }
+
+    @Ignore("Reenable this once we have any partial support language")
+    @Test
+    fun `shouldFetchCrossfileContext - partially support`() {
+        assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererPython.INSTANCE, CodeWhispererUserGroup.Control)).isFalse
+        assertThat(DefaultCodeWhispererFileContextProvider.shouldFetchCrossfileContext(CodeWhispererPython.INSTANCE, CodeWhispererUserGroup.CrossFile)).isTrue
     }
 
     @Test