Merge main into feature/dev-execution

Author: aws-toolkit-automation

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/CodeWhispererLanguageManager.kt

@@ -148,7 +148,7 @@ class CodeWhispererLanguageManager {
             listOf("vue") to CodeWhispererVue.INSTANCE,
             listOf("ps1", "psm1") to CodeWhispererPowershell.INSTANCE,
             listOf("r") to CodeWhispererR.INSTANCE,
-            listOf("abap", "acds") to CodeWhispererAbap.INSTANCE,
+            listOf("abap") to CodeWhispererAbap.INSTANCE,
         ).map {
             val exts = it.first
             val lang = it.second

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

@@ -137,7 +137,7 @@ class CodeWhispererLanguageManagerTest {
         testGetProgrammingLanguageUtil<CodeWhispererSwift>(listOf("foo"), listOf("swift"))
         testGetProgrammingLanguageUtil<CodeWhispererSystemVerilog>(listOf("foo"), listOf("sv", "svh", "vh"))
         testGetProgrammingLanguageUtil<CodeWhispererVue>(listOf("foo"), listOf("vue"))
-        testGetProgrammingLanguageUtil<CodeWhispererAbap>(listOf("foo"), listOf("abap", "acds"))
+        testGetProgrammingLanguageUtil<CodeWhispererAbap>(listOf("foo"), listOf("abap"))
     }
 
     @Test