C#: Deprecate the getFullyQualifiedName predicate.

Author: michaelnebel

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

@@ -1,5 +1,6 @@
 import csharp
+import semmle.code.csharp.commons.QualifiedName
 
-from Class c
-where c.fromSource()
-select c, c.getBaseClass().getFullyQualifiedName()
+from Class c, string qualifier, string name
+where c.fromSource() and c.getBaseClass().hasFullyQualifiedName(qualifier, name)
+select c, getQualifiedName(qualifier, name)

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

@@ -102,6 +102,8 @@ class NamedElement extends Element, @named_element {
   final predicate hasName(string name) { name = this.getName() }
 
   /**
+   * DEPRECATED: Use `hasFullyQualifiedName` instead.
+   *
    * Gets the fully qualified name of this element, for example the
    * fully qualified name of `M` on line 3 is `N.C.M` in
    *
@@ -117,7 +119,7 @@ class NamedElement extends Element, @named_element {
    * ``System.Collections.Generic.IList`1``.
    */
   cached
-  final string getFullyQualifiedName() {
+  deprecated final string getFullyQualifiedName() {
     exists(string qualifier, string name | this.hasFullyQualifiedName(qualifier, name) |
       if qualifier = "" then result = name else result = qualifier + "." + name
     )

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

@@ -88,11 +88,12 @@ class Declaration extends NamedElement, @declaration {
    * ```
    */
   string getFullyQualifiedNameWithTypes() {
-    exists(string qual |
-      qual = this.getDeclaringType().getFullyQualifiedName() and
+    exists(string fullqual, string qual, string name |
+      this.getDeclaringType().hasFullyQualifiedName(qual, name) and
+      fullqual = getQualifiedName(qual, name) and
       if this instanceof NestedType
-      then result = qual + "+" + this.toStringWithTypes()
-      else result = qual + "." + this.toStringWithTypes()
+      then result = fullqual + "+" + this.toStringWithTypes()
+      else result = fullqual + "." + this.toStringWithTypes()
     )
   }
 

csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll

@@ -3,6 +3,7 @@
  */
 
 import csharp
+private import semmle.code.csharp.commons.QualifiedName
 
 /**
  * Provides classes for working with static single assignment (SSA) form.
@@ -120,7 +121,12 @@ module Ssa {
           result = prefix + "." + this.getAssignable()
         |
           if f.(Modifiable).isStatic()
-          then prefix = f.getDeclaringType().getFullyQualifiedName()
+          then
+            exists(string qualifier, string name |
+              f.getDeclaringType().hasFullyQualifiedName(qualifier, name)
+            |
+              prefix = getQualifiedName(qualifier, name)
+            )
           else prefix = "this"
         )
       }

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

@@ -3,6 +3,7 @@
  */
 
 private import csharp
+private import semmle.code.csharp.commons.QualifiedName
 private import semmle.code.csharp.frameworks.system.linq.Expressions
 private import codeql.dataflow.internal.FlowSummaryImpl
 private import codeql.dataflow.internal.AccessPathSyntax as AccessPath
@@ -42,10 +43,18 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CsharpDataFlow>
   string encodeContent(ContentSet c, string arg) {
     c = TElementContent() and result = "Element" and arg = ""
     or
-    exists(Field f | c = TFieldContent(f) and result = "Field" and arg = f.getFullyQualifiedName())
+    exists(Field f, string qualifier, string name |
+      c = TFieldContent(f) and
+      f.hasFullyQualifiedName(qualifier, name) and
+      arg = getQualifiedName(qualifier, name) and
+      result = "Field"
+    )
     or
-    exists(Property p |
-      c = TPropertyContent(p) and result = "Property" and arg = p.getFullyQualifiedName()
+    exists(Property p, string qualifier, string name |
+      c = TPropertyContent(p) and
+      p.hasFullyQualifiedName(qualifier, name) and
+      arg = getQualifiedName(qualifier, name) and
+      result = "Property"
     )
     or
     exists(SyntheticField f |

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

@@ -139,13 +139,13 @@ class ExternalApiUsedWithUntrustedData extends TExternalApi {
 
   /** Gets a textual representation of this element. */
   string toString() {
-    exists(Callable m, int index, string indexString |
+    exists(Callable m, int index, string indexString, string qualifier, string name |
       if index = -1 then indexString = "qualifier" else indexString = "param " + index
     |
       this = TExternalApiParameter(m, index) and
+      m.getDeclaringType().hasFullyQualifiedName(qualifier, name) and
       result =
-        m.getDeclaringType().getFullyQualifiedName() + "." + m.toStringWithTypes() + " [" +
-          indexString + "]"
+        getQualifiedName(qualifier, name) + "." + m.toStringWithTypes() + " [" + indexString + "]"
     )
   }
 }

csharp/ql/test/library-tests/constructors/Destructors1.ql

@@ -10,4 +10,4 @@ where
   c.getDeclaringType().hasFullyQualifiedName(qualifier, name) and
   qualifier = "Constructors" and
   name = "Class"
-select c, c.getDeclaringType().getFullyQualifiedName()
+select c, getQualifiedName(qualifier, name)