C#: Use hasQualifiedName instead of getQualifiedName.

Author: michaelnebel

csharp/ql/lib/Linq/Helpers.qll

@@ -23,7 +23,10 @@ predicate isEnumerableType(ValueOrRefType t) { t.hasQualifiedName("System.Linq",
 
 /** Holds if the type's qualified name starts with "System.Collections.Generic.IEnumerable" */
 predicate isIEnumerableType(ValueOrRefType t) {
-  t.getQualifiedName().matches("System.Collections.Generic.IEnumerable%")
+  exists(string type |
+    t.hasQualifiedName("System.Collections.Generic", type) and
+    type.matches("IEnumerable%")
+  )
 }
 
 /**

csharp/ql/lib/semmle/code/asp/AspNet.qll

@@ -40,7 +40,7 @@ class AspAttribute extends AspElement, @asp_attribute { }
  */
 class AspOpenTag extends AspElement, @asp_open_tag {
   /** Either `>` or `/>`, depending on whether it's an empty tag. */
-  private string closeAngle() { if isEmpty() then result = "/>" else result = ">" }
+  private string closeAngle() { if this.isEmpty() then result = "/>" else result = ">" }
 
   /** Gets the `i`th attribute of this open tag. */
   AspAttribute getAttribute(int i) { asp_tag_attribute(this, i, _, result) }
@@ -58,9 +58,9 @@ class AspOpenTag extends AspElement, @asp_open_tag {
   predicate isEmpty() { asp_tag_isempty(this) }
 
   override string toString() {
-    if hasAttribute()
-    then result = "<" + getName() + " ..." + closeAngle()
-    else result = "<" + getName() + closeAngle()
+    if this.hasAttribute()
+    then result = "<" + this.getName() + " ..." + this.closeAngle()
+    else result = "<" + this.getName() + this.closeAngle()
   }
 }
 
@@ -75,9 +75,9 @@ class AspOpenTag extends AspElement, @asp_open_tag {
  */
 class AspCloseTag extends AspElement, @asp_close_tag {
   /** Gets the name of this close tag. */
-  string getName() { result = getBody() }
+  string getName() { result = this.getBody() }
 
-  override string toString() { result = "</" + getName() + ">" }
+  override string toString() { result = "</" + this.getName() + ">" }
 }
 
 /**
@@ -146,44 +146,49 @@ class AspDirective extends AspElement, @asp_directive {
   string getName() { asp_directive_name(this, result) }
 
   /** Holds if this directive has an attribute. */
-  predicate hasAttribute() { exists(getAttribute(_)) }
+  predicate hasAttribute() { exists(this.getAttribute(_)) }
 
   override string toString() {
-    if hasAttribute()
-    then result = "<%@" + getName() + " ...%>"
-    else result = "<%@" + getName() + "%>"
+    if this.hasAttribute()
+    then result = "<%@" + this.getName() + " ...%>"
+    else result = "<%@" + this.getName() + "%>"
   }
 }
 
 /** A quoted string used as an attribute in a tag. */
 class AspQuotedString extends AspAttribute, @asp_quoted_string {
   override string toString() {
-    if exists(getBody().indexOf("\""))
-    then result = "'" + getBody() + "'"
-    else result = "\"" + getBody() + "\""
+    if exists(this.getBody().indexOf("\""))
+    then result = "'" + this.getBody() + "'"
+    else result = "\"" + this.getBody() + "\""
   }
 }
 
 /** Arbitrary text. It will be inserted into the document as is. */
 class AspText extends AspElement, @asp_text {
-  override string toString() { result = getBody() }
+  override string toString() { result = this.getBody() }
 }
 
 /** An XML directive, such as a `DOCTYPE` declaration. */
 class AspXmlDirective extends AspElement, @asp_xml_directive {
-  override string toString() { result = getBody() }
+  override string toString() { result = this.getBody() }
 }
 
 /**
  * A 'Page' ASP directive.
  */
 class PageDirective extends AspDirective {
-  PageDirective() { getName() = "Page" }
+  PageDirective() { this.getName() = "Page" }
 
   /**
    * Gets the 'CodeBehind' class from which this page inherits.
    */
-  ValueOrRefType getInheritedType() { result.getQualifiedName() = getInheritedTypeQualifiedName() }
+  ValueOrRefType getInheritedType() {
+    exists(string qualifier, string name |
+      result.hasQualifiedName(qualifier, name) and
+      printQualifiedName(qualifier, name) = this.getInheritedTypeQualifiedName()
+    )
+  }
 
   private string getInheritedTypeQualifiedName() {
     // Relevant attributes:
@@ -192,11 +197,11 @@ class PageDirective extends AspDirective {
     //   provide a fallback namespace if `Inherits` does not have one
     // - `CodeBehindFile`/`CodeFile`: used by tooling, but not semantically
     //   relevant at runtime
-    exists(string inherits | inherits = getAttributeByName("Inherits").getBody() |
+    exists(string inherits | inherits = this.getAttributeByName("Inherits").getBody() |
       if inherits.indexOf(".") != -1
       then result = inherits
       else
-        exists(string className | className = getAttributeByName("ClassName").getBody() |
+        exists(string className | className = this.getAttributeByName("ClassName").getBody() |
           // take everything up to and including the last .
           className.prefix(className.indexOf(".", count(className.indexOf(".")) - 1, 0) + 1) +
             inherits = result

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

@@ -484,9 +484,13 @@ class InvalidOverride extends MethodViolation {
   }
 
   override string getMessage() {
-    result =
-      "Overridden method from " + base.getDeclaringType().getQualifiedName() +
-        " is not in a base type"
+    exists(string qualifier, string name |
+      base.getDeclaringType().hasQualifiedName(qualifier, name)
+    |
+      result =
+        "Overridden method from " + CS::printQualifiedName(qualifier, name) +
+          " is not in a base type"
+    )
   }
 }
 

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

@@ -146,7 +146,7 @@ class Method extends DotNet::Callable, Element, Member, TypeContainer, DataFlowN
 
   /** Holds if this method is a destructor/finalizer. */
   predicate isFinalizer() {
-    this.getOverriddenMethod*().getQualifiedName() = "System.Object.Finalize"
+    this.getOverriddenMethod*().hasQualifiedName("System", "Object", "Finalize")
   }
 
   /** Holds if this method is an operator. */
@@ -258,7 +258,7 @@ class Setter extends Accessor {
 
   /** Holds if this setter is an `init` accessor. */
   predicate isInitOnly() {
-    exists(Type t | t.getQualifiedName() = "System.Runtime.CompilerServices.IsExternalInit" |
+    exists(Type t | t.hasQualifiedName("System.Runtime.CompilerServices", "IsExternalInit") |
       this.hasRequiredCustomModifier(t)
     )
   }

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

@@ -20,7 +20,7 @@ class TypeContainer extends DotNet::NamedElement, @cil_type_container {
 
 /** A namespace. */
 class Namespace extends DotNet::Namespace, TypeContainer, @namespace {
-  override string toString() { result = this.getQualifiedName() }
+  override string toString() { result = this.getFullName() }
 
   override Namespace getParent() { result = this.getParentNamespace() }
 
@@ -68,8 +68,7 @@ class Type extends DotNet::Type, Declaration, TypeContainer, @cil_type {
 
   /**
    * Holds if this type is a member of the `System` namespace and has the name
-   * `name`. This is the same as `getQualifiedName() = "System.<name>"`, but is
-   * faster to compute.
+   * `name`.
    */
   predicate isSystemType(string name) {
     exists(Namespace system | this.getParent() = system |

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

@@ -97,11 +97,18 @@ private string getTypeArgumentsNames(ConstructedGeneric cg) {
   result = strictconcat(Type t, int i | t = cg.getTypeArgument(i) | t.getName(), "," order by i)
 }
 
-/** Gets the concatenation of the `getQualifiedName()` of type arguments. */
+bindingset[t]
+private string getFullName(Type t) {
+  exists(string qualifier, string name |
+    t.hasQualifiedName(qualifier, name) and
+    result = printQualifiedName(qualifier, name)
+  )
+}
+
+/** Gets the concatenation of the `getFullName` of type arguments. */
 language[monotonicAggregates]
 private string getTypeArgumentsQualifiedNames(ConstructedGeneric cg) {
-  result =
-    strictconcat(Type t, int i | t = cg.getTypeArgument(i) | t.getQualifiedName(), "," order by i)
+  result = strictconcat(Type t, int i | t = cg.getTypeArgument(i) | getFullName(t), "," order by i)
 }
 
 /**

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

@@ -107,10 +107,10 @@ private ValueOrRefType getAnInterestingBaseType(ValueOrRefType type) {
 
 private predicate isInterestingBaseType(ValueOrRefType type, ValueOrRefType base) {
   not base instanceof ObjectType and
-  not base.getQualifiedName() = "System.ValueType" and
-  not base.getQualifiedName() = "System.Delegate" and
-  not base.getQualifiedName() = "System.MulticastDelegate" and
-  not base.getQualifiedName() = "System.Enum" and
+  not base.hasQualifiedName("System", "ValueType") and
+  not base.hasQualifiedName("System", "Delegate") and
+  not base.hasQualifiedName("System", "MulticastDelegate") and
+  not base.hasQualifiedName("System", "Enum") and
   exists(TypeMention tm | tm.getTarget() = type and tm.getType() = base)
 }
 

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

@@ -69,7 +69,7 @@ class ValueOrRefType extends DotNet::ValueOrRefType, Type, Attributable, @value_
     )
     or
     not exists(this.getDeclaringType()) and
-    qualifier = this.getNamespace().getQualifiedName() and
+    qualifier = this.getNamespace().getFullName() and
     name = this.getUndecoratedName()
   }
 

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

@@ -39,7 +39,7 @@ class GeneratedAttributeFile extends GeneratedCodeFile {
 class GeneratedNamespaceFile extends GeneratedCodeFile {
   GeneratedNamespaceFile() {
     exists(Namespace n | n.getATypeDeclaration().getFile() = this |
-      n.getQualifiedName() = "Microsoft.Xml.Serialization.GeneratedAssembly"
+      n.getFullName() = "Microsoft.Xml.Serialization.GeneratedAssembly"
     )
   }
 }

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

@@ -14,7 +14,7 @@ class TargetFrameworkAttribute extends Attribute {
   Assembly assembly;
 
   TargetFrameworkAttribute() {
-    this.getType().getQualifiedName() = "System.Runtime.Versioning.TargetFrameworkAttribute" and
+    this.getType().hasQualifiedName("System.Runtime.Versioning", "TargetFrameworkAttribute") and
     assembly = this.getTarget()
   }