Merge pull request #124 from CGLOB/master

To identify coorect end of the regex
tedious · Jun 19, 2023 · 7cb41f8 · 7cb41f8
2 parents e72133d + 70b18f1
commit 7cb41f8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/JShrink/Minifier.php b/src/JShrink/Minifier.php
@@ -626,7 +626,7 @@ protected function saveRegex()
         $this->echo($this->b);
 
         while (($this->a = $this->getChar()) !== false) {
-            if ($this->a === '/') {
+            if ($this->a === '/' && (preg_match('/g|\n|i|\)|\.|,|\s/', $this->peek()) === 1)) {
                 break;
             }
 

diff --git a/tests/Resources/jshrink/input/regex_end_string.js b/tests/Resources/jshrink/input/regex_end_string.js
@@ -0,0 +1,3 @@
+escapeCssMeta: function( string ) {
+    return (string || '').replace( /([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g, "\\$1" );
+},
diff --git a/tests/Resources/jshrink/output/regex_close.js b/tests/Resources/jshrink/output/regex_close.js
@@ -1,4 +1 @@
-function test(string){return(string||'').replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,
-    '\\$1'
-  )
-}
+function test(string){return(string||'').replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,'\\$1')}
diff --git a/tests/Resources/jshrink/output/regex_end_string.js b/tests/Resources/jshrink/output/regex_end_string.js
@@ -0,0 +1 @@
+escapeCssMeta:function(string){return(string||'').replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,"\\$1");},