Swift: do not print MacroRole as part of AST

AlexDenisov · AlexDenisov · commit dde2ad12909d · 2023-11-21T14:49:55.000+01:00
diff --git a/swift/ql/lib/codeql/swift/printast/PrintAstNode.qll b/swift/ql/lib/codeql/swift/printast/PrintAstNode.qll
@@ -20,7 +20,7 @@ class PrintAstConfiguration extends TPrintAstConfiguration {
   /**
    * Holds if the AST for `e` should be printed. By default, holds for all.
    */
-  predicate shouldPrint(Locatable e) { not e instanceof Diagnostics }
+  predicate shouldPrint(Locatable e) { not e instanceof Diagnostics and not e instanceof MacroRole }
 }
 
 private predicate shouldPrint(Locatable e) { any(PrintAstConfiguration config).shouldPrint(e) }
diff --git a/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/PrintAst.expected b/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/PrintAst.expected
@@ -1,13 +1,3 @@
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(declaration)
-#-----| [MacroRole] #freestanding(declaration)
 closures.swift:
 #    1| [NamedFunction] hello()
 #    1|     InterfaceType = () -> String
diff --git a/swift/ql/test/extractor-tests/updates/PrintAst.expected b/swift/ql/test/extractor-tests/updates/PrintAst.expected
@@ -1,13 +1,3 @@
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(declaration)
-#-----| [MacroRole] #freestanding(declaration)
 v5.8.swift:
 #    1| [Comment] // https://github.com/apple/swift/blob/main/CHANGELOG.md#swift-58
 #    1| 
diff --git a/swift/ql/test/library-tests/ast/PrintAst.expected b/swift/ql/test/library-tests/ast/PrintAst.expected
@@ -1,13 +1,3 @@
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(expression)
-#-----| [MacroRole] #freestanding(declaration)
-#-----| [MacroRole] #freestanding(declaration)
 cfg.swift:
 #    1| [TopLevelCodeDecl] { ... }
 #    1|   getBody(): [BraceStmt] { ... }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class PrintAstConfiguration extends TPrintAstConfiguration {`
`20`	`20`	`/**`
`21`	`21`	* Holds if the AST for `e` should be printed. By default, holds for all.
`22`	`22`	`*/`
`23`		`- predicate shouldPrint(Locatable e) { not e instanceof Diagnostics }`
	`23`	`+ predicate shouldPrint(Locatable e) { not e instanceof Diagnostics and not e instanceof MacroRole }`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`private predicate shouldPrint(Locatable e) { any(PrintAstConfiguration config).shouldPrint(e) }`