Swift: fix tests

Author: redsun82

swift/codegen/schema.yml

@@ -541,7 +541,6 @@ UnresolvedDotExpr:
   _children:
     base: Expr
   name: string
-  _tags: [ no_qltest ]  # we should really never extract these
 
 UnresolvedMemberExpr:
   _extends: Expr

swift/extractor/visitors/ExprVisitor.h

@@ -271,13 +271,10 @@ class ExprVisitor : public AstVisitorBase<ExprVisitor> {
     emitImplicitConversionExpr(expr, label);
   }
 
-  void visitTypeExpr(swift::TypeExpr* expr) {
-    auto label = dispatcher_.assignNewLabel(expr);
-    dispatcher_.emit(TypeExprsTrap{label});
-    if (auto repr = expr->getTypeRepr()) {
-      auto typeLabel = dispatcher_.fetchLabel(repr);
-      dispatcher_.emit(TypeExprTypeReprsTrap{label, typeLabel});
-    }
+  codeql::TypeExpr translateTypeExpr(const swift::TypeExpr& expr) {
+    TypeExpr entry{dispatcher_.assignNewLabel(expr)};
+    entry.type_repr = dispatcher_.fetchOptionalLabel(expr.getTypeRepr());
+    return entry;
   }
 
   codeql::ParenExpr translateParenExpr(const swift::ParenExpr& expr) {

swift/ql/lib/codeql/swift/elements/expr/TypeExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.TypeExpr
 
 class TypeExpr extends TypeExprBase {
-  override string toString() { result = this.getType().toString() }
+  override string toString() { result = this.getTypeRepr().toString() }
 }

swift/ql/lib/codeql/swift/elements/expr/UnresolvedDotExpr.qll

@@ -1,4 +1,5 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.UnresolvedDotExpr
 
-class UnresolvedDotExpr extends UnresolvedDotExprBase { }
+class UnresolvedDotExpr extends UnresolvedDotExprBase {
+  override string toString() { result = "... ." + getName() }
+}

swift/ql/test/extractor-tests/expressions/all.expected

@@ -2,4 +2,4 @@ import swift
 
 from Expr expr
 where expr.getLocation().getFile().getName().matches("%swift/ql/test%")
-select expr
+select expr, expr.getPrimaryQlClasses()

swift/ql/test/extractor-tests/expressions/all.ql

@@ -0,0 +1,3 @@
+| unresolved_dot_expr.swift:5:6:5:8 | UnresolvedDotExpr | getBase: | unresolved_dot_expr.swift:5:6:5:6 | SimpleIdentTypeRepr | getName: | x |
+| unresolved_dot_expr.swift:11:6:11:8 | UnresolvedDotExpr | getBase: | unresolved_dot_expr.swift:11:6:11:6 | SimpleIdentTypeRepr | getName: | a |
+| unresolved_dot_expr.swift:11:6:11:10 | UnresolvedDotExpr | getBase: | unresolved_dot_expr.swift:11:6:11:8 | UnresolvedDotExpr | getName: | x |

swift/ql/test/extractor-tests/generated/expr/UnresolvedDotExpr/UnresolvedDotExpr.expected

@@ -0,0 +1,11 @@
+// generated by codegen/codegen.py
+import codeql.swift.elements
+import TestUtils
+
+from UnresolvedDotExpr x, Expr getBase, string getName
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getBase = x.getBase() and
+  getName = x.getName()
+select x, "getBase:", getBase, "getName:", getName

swift/ql/test/extractor-tests/generated/expr/UnresolvedDotExpr/UnresolvedDotExpr.ql

@@ -0,0 +1,7 @@
+// generated by codegen/codegen.py
+import codeql.swift.elements
+import TestUtils
+
+from UnresolvedDotExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getType()