QL: fix the same QLDoc being QLDoc for multiple things

erik-krogh · erik-krogh · commit de2ebe3618d3 · 2022-11-16T20:35:39.000+01:00
diff --git a/ql/ql/src/codeql_ql/ast/Ast.qll b/ql/ql/src/codeql_ql/ast/Ast.qll
@@ -156,13 +156,22 @@ class TopLevel extends TTopLevel, AstNode {
   }
 
   QLDoc getQLDocFor(ModuleMember m) {
-    exists(int i | result = this.getMember(i) and m = this.getMember(i + 1))
+    exists(int i | result = this.getMember(i) and m = this.getMember(i + 1)) and
+    (
+      m instanceof ClasslessPredicate
+      or
+      m instanceof Class
+      or
+      m instanceof Module
+    )
   }
 
   override string getAPrimaryQlClass() { result = "TopLevel" }
 
   override QLDoc getQLDoc() {
     result = this.getMember(0) and
+    // it's not the QLDoc for a module member
+    not this.getQLDocFor(_) = result and
     result.getLocation().getStartLine() = 1 // this might not hold if there is a block comment above, and that's the point.
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -156,13 +156,22 @@ class TopLevel extends TTopLevel, AstNode {`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`QLDoc getQLDocFor(ModuleMember m) {`
`159`		`- exists(int i \| result = this.getMember(i) and m = this.getMember(i + 1))`
	`159`	`+ exists(int i \| result = this.getMember(i) and m = this.getMember(i + 1)) and`
	`160`	`+ (`
	`161`	`+ m instanceof ClasslessPredicate`
	`162`	`+ or`
	`163`	`+ m instanceof Class`
	`164`	`+ or`
	`165`	`+ m instanceof Module`
	`166`	`+ )`
`160`	`167`	`}`
`161`	`168`
`162`	`169`	`override string getAPrimaryQlClass() { result = "TopLevel" }`
`163`	`170`
`164`	`171`	`override QLDoc getQLDoc() {`
`165`	`172`	`result = this.getMember(0) and`
	`173`	`+ // it's not the QLDoc for a module member`
	`174`	`+ not this.getQLDocFor(_) = result and`
`166`	`175`	`result.getLocation().getStartLine() = 1 // this might not hold if there is a block comment above, and that's the point.`
`167`	`176`	`}`
`168`	`177`	`}`