don't include mock Ast nodes in PrintAst.ql

erik-krogh · erik-krogh · commit b7e0d1f8b324 · 2022-12-20T13:55:49.000+01:00
diff --git a/ql/ql/src/codeql_ql/printAstAst.qll b/ql/ql/src/codeql_ql/printAstAst.qll
@@ -10,6 +10,7 @@
 
 import ast.Ast
 private import codeql.Locations
+import ast.internal.AstNodes
 
 /**
  * The query can extend this class to control which nodes are printed.
@@ -20,7 +21,7 @@ class PrintAstConfiguration extends string {
   /**
    * Holds if the given node should be printed.
    */
-  predicate shouldPrintNode(AstNode n) { any() }
+  predicate shouldPrintNode(AstNode n) { not exists(toMock(n)) }
 }
 
 /**
diff --git a/ql/ql/test/printAst/printAst.expected b/ql/ql/test/printAst/printAst.expected
@@ -161,8 +161,6 @@ nodes
 | Foo.qll:30:10:30:27 | assume_small_delta | semmle.order | 80 |
 | Foo.qll:31:3:31:14 | NewTypeBranch TPathNodeMid | semmle.label | [NewTypeBranch] NewTypeBranch TPathNodeMid |
 | Foo.qll:31:3:31:14 | NewTypeBranch TPathNodeMid | semmle.order | 81 |
-| file://:0:0:0:0 | Module EquivalenceRelation | semmle.label | [Module] Module EquivalenceRelation |
-| file://:0:0:0:0 | Module QlBuiltins | semmle.label | [Module] Module QlBuiltins |
 | file://:0:0:0:0 | abs | semmle.label | [BuiltinPredicate] abs |
 | file://:0:0:0:0 | abs | semmle.label | [BuiltinPredicate] abs |
 | file://:0:0:0:0 | acos | semmle.label | [BuiltinPredicate] acos |
@@ -411,7 +409,6 @@ edges
 | Foo.qll:30:3:30:28 | annotation | Foo.qll:30:10:30:27 | assume_small_delta | semmle.order | 80 |
 | Foo.qll:31:3:31:14 | NewTypeBranch TPathNodeMid | Foo.qll:30:3:30:28 | annotation | semmle.label | getAnAnnotation() |
 | Foo.qll:31:3:31:14 | NewTypeBranch TPathNodeMid | Foo.qll:30:3:30:28 | annotation | semmle.order | 79 |
-| file://:0:0:0:0 | Module QlBuiltins | file://:0:0:0:0 | Module EquivalenceRelation | semmle.label | getAMember() |
 | printAst.ql:1:1:1:28 | Import | printAst.ql:1:18:1:28 | printAstAst | semmle.label | getModuleExpr() |
 | printAst.ql:1:1:1:28 | Import | printAst.ql:1:18:1:28 | printAstAst | semmle.order | 84 |
 | printAst.ql:1:1:1:29 | TopLevel | printAst.ql:1:1:1:28 | Import | semmle.label | getAnImport() |
