Merge pull request #14589 from hvitved/csharp/fqn-backticks

C#: Use `C'X` fully-qualified-name format instead of `C<,...,>`

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.expected

@@ -1,35 +1,35 @@
-| test.cs:1:14:1:20 | GenA<> | System.Object |
-| test.cs:1:14:1:20 | GenA<GenB<GenB<>>> | System.Object |
 | test.cs:1:14:1:20 | GenA<GenB<GenB<String>>> | System.Object |
-| test.cs:2:14:2:20 | GenB<> | System.Object |
-| test.cs:2:14:2:20 | GenB<GenB<>> | System.Object |
+| test.cs:1:14:1:20 | GenA<GenB<GenB`1>> | System.Object |
+| test.cs:1:14:1:20 | GenA`1 | System.Object |
 | test.cs:2:14:2:20 | GenB<GenB<String>> | System.Object |
+| test.cs:2:14:2:20 | GenB<GenB`1> | System.Object |
 | test.cs:2:14:2:20 | GenB<String> | System.Object |
-| test.cs:4:7:4:10 | P<> | System.Object |
-| test.cs:4:7:4:10 | P<C<,>> | System.Object |
+| test.cs:2:14:2:20 | GenB`1 | System.Object |
 | test.cs:4:7:4:10 | P<C<Int32,String>> | System.Object |
 | test.cs:4:7:4:10 | P<C<String,Int32>> | System.Object |
 | test.cs:4:7:4:10 | P<C<V,U>> | System.Object |
 | test.cs:4:7:4:10 | P<C<W,X>> | System.Object |
 | test.cs:4:7:4:10 | P<C<X,W>> | System.Object |
-| test.cs:4:7:4:10 | P<D<,>> | System.Object |
+| test.cs:4:7:4:10 | P<C`2> | System.Object |
 | test.cs:4:7:4:10 | P<D<Int32,String>> | System.Object |
 | test.cs:4:7:4:10 | P<D<String,Int32>> | System.Object |
 | test.cs:4:7:4:10 | P<D<U,V>> | System.Object |
 | test.cs:4:7:4:10 | P<D<V,U>> | System.Object |
 | test.cs:4:7:4:10 | P<D<X,W>> | System.Object |
-| test.cs:5:7:5:13 | C<,> | P<D<V,U>> |
+| test.cs:4:7:4:10 | P<D`2> | System.Object |
+| test.cs:4:7:4:10 | P`1 | System.Object |
 | test.cs:5:7:5:13 | C<Int32,String> | P<D<System.String,System.Int32>> |
 | test.cs:5:7:5:13 | C<String,Int32> | P<D<System.Int32,System.String>> |
 | test.cs:5:7:5:13 | C<V,U> | P<D<U,V>> |
 | test.cs:5:7:5:13 | C<W,X> | P<D<X,W>> |
-| test.cs:5:7:5:13 | C<X,W> | P<D<,>> |
-| test.cs:6:7:6:13 | D<,> | P<C<W,X>> |
+| test.cs:5:7:5:13 | C<X,W> | P<D`2> |
+| test.cs:5:7:5:13 | C`2 | P<D<V,U>> |
 | test.cs:6:7:6:13 | D<Int32,String> | P<C<System.Int32,System.String>> |
 | test.cs:6:7:6:13 | D<String,Int32> | P<C<System.String,System.Int32>> |
-| test.cs:6:7:6:13 | D<U,V> | P<C<,>> |
+| test.cs:6:7:6:13 | D<U,V> | P<C`2> |
 | test.cs:6:7:6:13 | D<V,U> | P<C<V,U>> |
 | test.cs:6:7:6:13 | D<X,W> | P<C<X,W>> |
-| test.cs:8:7:8:10 | A<> | System.Object |
+| test.cs:6:7:6:13 | D`2 | P<C<W,X>> |
 | test.cs:8:7:8:10 | A<String> | System.Object |
+| test.cs:8:7:8:10 | A`1 | System.Object |
 | test.cs:13:14:13:18 | Class | System.Object |

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()