fixup! JS: make js/unused-local-variable flag import statements

Esben Sparre Andreasen · Esben Sparre Andreasen · commit acee34fccb58 · 2018-10-11T12:44:21.000+02:00
diff --git a/javascript/ql/src/Declarations/UnusedVariable.ql b/javascript/ql/src/Declarations/UnusedVariable.ql
@@ -123,6 +123,15 @@ class ImportVarDeclProvider extends Stmt {
     result = this.(ImportDeclaration).getASpecifier().getLocal() or
     result = this.(ImportEqualsDeclaration).getId()
   }
+
+  /**
+   * Gets an unacceptable unused variable declared by this import.
+   */
+  UnusedLocal getAnUnacceptableUnusedLocal() {
+    result = getAVarDecl().getVariable() and
+    not whitelisted(result)
+  }
+
 }
 
 /**
@@ -167,17 +176,13 @@ predicate unusedNonImports(VarDecl vd, string msg) {
  */
 predicate unusedImports(ImportVarDeclProvider provider, string msg) {
   exists (string plural, string names |
-    names = concat(UnusedLocal v |
-      v = provider.getAVarDecl().getVariable() and
-      not whitelisted(v) |
+    names = strictconcat(UnusedLocal v |
+      v = provider.getAnUnacceptableUnusedLocal() |
       v.getName(),
       ", " order by v.getName()
     ) and
-    not names = "" and
     (
-      if count(UnusedLocal v |
-        v = provider.getAVarDecl().getVariable() and
-        not whitelisted(v)) > 1 then
+      if count(provider.getAnUnacceptableUnusedLocal()) > 1 then
         plural = "s"
       else
         plural = ""
