JS: Use conjunction instead of if none()

asgerf · asgerf · commit d3d3fc28b0d1 · 2025-09-04T14:04:52.000+02:00
diff --git a/javascript/ql/lib/semmle/javascript/Modules.qll b/javascript/ql/lib/semmle/javascript/Modules.qll
@@ -227,10 +227,10 @@ abstract class Import extends AstNode {
    */
   pragma[nomagic]
   final DataFlow::Node getImportedModuleNodeIfUnambiguous() {
-    if
+    result = this.getImportedModuleNode() and
+    not (
       this.isDefaultImport() and
       this.getImportedModule().(ES2015Module).hasBothNamedAndDefaultExports()
-    then none()
-    else result = this.getImportedModuleNode()
+    )
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -227,10 +227,10 @@ abstract class Import extends AstNode {`
`227`	`227`	`*/`
`228`	`228`	`pragma[nomagic]`
`229`	`229`	`final DataFlow::Node getImportedModuleNodeIfUnambiguous() {`
`230`		`- if`
	`230`	`+ result = this.getImportedModuleNode() and`
	`231`	`+ not (`
`231`	`232`	`this.isDefaultImport() and`
`232`	`233`	`this.getImportedModule().(ES2015Module).hasBothNamedAndDefaultExports()`
`233`		`- then none()`
`234`		`- else result = this.getImportedModuleNode()`
	`234`	`+ )`
`235`	`235`	`}`
`236`	`236`	`}`