Merge master into feature/emr

Author: aws-toolkit-automation

package-lock.json

@@ -39,7 +39,7 @@
         "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.254",
+        "@aws-toolkits/telemetry": "^1.0.258",
         "@playwright/browser-chromium": "^1.43.1",
         "@types/vscode": "^1.68.0",
         "@types/vscode-webview": "^1.57.1",

package.json

@@ -29,7 +29,6 @@ describe('codewhispererCodecoverageTracker', function () {
 
         it('unsupported language', function () {
             assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('vb'), undefined)
-            assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('r'), undefined)
             assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('ipynb'), undefined)
         })
 
@@ -41,6 +40,7 @@ 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/tracker/codewhispererCodeCoverageTracker.test.ts

@@ -36,9 +36,15 @@ describe('runtimeLanguageContext', function () {
             ['json', true],
             ['yaml', true],
             ['tf', true],
+            ['dart', true],
+            ['lua', true],
+            ['powershell', true],
+            ['r', true],
+            ['swift', true],
+            ['systemVerilog', true],
+            ['vue', true],
             ['plaintext', false],
             ['html', false],
-            ['r', false],
             ['vb', false],
         ]
 
@@ -71,14 +77,18 @@ describe('runtimeLanguageContext', function () {
             ['go', 'go'],
             ['kotlin', 'kotlin'],
             ['php', 'php'],
+            ['powershell', 'powershell'],
             ['ruby', 'ruby'],
             ['rust', 'rust'],
             ['scala', 'scala'],
             ['shellscript', 'shell'],
             ['sql', 'sql'],
+            ['r', 'r'],
+            ['swift', 'swift'],
+            ['lua', 'lua'],
+            ['vue', 'vue'],
             ['plaintext', 'plaintext'],
             ['html', 'plaintext'],
-            ['r', 'plaintext'],
             ['vb', 'plaintext'],
             [undefined, 'plaintext'],
         ]

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

@@ -87,6 +87,13 @@ export class RuntimeLanguageContext {
             typescriptreact: 'tsx',
             yml: 'yaml',
             yaml: 'yaml',
+            dart: 'dart',
+            lua: 'lua',
+            powershell: 'powershell',
+            r: 'r',
+            swift: 'swift',
+            systemVerilog: 'systemVerilog',
+            vue: 'vue',
         })
         this.supportedLanguageExtensionMap = createConstantMap<string, CodewhispererLanguage>({
             c: 'c',
@@ -170,6 +177,17 @@ export class RuntimeLanguageContext {
             json: 'json',
             yaml: 'yaml',
             yml: 'yaml',
+            sv: 'systemVerilog',
+            svh: 'systemVerilog',
+            vh: 'systemVerilog',
+            dart: 'dart',
+            lua: 'lua',
+            wlua: 'lua',
+            swift: 'swift',
+            vue: 'vue',
+            ps1: 'powershell',
+            psm1: 'powershell',
+            r: 'r',
             // Add more mappings if needed
         }