Merge master into feature/emr

Author: aws-toolkit-automation

packages/amazonq/test/unit/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts

@@ -30,6 +30,11 @@ describe('codewhispererCodecoverageTracker', function () {
         it('unsupported language', function () {
             assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('vb'), undefined)
             assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('ipynb'), undefined)
+            assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('r'), undefined)
+            assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('dart'), undefined)
+            assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('swift'), undefined)
+            assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('lua'), undefined)
+            assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('powershell'), undefined)
         })
 
         it('supported language', function () {
@@ -40,7 +45,6 @@ describe('codewhispererCodecoverageTracker', function () {
             assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('cpp'), undefined)
             assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('ruby'), undefined)
             assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('go'), undefined)
-            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('r'), undefined)
         })
 
         it('supported language and should return singleton object per language', function () {

packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts

@@ -36,13 +36,13 @@ describe('runtimeLanguageContext', function () {
             ['json', true],
             ['yaml', true],
             ['tf', true],
-            ['dart', true],
-            ['lua', true],
-            ['powershell', true],
-            ['r', true],
-            ['swift', true],
-            ['systemVerilog', true],
-            ['vue', true],
+            ['dart', false],
+            ['lua', false],
+            ['powershell', false],
+            ['r', false],
+            ['swift', false],
+            ['systemVerilog', false],
+            ['vue', false],
             ['plaintext', false],
             ['html', false],
             ['vb', false],

packages/core/src/codewhisperer/util/runtimeLanguageContext.ts

@@ -235,7 +235,25 @@ export class RuntimeLanguageContext {
      */
     public isLanguageSupported(languageId: string): boolean {
         const lang = this.normalizeLanguage(languageId)
-        return lang !== undefined && this.normalizeLanguage(languageId) !== 'plaintext'
+        switch (lang) {
+            case undefined:
+                return false
+
+            case 'plaintext':
+                return false
+
+            case 'dart':
+            case 'lua':
+            case 'powershell':
+            case 'r':
+            case 'swift':
+            case 'vue':
+            case 'systemVerilog':
+                return false
+
+            default:
+                return true
+        }
     }
     /**
      *