C#: Use {get,has}FullyQualifiedName throughout

Author: hvitved

csharp/ql/examples/snippets/catch_exception.ql

@@ -10,5 +10,5 @@
 import csharp
 
 from CatchClause catch
-where catch.getCaughtExceptionType().hasQualifiedName("System.IO", "IOException")
+where catch.getCaughtExceptionType().hasFullyQualifiedName("System.IO", "IOException")
 select catch

csharp/ql/examples/snippets/constructor_call.ql

@@ -10,5 +10,5 @@
 import csharp
 
 from ObjectCreation new
-where new.getObjectType().hasQualifiedName("System", "Exception")
+where new.getObjectType().hasFullyQualifiedName("System", "Exception")
 select new

csharp/ql/examples/snippets/extend_class.ql

@@ -13,5 +13,5 @@
 import csharp
 
 from RefType type
-where type.getABaseType+().hasQualifiedName("System.Collections", "IEnumerator")
+where type.getABaseType+().hasFullyQualifiedName("System.Collections", "IEnumerator")
 select type

csharp/ql/examples/snippets/field_read.ql

@@ -11,6 +11,6 @@ import csharp
 from Field f, FieldRead read
 where
   f.hasName("VirtualAddress") and
-  f.getDeclaringType().hasQualifiedName("Mono.Cecil.PE", "Section") and
+  f.getDeclaringType().hasFullyQualifiedName("Mono.Cecil.PE", "Section") and
   f = read.getTarget()
 select read

csharp/ql/examples/snippets/method_call.ql

@@ -12,5 +12,5 @@ from MethodCall call, Method method
 where
   call.getTarget() = method and
   method.hasName("MethodName") and
-  method.getDeclaringType().hasQualifiedName("Company", "Class")
+  method.getDeclaringType().hasFullyQualifiedName("Company", "Class")
 select call

csharp/ql/examples/snippets/null_argument.ql

@@ -17,6 +17,6 @@ where
   add.hasName("Add") and
   add.getDeclaringType()
       .getUnboundDeclaration()
-      .hasQualifiedName("System.Collections.Generic", "ICollection<>") and
+      .hasFullyQualifiedName("System.Collections.Generic", "ICollection`1") and
   call.getAnArgument() instanceof NullLiteral
 select call

csharp/ql/examples/snippets/override_method.ql

@@ -11,6 +11,6 @@ import csharp
 from Method override, Method base
 where
   base.hasName("ToString") and
-  base.getDeclaringType().hasQualifiedName("System", "Object") and
+  base.getDeclaringType().hasFullyQualifiedName("System", "Object") and
   base.getAnOverrider() = override
 select override

csharp/ql/examples/snippets/throw_exception.ql

@@ -9,5 +9,6 @@
 import csharp
 
 from ThrowStmt throw
-where throw.getThrownExceptionType().getBaseClass*().hasQualifiedName("System.IO", "IOException")
+where
+  throw.getThrownExceptionType().getBaseClass*().hasFullyQualifiedName("System.IO", "IOException")
 select throw

csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.ql

@@ -2,4 +2,4 @@ import csharp
 
 from Class c
 where c.fromSource()
-select c, c.getBaseClass().getQualifiedName()
+select c, c.getBaseClass().getFullyQualifiedName()

csharp/ql/lib/Linq/Helpers.qll

@@ -21,12 +21,14 @@ private int numStmts(ForeachStmt fes) {
 }
 
 /** Holds if the type's qualified name is "System.Linq.Enumerable" */
-predicate isEnumerableType(ValueOrRefType t) { t.hasQualifiedName("System.Linq", "Enumerable") }
+predicate isEnumerableType(ValueOrRefType t) {
+  t.hasFullyQualifiedName("System.Linq", "Enumerable")
+}
 
 /** Holds if the type's qualified name starts with "System.Collections.Generic.IEnumerable" */
 predicate isIEnumerableType(ValueOrRefType t) {
   exists(string type |
-    t.hasQualifiedName("System.Collections.Generic", type) and
+    t.hasFullyQualifiedName("System.Collections.Generic", type) and
     type.matches("IEnumerable%")
   )
 }
@@ -159,7 +161,7 @@ class AnyCall extends MethodCall {
     exists(Method m |
       m = this.getTarget().getUnboundDeclaration() and
       isEnumerableType(m.getDeclaringType()) and
-      m.hasName("Any<>")
+      m.hasName("Any`1")
     )
   }
 }
@@ -170,7 +172,7 @@ class CountCall extends MethodCall {
     exists(Method m |
       m = this.getTarget().getUnboundDeclaration() and
       isEnumerableType(m.getDeclaringType()) and
-      m.hasName("Count<>")
+      m.hasName("Count`1")
     )
   }
 }
@@ -186,7 +188,7 @@ class SelectCall extends ExtensionMethodCall {
     exists(Method m |
       m = this.getTarget().getUnboundDeclaration() and
       isEnumerableType(m.getDeclaringType()) and
-      m.hasName("Select<,>")
+      m.hasName("Select`2")
     )
   }
 

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

@@ -186,7 +186,7 @@ class PageDirective extends AspDirective {
    */
   ValueOrRefType getInheritedType() {
     exists(string qualifier, string type |
-      result.hasQualifiedName(qualifier, type) and
+      result.hasFullyQualifiedName(qualifier, type) and
       splitQualifiedName(this.getInheritedTypeQualifiedName(), qualifier, type)
     )
   }

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

@@ -486,7 +486,7 @@ class InvalidOverride extends MethodViolation {
 
   override string getMessage() {
     exists(string qualifier, string type |
-      base.getDeclaringType().hasQualifiedName(qualifier, type)
+      base.getDeclaringType().hasFullyQualifiedName(qualifier, type)
     |
       result =
         "Overridden method from " + getQualifiedName(qualifier, type) + " is not in a base type"

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

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

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

@@ -103,7 +103,7 @@ private string getTypeArgumentsNames(ConstructedGeneric cg) {
 
 /**
  * An unbound generic type. This is a generic type with type parameters
- * (for example `List<T>`) or elided type parameters (for example `List<>`).
+ * (for example `List<T>`) or elided type parameters (for example ``List`1``).
  *
  * Either an unbound generic `struct` (`UnboundGenericStruct`), an unbound generic `class`
  * (`UnboundGenericClass`), an unbound generic `interface` (`UnboundGenericInterface`), or

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.hasQualifiedName("System", "ValueType") and
-  not base.hasQualifiedName("System", "Delegate") and
-  not base.hasQualifiedName("System", "MulticastDelegate") and
-  not base.hasQualifiedName("System", "Enum") and
+  not base.hasFullyQualifiedName("System", "ValueType") and
+  not base.hasFullyQualifiedName("System", "Delegate") and
+  not base.hasFullyQualifiedName("System", "MulticastDelegate") and
+  not base.hasFullyQualifiedName("System", "Enum") and
   exists(TypeMention tm | tm.getTarget() = type and tm.getType() = base)
 }
 

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

@@ -75,7 +75,7 @@ class BlockStmt extends Stmt, @block_stmt {
 
   /** Holds if this block is the container of the global statements. */
   predicate isGlobalStatementContainer() {
-    this.getEnclosingCallable().hasQualifiedName("Program", "<Main>$")
+    this.getEnclosingCallable().hasFullyQualifiedName("Program", "<Main>$")
   }
 
   override Stmt stripSingletonBlocks() {

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

@@ -287,7 +287,7 @@ class ValueOrRefType extends DotNet::ValueOrRefType, Type, Attributable, @value_
 
   /** Gets the length of *some* path to the root of the hierarchy. */
   int getADepth() {
-    this.hasQualifiedName("System", "Object") and result = 0
+    this.hasFullyQualifiedName("System", "Object") and result = 0
     or
     result = this.getABaseType().getADepth() + 1 and
     //prevent recursion on cyclic inheritance (only for incorrect databases)
@@ -809,7 +809,7 @@ class AnonymousClass extends Class {
  * The `object` type, `System.Object`.
  */
 class ObjectType extends Class {
-  ObjectType() { this.hasQualifiedName("System", "Object") }
+  ObjectType() { this.hasFullyQualifiedName("System", "Object") }
 
   override string toStringWithTypes() { result = "object" }
 
@@ -820,7 +820,7 @@ class ObjectType extends Class {
  * The `string` type, `System.String`.
  */
 class StringType extends Class {
-  StringType() { this.hasQualifiedName("System", "String") }
+  StringType() { this.hasFullyQualifiedName("System", "String") }
 
   override string toStringWithTypes() { result = "string" }
 
@@ -994,7 +994,7 @@ class NullableType extends ValueType, ConstructedType, @nullable_type {
   }
 
   override UnboundGenericStruct getUnboundGeneric() {
-    result.hasQualifiedName("System", "Nullable<>")
+    result.hasFullyQualifiedName("System", "Nullable`1")
   }
 
   override string toStringWithTypes() {

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

@@ -45,22 +45,22 @@ private string genericCollectionNamespaceName() {
 private string genericCollectionTypeName() {
   result =
     [
-      "Dictionary<,>", "HashSet<>", "ICollection<>", "IDictionary<,>", "IList<>", "ISet<>",
-      "LinkedList<>", "List<>", "Queue<>", "SortedDictionary<,>", "SortedList<,>", "SortedSet<>",
-      "Stack<>", "SynchronizedCollection<>", "SynchronizedKeyedCollection<>",
-      "SynchronizedReadOnlyCollection<>"
+      "Dictionary`2", "HashSet`1", "ICollection`1", "IDictionary`2", "IList`1", "ISet`1",
+      "LinkedList`1", "List`1", "Queue`1", "SortedDictionary`2", "SortedList`2", "SortedSet`1",
+      "Stack`1", "SynchronizedCollection`1", "SynchronizedKeyedCollection`1",
+      "SynchronizedReadOnlyCollection`1"
     ]
 }
 
 /** A collection type. */
 class CollectionType extends RefType {
   CollectionType() {
     exists(RefType base | base = this.getABaseType*() |
-      base.hasQualifiedName(collectionNamespaceName(), collectionTypeName())
+      base.hasFullyQualifiedName(collectionNamespaceName(), collectionTypeName())
       or
       base.(ConstructedType)
           .getUnboundGeneric()
-          .hasQualifiedName(genericCollectionNamespaceName(), genericCollectionTypeName())
+          .hasFullyQualifiedName(genericCollectionNamespaceName(), genericCollectionTypeName())
     )
     or
     this instanceof ArrayType

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

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

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

@@ -8,7 +8,7 @@ class MainMethod extends Method {
     (
       this.hasName("Main")
       or
-      this.hasQualifiedName("Program", "<Main>$")
+      this.hasFullyQualifiedName("Program", "<Main>$")
     ) and
     this.isStatic() and
     (this.getReturnType() instanceof VoidType or this.getReturnType() instanceof IntType) and

csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll

@@ -780,7 +780,7 @@ module Expressions {
             nc.getOuterCompletion()
                 .(ThrowCompletion)
                 .getExceptionClass()
-                .hasQualifiedName("System", "InvalidOperationException")
+                .hasFullyQualifiedName("System", "InvalidOperationException")
           )
       )
     }

csharp/ql/lib/semmle/code/csharp/controlflow/internal/NonReturning.qll

@@ -51,7 +51,8 @@ private class ThrowingCall extends NonReturningCall {
       this =
         any(MethodCall mc |
           mc.getTarget()
-              .hasQualifiedName("System.Runtime.ExceptionServices", "ExceptionDispatchInfo", "Throw") and
+              .hasFullyQualifiedName("System.Runtime.ExceptionServices", "ExceptionDispatchInfo",
+                "Throw") and
           (
             mc.hasNoArguments() and
             c.getExceptionClass() instanceof SystemExceptionClass
@@ -85,8 +86,8 @@ private class DirectlyExitingCallable extends ExitingCallable {
   DirectlyExitingCallable() {
     this =
       any(Method m |
-        m.hasQualifiedName("System", "Environment", "Exit") or
-        m.hasQualifiedName("System.Windows.Forms", "Application", "Exit")
+        m.hasFullyQualifiedName("System", "Environment", "Exit") or
+        m.hasFullyQualifiedName("System.Windows.Forms", "Application", "Exit")
       )
   }
 }

csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImplSpecific.qll

@@ -174,19 +174,21 @@ SummaryComponent interpretComponentSpecific(AccessPathToken c) {
   or
   c = "WithElement" and result = SummaryComponent::withContent(any(ElementContent ec))
   or
+  // Qualified names may contain commas,such as in `Tuple<,>`, so get the entire argument list
+  // rather than an individual argument.
   exists(Field f |
-    c.getAnArgument("Field") = f.getFullyQualifiedName() and
+    c.getName() = "Field" and
+    c.getArgumentList() = f.getFullyQualifiedName() and
     result = SummaryComponent::content(any(FieldContent fc | fc.getField() = f))
   )
   or
   exists(Property p |
-
-    c.getAnArgument("Property") = p.getFullyQualifiedName() and
+    c.getName() = "Property" and
+    c.getArgumentList() = p.getFullyQualifiedName() and
     result = SummaryComponent::content(any(PropertyContent pc | pc.getProperty() = p))
   )
   or
   exists(SyntheticField f |
-
     c.getAnArgument("SyntheticField") = f and
     result = SummaryComponent::content(any(SyntheticFieldContent sfc | sfc.getField() = f))
   )
@@ -198,7 +200,9 @@ private string getContentSpecific(Content c) {
   or
   exists(Field f | c = TFieldContent(f) and result = "Field[" + f.getFullyQualifiedName() + "]")
   or
-  exists(Property p | c = TPropertyContent(p) and result = "Property[" + p.getFullyQualifiedName() + "]")
+  exists(Property p |
+    c = TPropertyContent(p) and result = "Property[" + p.getFullyQualifiedName() + "]"
+  )
   or
   exists(SyntheticField f | c = TSyntheticFieldContent(f) and result = "SyntheticField[" + f + "]")
 }

csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll

@@ -152,7 +152,7 @@ private module Impl {
    */
   predicate propertyOverrides(Property p, string namespace, string baseClass, string property) {
     exists(Property p2 |
-      p2.getUnboundDeclaration().getDeclaringType().hasQualifiedName(namespace, baseClass) and
+      p2.getUnboundDeclaration().getDeclaringType().hasFullyQualifiedName(namespace, baseClass) and
       p2.hasName(property)
     |
       p.overridesOrImplementsOrEquals(p2)

csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll

@@ -83,7 +83,7 @@ private module Impl {
    */
   predicate containerSizeAccess(ExprNode e) {
     exists(Property p | p = e.getExpr().(PropertyAccess).getTarget() |
-      propertyOverrides(p, "System.Collections.Generic", "IEnumerable<>", "Count") or
+      propertyOverrides(p, "System.Collections.Generic", "IEnumerable`1", "Count") or
       propertyOverrides(p, "System.Collections", "ICollection", "Count") or
       propertyOverrides(p, "System", "String", "Length") or
       propertyOverrides(p, "System", "Array", "Length")