JS: improve whitespace handling for multi-license file recognition

Esben Sparre Andreasen · Esben Sparre Andreasen · commit edbef289a75c · 2018-12-11T09:30:10.000+01:00
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Bundling.qll b/javascript/ql/src/semmle/javascript/frameworks/Bundling.qll
@@ -225,7 +225,7 @@ predicate isMultiLicenseBundle(TopLevel tl) {
   // case: ordinary block comments with "@license" lines
   count(BlockComment head |
     head.getTopLevel() = tl and
-    head.getLine(_).regexpMatch("(?i) *\\* @license .*")
+    head.getLine(_).regexpMatch("(?i)[\\s*]*@license\\b.*")
   ) > 1
 }
 
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/ClassifyFiles.expected b/javascript/ql/test/query-tests/filters/ClassifyFiles/ClassifyFiles.expected
@@ -15,6 +15,7 @@
 | multi-part-bundle.html:0:0:0:0 | multi-part-bundle.html | generated |
 | 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.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 |
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/multiple-licenses-3.js b/javascript/ql/test/query-tests/filters/ClassifyFiles/multiple-licenses-3.js
@@ -0,0 +1,6 @@
+/**
+ * @license
+ */
+/**
+ * @license
+ */

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ predicate isMultiLicenseBundle(TopLevel tl) {`
`225`	`225`	`// case: ordinary block comments with "@license" lines`
`226`	`226`	`count(BlockComment head \|`
`227`	`227`	`head.getTopLevel() = tl and`
`228`		`- head.getLine(_).regexpMatch("(?i) \\ @license .*")`
	`228`	`+ head.getLine(_).regexpMatch("(?i)[\\s]@license\\b.*")`
`229`	`229`	`) > 1`
`230`	`230`	`}`
`231`	`231`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +/**
 + * @license
 + */
 +/**
 + * @license
 + */