JS: Factor out some code

asgerf · asgerf · commit 4b57b4418fbc · 2025-11-17T10:48:15.000+01:00
diff --git a/javascript/ql/lib/semmle/javascript/internal/Overlay.qll b/javascript/ql/lib/semmle/javascript/internal/Overlay.qll
@@ -6,10 +6,9 @@ private predicate isOverlay() { databaseMetadata("isOverlay", "true") }
 
 overlay[local]
 private string getFileFromEntity(@locatable node) {
-  exists(@location loc, @file file |
+  exists(@location loc |
     hasLocation(node, loc) and
-    locations_default(loc, file, _, _, _, _) and
-    files(file, result)
+    result = getFileFromLocation(loc)
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,9 @@ private predicate isOverlay() { databaseMetadata("isOverlay", "true") }`
`6`	`6`
`7`	`7`	`overlay[local]`
`8`	`8`	`private string getFileFromEntity(@locatable node) {`
`9`		`- exists(@location loc, @file file \|`
	`9`	`+ exists(@location loc \|`
`10`	`10`	`hasLocation(node, loc) and`
`11`		`- locations_default(loc, file, _, _, _, _) and`
`12`		`- files(file, result)`
	`11`	`+ result = getFileFromLocation(loc)`
`13`	`12`	`)`
`14`	`13`	`}`
`15`	`14`