Merge master into feature/emr

Author: aws-toolkit-automation

package-lock.json

@@ -41,7 +41,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.321",
+        "@aws-toolkits/telemetry": "^1.0.322",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

package.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Add inline completion support for abap language"
+}

packages/amazonq/.changes/next-release/Feature-31d91f84-30cb-4acd-9e39-9dc153edf0a6.json

@@ -177,7 +177,6 @@ describe('runtimeLanguageContext', function () {
             'jsx',
             'kotlin',
             'php',
-            'plaintext',
             'python',
             'ruby',
             'rust',
@@ -288,7 +287,6 @@ describe('runtimeLanguageContext', function () {
             ['jsx', 'jsx'],
             ['kotlin', 'kt'],
             ['php', 'php'],
-            ['plaintext', 'txt'],
             ['python', 'py'],
             ['ruby', 'rb'],
             ['rust', 'rs'],

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

@@ -151,8 +151,7 @@ export function extractContextForCodeWhisperer(editor: vscode.TextEditor): codew
     )
     let languageName = 'plaintext'
     if (!checkLeftContextKeywordsForJson(document.fileName, caretLeftFileContext, editor.document.languageId)) {
-        languageName =
-            runtimeLanguageContext.normalizeLanguage(editor.document.languageId) ?? editor.document.languageId
+        languageName = runtimeLanguageContext.resolveLang(editor.document)
     }
     if (editor.document.uri.scheme === 'vscode-notebook-cell') {
         const notebook = getEnclosingNotebook(editor)

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

@@ -67,7 +67,7 @@ export class RuntimeLanguageContext {
 
     constructor() {
         this.supportedLanguageMap = createConstantMap<
-            CodeWhispererConstants.PlatformLanguageId | CodewhispererLanguage,
+            Exclude<CodeWhispererConstants.PlatformLanguageId | CodewhispererLanguage, 'plaintext'>,
             CodewhispererLanguage
         >({
             c: 'c',
@@ -85,7 +85,6 @@ export class RuntimeLanguageContext {
             jsx: 'jsx',
             kotlin: 'kotlin',
             packer: 'tf',
-            plaintext: 'plaintext',
             php: 'php',
             python: 'python',
             ruby: 'ruby',
@@ -112,6 +111,7 @@ export class RuntimeLanguageContext {
             systemverilog: 'systemVerilog',
             verilog: 'systemVerilog',
             vue: 'vue',
+            abap: 'abap',
         })
         this.supportedLanguageExtensionMap = createConstantMap<string, CodewhispererLanguage>({
             c: 'c',
@@ -152,6 +152,8 @@ export class RuntimeLanguageContext {
             ps1: 'powershell',
             psm1: 'powershell',
             r: 'r',
+            abap: 'abap',
+            acds: 'abap',
         })
         this.languageSingleLineCommentPrefixMap = createConstantMap<CodewhispererLanguage, string>({
             c: '// ',
@@ -185,9 +187,14 @@ export class RuntimeLanguageContext {
             vue: '', // vue lacks a single-line comment prefix
             yaml: '# ',
             yml: '# ',
+            abap: '',
         })
     }
 
+    public resolveLang(doc: vscode.TextDocument): CodewhispererLanguage {
+        return this.normalizeLanguage(doc.languageId) || this.byFileExt(doc) || 'plaintext'
+    }
+
     /**
      * To add a new platform language id:
      * 1. add new platform language ID constant in the file codewhisperer/constant.ts
@@ -317,8 +324,7 @@ export class RuntimeLanguageContext {
         } else {
             const normalizedLanguageId = this.normalizeLanguage(arg.languageId)
             const byLanguageId = !normalizedLanguageId || normalizedLanguageId === 'plaintext' ? false : true
-            const extension = path.extname(arg.uri.fsPath)
-            const byFileExtension = this.isFileFormatSupported(extension.substring(1))
+            const byFileExtension = this.byFileExt(arg) !== undefined
 
             return byLanguageId || byFileExtension
         }
@@ -341,6 +347,17 @@ export class RuntimeLanguageContext {
     public getLanguageFromFileExtension(fileExtension: string) {
         return this.supportedLanguageExtensionMap.get(fileExtension)
     }
+
+    private byFileExt(doc: vscode.TextDocument): CodewhispererLanguage | undefined {
+        const extension = path.extname(doc.uri.fsPath)
+        const byExt = this.supportedLanguageExtensionMap.get(extension.substring(1))
+
+        if (byExt === 'plaintext') {
+            return undefined
+        }
+
+        return byExt
+    }
 }
 
 export const runtimeLanguageContext = new RuntimeLanguageContext()