fixup Definitions.qll

erik-krogh · erik-krogh · commit 80f66779fb5b · 2022-06-17T11:27:07.000+02:00
diff --git a/ql/ql/src/ide-contextual-queries/Definitions.qll b/ql/ql/src/ide-contextual-queries/Definitions.qll
@@ -28,14 +28,15 @@ class Loc extends TLoc {
   }
 }
 
-private predicate resolveModule(ModuleRef ref, FileOrModule target, string kind) {
+private predicate resolveModule(TypeRef ref, FileOrModule target, string kind) {
   target = ref.getResolvedModule() and
   kind = "module"
 }
 
 private predicate resolveType(TypeExpr ref, AstNode target, string kind) {
   target = ref.getResolvedType().getDeclaration() and
-  kind = "type"
+  kind = "type" and
+  not resolveModule(ref, _, _) // modules are types, so we exclude them here.
 }
 
 private predicate resolvePredicate(PredicateExpr ref, Predicate target, string kind) {

Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,15 @@ class Loc extends TLoc {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`-private predicate resolveModule(ModuleRef ref, FileOrModule target, string kind) {`
	`31`	`+private predicate resolveModule(TypeRef ref, FileOrModule target, string kind) {`
`32`	`32`	`target = ref.getResolvedModule() and`
`33`	`33`	`kind = "module"`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`private predicate resolveType(TypeExpr ref, AstNode target, string kind) {`
`37`	`37`	`target = ref.getResolvedType().getDeclaration() and`
`38`		`- kind = "type"`
	`38`	`+ kind = "type" and`
	`39`	`+ not resolveModule(ref, _, _) // modules are types, so we exclude them here.`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`private predicate resolvePredicate(PredicateExpr ref, Predicate target, string kind) {`