C#: Address review comments.

Author: michaelnebel

csharp/ql/lib/semmle/code/cil/ConsistencyChecks.qll

@@ -489,7 +489,7 @@ class InvalidOverride extends MethodViolation {
       base.getDeclaringType().hasQualifiedName(namespace, type)
     |
       result =
-        "Overridden method from " + printQualifiedName(namespace, type) + " is not in a base type"
+        "Overridden method from " + getQualifiedName(namespace, type) + " is not in a base type"
     )
   }
 }

csharp/ql/lib/semmle/code/cil/Type.qll

@@ -54,7 +54,7 @@ class Type extends DotNet::Type, Declaration, TypeContainer, @cil_type {
   override predicate hasQualifiedName(string namespace, string name) {
     name = this.getName() and
     exists(string pnamespace, string pname | this.getParent().hasQualifiedName(pnamespace, pname) |
-      namespace = printQualifiedName(pnamespace, pname)
+      namespace = getQualifiedName(pnamespace, pname)
     )
   }
 

csharp/ql/lib/semmle/code/csharp/Callable.qll

@@ -1004,7 +1004,7 @@ class LocalFunction extends Callable, Modifiable, Attributable, @local_function
   override predicate hasQualifiedName(string namespace, string name) {
     exists(string cnamespace, string type |
       this.getEnclosingCallable().hasQualifiedName(cnamespace, type) and
-      namespace = printQualifiedName(cnamespace, type)
+      namespace = getQualifiedName(cnamespace, type)
     ) and
     name = this.getName()
   }

csharp/ql/lib/semmle/code/csharp/Generics.qll

@@ -102,7 +102,7 @@ bindingset[t]
 private string getFullName(Type t) {
   exists(string namespace, string name |
     t.hasQualifiedName(namespace, name) and
-    result = printQualifiedName(namespace, name)
+    result = getQualifiedName(namespace, name)
   )
 }
 

csharp/ql/lib/semmle/code/csharp/commons/QualifiedName.qll

@@ -1,34 +1,34 @@
 /**
- * Provides predicates related to C# qualified name.
+ * Provides predicates related to C# qualified names.
  */
 
 /**
- * Returns the concatenation of `qualifier` and `name`, separated by a dot.
+ * Returns the concatenation of `namespace` and `name`, separated by a dot.
  */
 bindingset[namespace, name]
-string printQualifiedName(string namespace, string name) {
+string getQualifiedName(string namespace, string name) {
   if namespace = "" then result = name else result = namespace + "." + name
 }
 
 /**
- * Returns the concatenation of `qualifier`, `type` and `name`, separated by a dot.
+ * Returns the concatenation of `namespace`, `type` and `name`, separated by a dot.
  */
 bindingset[namespace, type, name]
-string printQualifiedName(string namespace, string type, string name) {
-  result = printQualifiedName(namespace, type) + "." + name
+string getQualifiedName(string namespace, string type, string name) {
+  result = getQualifiedName(namespace, type) + "." + name
 }
 
-private string getNameSplitter() { result = "(.*)\\.([^\\.]+)$" }
-
 /**
+ * Holds if `qualifiedName` is the concatenation of `qualifier` and `name`, separated by a dot.
  */
 bindingset[qualifiedName]
 predicate splitQualifiedName(string qualifiedName, string qualifier, string name) {
-  if qualifiedName.regexpMatch(getNameSplitter())
-  then
-    qualifier = qualifiedName.regexpCapture(getNameSplitter(), 1) and
-    name = qualifiedName.regexpCapture(getNameSplitter(), 2)
-  else (
-    qualifier = "" and name = qualifiedName
+  exists(string nameSplitter | nameSplitter = "(.*)\\.([^\\.]+)$" |
+    qualifier = qualifiedName.regexpCapture(nameSplitter, 1) and
+    name = qualifiedName.regexpCapture(nameSplitter, 2)
+    or
+    not qualifiedName.regexpMatch(nameSplitter) and
+    qualifier = "" and
+    name = qualifiedName
   )
 }

csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll

@@ -83,7 +83,7 @@ class ExternalApiDataNode extends DataFlow::Node {
    */
   deprecated string getCallableDescription() {
     exists(string namespace, string name |
-      this.hasQualifiedName(namespace, name) and result = printQualifiedName(namespace, name)
+      this.hasQualifiedName(namespace, name) and result = getQualifiedName(namespace, name)
     )
   }
 }

csharp/ql/lib/semmle/code/dotnet/Declaration.qll

@@ -11,7 +11,7 @@ class Declaration extends NamedElement, @dotnet_declaration {
   override predicate hasQualifiedName(string namespace, string name) {
     exists(string dnamespace, string dname |
       this.getDeclaringType().hasQualifiedName(dnamespace, dname) and
-      namespace = printQualifiedName(dnamespace, dname)
+      namespace = getQualifiedName(dnamespace, dname)
     ) and
     name = this.getName()
   }

csharp/ql/lib/semmle/code/dotnet/Namespace.qll

@@ -28,7 +28,7 @@ class Namespace extends Declaration, @namespace {
   override predicate hasQualifiedName(string namespace, string name) {
     exists(string pnamespace, string pname |
       this.getParentNamespace().hasQualifiedName(pnamespace, pname) and
-      namespace = printQualifiedName(pnamespace, pname)
+      namespace = getQualifiedName(pnamespace, pname)
     ) and
     name = this.getName()
   }
@@ -52,7 +52,7 @@ class Namespace extends Declaration, @namespace {
   string getFullName() {
     exists(string namespace, string name |
       this.hasQualifiedName(namespace, name) and
-      result = printQualifiedName(namespace, name)
+      result = getQualifiedName(namespace, name)
     )
   }
 }

csharp/ql/src/API Abuse/NonOverridingMethod.ql

@@ -43,4 +43,4 @@ where
   nonOverridingMethod(m, vm) and
   vm.hasQualifiedName(namespace, type, name)
 select m, "Method '" + m.getName() + "' looks like it should override $@ but does not do so.",
-  vm.getUnboundDeclaration(), printQualifiedName(namespace, type, name)
+  vm.getUnboundDeclaration(), getQualifiedName(namespace, type, name)

csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql

@@ -21,5 +21,5 @@ where
   config.hasFlowPath(source, sink) and
   sink.getNode().(ExternalApiDataNode).hasQualifiedName(namespace, name)
 select sink, source, sink,
-  "Call to " + printQualifiedName(namespace, name) + " with untrusted data from $@.", source,
+  "Call to " + getQualifiedName(namespace, name) + " with untrusted data from $@.", source,
   source.toString()