Swift: make toBeTested and shouldPrint propagate to children

Author: redsun82

swift/ql/src/queries/ide-contextual-queries/printAst.ql

@@ -10,6 +10,7 @@
 import swift
 import codeql.swift.printast.PrintAst
 import IDEContextual
+import codeql.swift.generated.ParentChild
 
 /**
  * Gets the source file to generate an AST from.
@@ -23,6 +24,10 @@ class PrintAstConfigurationOverride extends PrintAstConfiguration {
    */
   override predicate shouldPrint(Locatable e) {
     super.shouldPrint(e) and
-    e.getFile() = getFileBySourceArchiveName(selectedSourceFile())
+    (
+      e.getFile() = getFileBySourceArchiveName(selectedSourceFile())
+      or
+      exists(Locatable parent | this.shouldPrint(parent) and parent = getImmediateParent(e))
+    )
   }
 }

swift/ql/test/TestUtils.qll

@@ -1,11 +1,10 @@
 private import codeql.swift.elements
+private import codeql.swift.generated.ParentChild
 
 cached
 predicate toBeTested(Element e) {
   e instanceof File
   or
-  e instanceof AppliedPropertyWrapperExpr
-  or
   exists(ModuleDecl m |
     m = e and
     not m.isBuiltinModule() and
@@ -32,6 +31,8 @@ predicate toBeTested(Element e) {
       e.(UnspecifiedElement).getParent() = tested
       or
       e.(OpaqueTypeDecl).getNamingDeclaration() = tested
+      or
+      tested = getImmediateParent(e)
     )
   )
 }