From 874da9d81c0b30018d93308faf9eea6417f45e60 Mon Sep 17 00:00:00 2001
From: Esben Sparre Andreasen <esbena@github.com>
Date: Fri, 1 Apr 2022 09:31:49 +0200
Subject: [PATCH] fix semantic merge conflict

---
 .../EndpointFeatures.qll                      | 56 +++++++++----------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointFeatures.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointFeatures.qll
index 35d0b96ee21..55555975c8a 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointFeatures.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointFeatures.qll
@@ -275,9 +275,12 @@ class CalleeName extends EndpointFeature, TCalleeName {
   override string getName() { result = "calleeName" }
 
   override string getValue(DataFlow::Node endpoint) {
-    exists(DataFlow::CallNode call | endpoint = call.getAnArgument() |
-      result = strictconcat(string component | component = call.getCalleeName() | component, " ")
-    )
+    result =
+      strictconcat(DataFlow::CallNode call, string component |
+        endpoint = call.getAnArgument() and component = call.getCalleeName()
+      |
+        component, " "
+      )
   }
 }
 
@@ -288,14 +291,13 @@ class ReceiverName extends EndpointFeature, TReceiverName {
   override string getName() { result = "receiverName" }
 
   override string getValue(DataFlow::Node endpoint) {
-    exists(DataFlow::CallNode call | endpoint = call.getAnArgument() |
-      result =
-        strictconcat(string component |
-          component = call.getReceiver().asExpr().(VarRef).getName()
-        |
-          component, " "
-        )
-    )
+    result =
+      strictconcat(DataFlow::CallNode call, string component |
+        endpoint = call.getAnArgument() and
+        component = call.getReceiver().asExpr().(VarRef).getName()
+      |
+        component, " "
+      )
   }
 }
 
@@ -306,14 +308,13 @@ class ArgumentIndex extends EndpointFeature, TArgumentIndex {
   override string getName() { result = "argumentIndex" }
 
   override string getValue(DataFlow::Node endpoint) {
-    exists(DataFlow::CallNode call | endpoint = call.getAnArgument() |
-      result =
-        strictconcat(string component |
-          component = any(int argIndex | call.getArgument(argIndex) = endpoint).toString()
-        |
-          component, " "
-        )
-    )
+    result =
+      strictconcat(DataFlow::CallNode call, string component |
+        endpoint = call.getAnArgument() and
+        component = any(int argIndex | call.getArgument(argIndex) = endpoint).toString()
+      |
+        component, " "
+      )
   }
 }
 
@@ -331,16 +332,13 @@ class CalleeApiName extends EndpointFeature, TCalleeApiName {
   override string getName() { result = "calleeApiName" }
 
   override string getValue(DataFlow::Node endpoint) {
-    exists(API::Node apiNode |
-      endpoint = apiNode.getInducingNode().(DataFlow::CallNode).getAnArgument()
-    |
-      result =
-        strictconcat(string component |
-          AccessPaths::accessPaths(apiNode, false, _, component)
-        |
-          component, " "
-        )
-    )
+    result =
+      strictconcat(API::Node apiNode, string component |
+        endpoint = apiNode.getInducingNode().(DataFlow::CallNode).getAnArgument() and
+        AccessPaths::accessPaths(apiNode, false, _, component)
+      |
+        component, " "
+      )
   }
 }