patch

Author: Will-ShaoHua

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/editor/CodeWhispererEditorUtil.kt

@@ -19,9 +19,12 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretPosition
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.FileContextInfo
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.AWSTemplateCaseInsensitiveKeyWordsRegex
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.AWSTemplateKeyWordsRegex
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.JsonConfigFileNamingConvention
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.LEFT_CONTEXT_ON_CURRENT_LINE
 import java.awt.Point
+import java.util.Locale
 import kotlin.math.max
 import kotlin.math.min
 
@@ -108,8 +111,13 @@ object CodeWhispererEditorUtil {
     /**
      * Checks if the language is json and checks if left context contains keywords
      */
-    fun isConfigFileIfJsonFile(fileName: String, language: CodeWhispererProgrammingLanguage): Boolean =
-        (language is CodeWhispererJson) && JsonConfigFileNamingConvention.contains(fileName)
+    fun isConfigFileIfJsonFile(fileName: String, leftContext: String, language: CodeWhispererProgrammingLanguage): Boolean =
+        (language is CodeWhispererJson) &&
+            (
+                JsonConfigFileNamingConvention.contains(fileName) ||
+                    AWSTemplateKeyWordsRegex.containsMatchIn(leftContext) ||
+                    AWSTemplateCaseInsensitiveKeyWordsRegex.containsMatchIn(leftContext.lowercase(Locale.getDefault()))
+                )
 
     /**
      * Checks if the [otherRange] overlaps this TextRange. Note that the comparison is `<` because the endOffset of TextRange is exclusive.

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

@@ -170,7 +170,8 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
         }
 
         val language = requestContext.fileContextInfo.programmingLanguage
-        if (!language.isCodeCompletionSupported() || !(isConfigFileIfJsonFile(requestContext.fileContextInfo.filename, language))) {
+        val leftContext = requestContext.fileContextInfo.caretContext.leftFileContext
+        if (!language.isCodeCompletionSupported() || !isConfigFileIfJsonFile(requestContext.fileContextInfo.filename, leftContext, language)) {
             LOG.debug { "Programming language $language is not supported by CodeWhisperer" }
             if (triggerTypeInfo.triggerType == CodewhispererTriggerType.OnDemand) {
                 showCodeWhispererInfoHint(

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt

@@ -33,6 +33,9 @@ object CodeWhispererConstants {
     const val SUPPLEMENTAL_CONTEXT_TIMEOUT = 50L
     const val FEATURE_EVALUATION_PRODUCT_NAME = "CodeWhisperer"
 
+    val AWSTemplateKeyWordsRegex = Regex("(AWSTemplateFormatVersion|Resources|AWS::|Description)")
+    val AWSTemplateCaseInsensitiveKeyWordsRegex = Regex("(cloudformation|cfn|template|description)")
+
     val JsonConfigFileNamingConvention = setOf(
         "app.json",
         "appsettings.json",

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererEditorUtilTest.kt

@@ -13,6 +13,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
+import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.leftContext_success_Iac
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.pythonFileName
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.pythonTestLeftContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil
@@ -78,6 +79,12 @@ class CodeWhispererEditorUtilTest {
         assertThat(caretContext.leftContextOnCurrentLine).isEqualTo(pythonTestLeftContext)
     }
 
+    @Test
+    fun `test for keyword check for json and yaml`() {
+        val result = CodeWhispererEditorUtil.isConfigFileIfJsonFile("foo.json", leftContext_success_Iac, CodeWhispererJson.INSTANCE)
+        assertThat(result).isEqualTo(true)
+    }
+
     @ParameterizedTest
     @ValueSource(
         strings = ["app.json",
@@ -93,17 +100,17 @@ class CodeWhispererEditorUtilTest {
             "vcpkg.json"
         ]
     )
-    fun `isConfigFileIfJsonFile should return true`(fileName: String) {
-        val result = CodeWhispererEditorUtil.isConfigFileIfJsonFile(fileName, CodeWhispererJson.INSTANCE)
+    fun `isConfigFileIfJsonFile should return true by file name`(fileName: String) {
+        val result = CodeWhispererEditorUtil.isConfigFileIfJsonFile(fileName, "", CodeWhispererJson.INSTANCE)
         assertThat(result).isEqualTo(true)
     }
 
     @Test
-    fun `isConfigFileIfJsonFile should retrun false`() {
-        var result = CodeWhispererEditorUtil.isConfigFileIfJsonFile("foo.json", CodeWhispererJson.INSTANCE)
+    fun `isConfigFileIfJsonFile should retrun false due to no match`() {
+        var result = CodeWhispererEditorUtil.isConfigFileIfJsonFile("foo.json", "",CodeWhispererJson.INSTANCE)
         assertThat(result).isEqualTo(false)
 
-        result = CodeWhispererEditorUtil.isConfigFileIfJsonFile("package.json", CodeWhispererYaml.INSTANCE)
+        result = CodeWhispererEditorUtil.isConfigFileIfJsonFile("package.json", "", CodeWhispererYaml.INSTANCE)
         assertThat(result).isEqualTo(false)
     }
 }