Split Java and C# model editor languages

extensions/ql-vscode/src/model-editor/languages/csharp/index.ts

@@ -0,0 +1,15 @@
+import type { ModelsAsDataLanguage } from "../models-as-data";
+import { staticLanguage } from "../static";
+
+export const csharp: ModelsAsDataLanguage = {
+  ...staticLanguage,
+  predicates: {
+    ...staticLanguage.predicates,
+    sink: {
+      ...staticLanguage.predicates.sink,
+    },
+    source: {
+      ...staticLanguage.predicates.source,
+    },
+  },
+};

extensions/ql-vscode/src/model-editor/languages/java/index.ts

@@ -0,0 +1,15 @@
+import type { ModelsAsDataLanguage } from "../models-as-data";
+import { staticLanguage } from "../static";
+
+export const java: ModelsAsDataLanguage = {
+  ...staticLanguage,
+  predicates: {
+    ...staticLanguage.predicates,
+    sink: {
+      ...staticLanguage.predicates.sink,
+    },
+    source: {
+      ...staticLanguage.predicates.source,
+    },
+  },
+};

extensions/ql-vscode/src/model-editor/languages/languages.ts

@@ -3,13 +3,14 @@ import type {
   ModelsAsDataLanguage,
   ModelsAsDataLanguagePredicates,
 } from "./models-as-data";
+import { csharp } from "./csharp";
+import { java } from "./java";
 import { python } from "./python";
 import { ruby } from "./ruby";
-import { staticLanguage } from "./static";
 
 const languages: Partial<Record<QueryLanguage, ModelsAsDataLanguage>> = {
-  [QueryLanguage.CSharp]: staticLanguage,
+  [QueryLanguage.CSharp]: csharp,
-  [QueryLanguage.Java]: staticLanguage,
+  [QueryLanguage.Java]: java,
   [QueryLanguage.Python]: python,
   [QueryLanguage.Ruby]: ruby,
 };

extensions/ql-vscode/src/model-editor/languages/static/index.ts

@@ -10,7 +10,7 @@ function readRowToMethod(row: DataTuple[]): string {
   return `${row[0]}.${row[1]}#${row[3]}${row[4]}`;
 }
 
-export const staticLanguage: ModelsAsDataLanguage = {
+export const staticLanguage = {
   createMethodSignature: ({
     packageName,
     typeName,
@@ -168,4 +168,4 @@ export const staticLanguage: ModelsAsDataLanguage = {
         argumentsList.length > 0 ? argumentsList[0].path : "Argument[this]",
     };
   },
-};
+} satisfies ModelsAsDataLanguage;