From 6c5f160eeef74ba21fdb628aa879d548e7a61c43 Mon Sep 17 00:00:00 2001
From: Koen Vlaswinkel <koesie10@github.com>
Date: Thu, 28 Sep 2023 12:17:06 +0200
Subject: [PATCH] Update model editor C# query to return method parameters with
 parentheses

---
 extensions/ql-vscode/src/model-editor/bqrs.ts              | 7 -------
 extensions/ql-vscode/src/model-editor/queries/csharp.ts    | 2 +-
 .../ql-vscode/test/unit-tests/model-editor/bqrs.test.ts    | 4 ++--
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/extensions/ql-vscode/src/model-editor/bqrs.ts b/extensions/ql-vscode/src/model-editor/bqrs.ts
index 45200da64ac..7ec6edbfaeb 100644
--- a/extensions/ql-vscode/src/model-editor/bqrs.ts
+++ b/extensions/ql-vscode/src/model-editor/bqrs.ts
@@ -51,13 +51,6 @@ export function decodeBqrsToMethods(
       classification = CallClassification.Unknown;
     }
 
-    if (!methodParameters.startsWith("(")) {
-      // There's a difference in how the Java and C# queries return method parameters. In the C# query, the method
-      // parameters are returned without parentheses. In the Java query, the method parameters are returned with
-      // parentheses. Therefore, we'll just add them if we don't see them.
-      methodParameters = `(${methodParameters})`;
-    }
-
     const signature = `${packageName}.${typeName}#${methodName}${methodParameters}`;
 
     // For Java, we'll always get back a .jar file, and the library version may be bad because not all library authors
diff --git a/extensions/ql-vscode/src/model-editor/queries/csharp.ts b/extensions/ql-vscode/src/model-editor/queries/csharp.ts
index 448e75e97a1..8479d9fa66a 100644
--- a/extensions/ql-vscode/src/model-editor/queries/csharp.ts
+++ b/extensions/ql-vscode/src/model-editor/queries/csharp.ts
@@ -146,7 +146,7 @@ class Endpoint extends Callable {
    * Gets the parameter types of this endpoint.
    */
   bindingset[this]
-  string getParameterTypes() { result = parameterQualifiedTypeNamesToString(this) }
+  string getParameterTypes() { result = "(" + parameterQualifiedTypeNamesToString(this) + ")" }
 
   private string getDllName() { result = this.getLocation().(Assembly).getName() }
 
diff --git a/extensions/ql-vscode/test/unit-tests/model-editor/bqrs.test.ts b/extensions/ql-vscode/test/unit-tests/model-editor/bqrs.test.ts
index 8fade3e933b..86b8bfa276b 100644
--- a/extensions/ql-vscode/test/unit-tests/model-editor/bqrs.test.ts
+++ b/extensions/ql-vscode/test/unit-tests/model-editor/bqrs.test.ts
@@ -583,7 +583,7 @@ describe("decodeBqrsToMethods", () => {
             "System.Reflection",
             "RuntimeReflectionExtensions",
             "GetMethodInfo",
-            "System.Delegate",
+            "(System.Delegate)",
             true,
             "mscorlib",
             "4.0.0.0",
@@ -651,7 +651,7 @@ describe("decodeBqrsToMethods", () => {
             "Moq",
             "Times",
             "Validate",
-            "System.Int32",
+            "(System.Int32)",
             false,
             "Times.cs",
             "",