JavaScript: Fix semantic merge conflict.

Max Schaefer · Max Schaefer · commit 7b3c835bc670 · 2019-07-30T12:34:30.000+01:00
#1621 vs #1613
diff --git a/javascript/ql/src/semmle/javascript/GlobalAccessPaths.qll b/javascript/ql/src/semmle/javascript/GlobalAccessPaths.qll
@@ -62,7 +62,7 @@ module GlobalAccessPath {
       result = acc.getClosureNamespace()
     )
     or
-    exists(DataFlow::PropertyProjection proj | node = proj |
+    exists(PropertyProjection proj | node = proj |
       proj.isSingletonProjection() and
       result = fromReference(proj.getObject()) + "." + proj.getASelector()
     )

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ module GlobalAccessPath {`
`62`	`62`	`result = acc.getClosureNamespace()`
`63`	`63`	`)`
`64`	`64`	`or`
`65`		`- exists(DataFlow::PropertyProjection proj \| node = proj \|`
	`65`	`+ exists(PropertyProjection proj \| node = proj \|`
`66`	`66`	`proj.isSingletonProjection() and`
`67`	`67`	`result = fromReference(proj.getObject()) + "." + proj.getASelector()`
`68`	`68`	`)`