Swift: More robust Type.getName().

Author: geoffw0

swift/ql/lib/codeql/swift/elements/type/Type.qll

@@ -12,13 +12,10 @@ class Type extends Generated::Type {
    * Gets the name of this type.
    */
   override string getName() {
-    // note that `Generated::Type.getName()` gets the full name of the type, so
-    // we have to compute a short name.
-    exists(string name, int lastDotPos |
-      name = super.getName() and
-      lastDotPos = max([-1, name.indexOf(".")]) and
-      result = name.suffix(lastDotPos + 1)
-    )
+    // replace anything that looks like a full name `a.b.c` with just the
+    // short name `c`, by removing the `a.` and `b.` parts. Note that this
+    // has to be robust for tuple type names such as `(a, b.c)`.
+    result = super.getName().regexpReplaceAll("[^(), ]*\\.", "")
   }
 
   /**

swift/ql/test/extractor-tests/generated/type/TupleType/TupleType.expected

@@ -1,5 +1,5 @@
-| (Builtin.IntLiteral, Builtin.IntLiteral) | getName: | IntLiteral) | getCanonicalType: | (Builtin.IntLiteral, Builtin.IntLiteral) | getNumberOfTypes: | 2 |
-| (Builtin.IntLiteral, Builtin.IntLiteral) | getName: | IntLiteral) | getCanonicalType: | (Builtin.IntLiteral, Builtin.IntLiteral) | getNumberOfTypes: | 2 |
+| (Builtin.IntLiteral, Builtin.IntLiteral) | getName: | (IntLiteral, IntLiteral) | getCanonicalType: | (Builtin.IntLiteral, Builtin.IntLiteral) | getNumberOfTypes: | 2 |
+| (Builtin.IntLiteral, Builtin.IntLiteral) | getName: | (IntLiteral, IntLiteral) | getCanonicalType: | (Builtin.IntLiteral, Builtin.IntLiteral) | getNumberOfTypes: | 2 |
 | (Int, Int, Int, Int, Int) | getName: | (Int, Int, Int, Int, Int) | getCanonicalType: | (Int, Int, Int, Int, Int) | getNumberOfTypes: | 5 |
 | (Int, String, Double) | getName: | (Int, String, Double) | getCanonicalType: | (Int, String, Double) | getNumberOfTypes: | 3 |
 | (Int, s: String, Double) | getName: | (Int, s: String, Double) | getCanonicalType: | (Int, s: String, Double) | getNumberOfTypes: | 3 |