Allow whitespace between regex & some of the things that can follow it

Fixes #242
matthiasmullie · Apr 4, 2018 · 473896b · 473896b
1 parent 62dac3b
commit 473896b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/JS.php b/src/JS.php
@@ -264,7 +264,7 @@ protected function extractRegex()
         );
         $delimiters = array_fill(0, count($propertiesAndMethods), '/');
         $propertiesAndMethods = array_map('preg_quote', $propertiesAndMethods, $delimiters);
-        $after = '(?=\s*[\.,;\)\}&\|+]|\/\/|$|\.('.implode('|', $propertiesAndMethods).'))';
+        $after = '(?=\s*([\.,;\)\}&\|+]|\/\/|$|\.('.implode('|', $propertiesAndMethods).')))';
         $this->registerPattern('/'.$before.'\K'.$pattern.$after.'/', $callback);
 
         // regular expressions following a `)` are rather annoying to detect...

diff --git a/tests/js/JSTest.php b/tests/js/JSTest.php
@@ -1268,6 +1268,12 @@ function someOtherFunction() {
 var largeScreen=2048',
         );
 
+        // https://github.com/matthiasmullie/minify/issues/242
+        $tests[] = array(
+            "/^\[(x| )\](?=\s)/i // Must follow listRE",
+            "/^\[(x| )\](?=\s)/i",
+        );
+
         // known minified files to help doublecheck changes in places not yet
         // anticipated in these tests
         $files = glob(__DIR__.'/sample/minified/*.js');