JS: handle additional multi-license file patterns

Author: Esben Sparre Andreasen

javascript/ql/src/semmle/javascript/frameworks/Bundling.qll

@@ -222,10 +222,10 @@ predicate isMultiLicenseBundle(TopLevel tl) {
     )
   ) > 1
   or
-  // case: ordinary block comments with "@license" lines
+  // case: ordinary block comments lines that start with a license
   count(BlockComment head |
     head.getTopLevel() = tl and
-    head.getLine(_).regexpMatch("(?i)[\\s*]*@license\\b.*")
+    head.getLine(_).regexpMatch("(?i)[\\s*]*(@license\\b.*|The [a-z0-9-]+ License (\\([a-z0-9-]+\\))?\\s*)")
   ) > 1
 }
 

javascript/ql/test/query-tests/filters/ClassifyFiles/ClassifyFiles.expected

@@ -16,6 +16,7 @@
 | multi-part-bundle.js:0:0:0:0 | multi-part-bundle.js | generated |
 | multiple-licenses-2.js:0:0:0:0 | multiple-licenses-2.js | generated |
 | multiple-licenses-3.js:0:0:0:0 | multiple-licenses-3.js | generated |
+| multiple-licenses-4.js:0:0:0:0 | multiple-licenses-4.js | generated |
 | multiple-licenses.js:0:0:0:0 | multiple-licenses.js | generated |
 | opal-test.js:0:0:0:0 | opal-test.js | generated |
 | orgmode.html:0:0:0:0 | orgmode.html | generated |

javascript/ql/test/query-tests/filters/ClassifyFiles/multiple-licenses-4.js

@@ -0,0 +1,6 @@
+/**
+ * The MIT License (MIT)
+ */
+/**
+ * The MIT License (MIT)
+ */