CW: Resolved Conflicts

Author: laileni-aws

src/codewhisperer/models/constants.ts

@@ -98,6 +98,7 @@ export const platformLanguageIds = [
     'terragrunt',
     'packer',
     'plaintext',
+    'jsonc',
 ] as const
 
 export type PlatformLanguageId = (typeof platformLanguageIds)[number]

src/codewhisperer/service/classifierTrigger.ts

@@ -61,6 +61,9 @@ export class ClassifierTrigger {
         go: -0.3504,
         scala: -0.534,
         cpp: -0.1734,
+        json: 0,
+        yaml: -0.3,
+        tf: -0.55,
     }
 
     // other metadata coefficient

src/codewhisperer/util/dependencyGraph/dependencyGraphFactory.ts

@@ -34,6 +34,8 @@ export class DependencyGraphFactory {
     static getDependencyGraphFromFileExtensions<K extends Keys>(fileName: string): ClassType<K> {
         if (fileName.endsWith(DependencyGraphConstants.tfExt) || fileName.endsWith(DependencyGraphConstants.hclExt)) {
             return new languageMap['terraform']('tf' satisfies CodeWhispererConstants.PlatformLanguageId)
+        } else if (fileName.endsWith(DependencyGraphConstants.jsonExt)) {
+            return new languageMap['cloudformation']('json' satisfies CodeWhispererConstants.PlatformLanguageId)
         } else {
             return undefined
         }
@@ -53,8 +55,6 @@ export class DependencyGraphFactory {
                 return new languageMap['csharp']('csharp' satisfies CodeWhispererConstants.PlatformLanguageId)
             case 'yaml' satisfies CodeWhispererConstants.PlatformLanguageId:
                 return new languageMap['cloudformation']('yaml' satisfies CodeWhispererConstants.PlatformLanguageId)
-            case 'json' satisfies CodeWhispererConstants.PlatformLanguageId:
-                return new languageMap['cloudformation']('json' satisfies CodeWhispererConstants.PlatformLanguageId)
             case 'ruby' satisfies CodeWhispererConstants.PlatformLanguageId:
                 return new languageMap['ruby']('ruby' satisfies CodeWhispererConstants.PlatformLanguageId)
             default:

src/codewhisperer/util/runtimeLanguageContext.ts

@@ -65,7 +65,7 @@ export class RuntimeLanguageContext {
             javascript: 'javascript',
             javascriptreact: 'jsx',
             json: 'json',
-            jsonc: 'jsonc',
+            jsonc: 'json',
             jsx: 'jsx',
             kotlin: 'kotlin',
             packer: 'tf',
@@ -97,7 +97,7 @@ export class RuntimeLanguageContext {
             java: 'java',
             javascript: 'js',
             json: 'json',
-            jsonc: 'jsonc',
+            jsonc: 'json',
             jsx: 'jsx',
             kotlin: 'kt',
             plaintext: 'txt',