Merge pull request github#11144 from michaelnebel/csharp/qualifiedname

C#: Deprecate hasQualifiedName/1 and prepare for deprecating getQualifiedName/0.

Author: michaelnebel

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().hasQualifiedName("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().hasQualifiedName("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+().hasQualifiedName("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().hasQualifiedName("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().hasQualifiedName("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
+      .hasQualifiedName("System.Collections.Generic", "ICollection<>") 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().hasQualifiedName("System", "Object") and
   base.getAnOverrider() = override
 select override

csharp/ql/examples/snippets/throw_exception.ql

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

csharp/ql/lib/Linq/Helpers.qll

@@ -19,11 +19,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.hasQualifiedName("System.Linq", "Enumerable") }
 
 /** 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/change-notes/2022-11-14-deprecatehasqualifiedname.md

@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* `Element::hasQualifiedName/1` has been deprecated. Use `hasQualifiedName/2` or `hasQualifiedName/3` instead.