fix issue 217: regex matching after runs of punctuation

Author: [email protected]

js-modules/prettify.js

@@ -571,7 +571,10 @@ var prettyPrint;
       // If that does turn out to be a problem, we should change the below
       // when hc is truthy to include # in the run of punctuation characters
       // only when not followint [|&;<>].
-      /^.[^\s\w\.$@\'\"\`\/\\]*/;
+      '^.[^\\s\\w.$@\'"`/\\\\]*';
+    if (options['regexLiterals']) {
+      punctuation += '(?!\s*\/)';
+    }
 
     fallthroughStylePatterns.push(
         // TODO(mikesamuel): recognize non-latin letters and numerals in idents
@@ -591,9 +594,10 @@ var prettyPrint;
              // with an optional modifier like UL for unsigned long
              + '[a-z]*', 'i'),
          null, '0123456789'],
-        // Don't treat escaped quotes in bash as starting strings.  See issue 144.
+        // Don't treat escaped quotes in bash as starting strings.
+        // See issue 144.
         [PR_PLAIN,       /^\\[\s\S]?/, null],
-        [PR_PUNCTUATION, punctuation, null]);
+        [PR_PUNCTUATION, new RegExp(punctuation), null]);
 
     return createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns);
   }

src/prettify.js

@@ -926,7 +926,10 @@ var prettyPrint;
       // If that does turn out to be a problem, we should change the below
       // when hc is truthy to include # in the run of punctuation characters
       // only when not followint [|&;<>].
-      /^.[^\s\w\.$@\'\"\`\/\\]*/;
+      '^.[^\\s\\w.$@\'"`/\\\\]*';
+    if (options['regexLiterals']) {
+      punctuation += '(?!\s*\/)';
+    }
 
     fallthroughStylePatterns.push(
         // TODO(mikesamuel): recognize non-latin letters and numerals in idents
@@ -946,9 +949,10 @@ var prettyPrint;
              // with an optional modifier like UL for unsigned long
              + '[a-z]*', 'i'),
          null, '0123456789'],
-        // Don't treat escaped quotes in bash as starting strings.  See issue 144.
+        // Don't treat escaped quotes in bash as starting strings.
+        // See issue 144.
         [PR_PLAIN,       /^\\[\s\S]?/, null],
-        [PR_PUNCTUATION, punctuation, null]);
+        [PR_PUNCTUATION, new RegExp(punctuation), null]);
 
     return createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns);
   }

src/run_prettify.js

@@ -1115,7 +1115,10 @@ var IN_GLOBAL_SCOPE = false;
           // If that does turn out to be a problem, we should change the below
           // when hc is truthy to include # in the run of punctuation characters
           // only when not followint [|&;<>].
-          /^.[^\s\w\.$@\'\"\`\/\\]*/;
+          '^.[^\\s\\w.$@\'"`/\\\\]*';
+        if (options['regexLiterals']) {
+          punctuation += '(?!\s*\/)';
+        }
 
         fallthroughStylePatterns.push(
             // TODO(mikesamuel): recognize non-latin letters and numerals in idents
@@ -1135,9 +1138,10 @@ var IN_GLOBAL_SCOPE = false;
                  // with an optional modifier like UL for unsigned long
                  + '[a-z]*', 'i'),
              null, '0123456789'],
-            // Don't treat escaped quotes in bash as starting strings.  See issue 144.
+            // Don't treat escaped quotes in bash as starting strings.
+            // See issue 144.
             [PR_PLAIN,       /^\\[\s\S]?/, null],
-            [PR_PUNCTUATION, punctuation, null]);
+            [PR_PUNCTUATION, new RegExp(punctuation), null]);
 
         return createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns);
       }

tests/prettify_test_2.html

@@ -818,6 +818,13 @@ <h1>LLVM</h1>
 !foo = !{!1, null}
 </pre>
 
+<h1>Issue 217 : Regex following '!'</h1>
+<pre id="issue217" class="prettyprint lang-js">
+if(!/^https?:\/\//i.test(val) &amp;&amp; foo == 'bar') {
+    val = 'http://' + val;
+}
+</pre>
+
 </body>
 
 <script type="text/javascript">
@@ -1530,6 +1537,11 @@ <h1>LLVM</h1>
         '`END`COM; Named metadata`END`PLN\n' +
         '!1 `END`PUN=`END`PLN `END`KWDmetadata`END`PLN !`END`PUN{`END`KWDi32`END`PLN `END`LIT42`END`PUN}`END`PLN\n' +
         '!foo `END`PUN=`END`PLN !`END`PUN{`END`PLN!1`END`PUN,`END`PLN `END`KWDnull`END`PUN}`END'
+      ),
+  issue217: (
+      '`KWDif`END`PUN(!`END`STR/^https?:\\/\\//`END`PLNi`END`PUN.`END`PLNtest`END`PUN(`END`PLNval`END`PUN)`END`PLN `END`PUN&amp;&amp;`END`PLN foo `END`PUN==`END`PLN `END`STR\'bar\'`END`PUN)`END`PLN `END`PUN{`END`PLN\n' +
+      '    val `END`PUN=`END`PLN `END`STR\'http://\'`END`PLN `END`PUN+`END`PLN val`END`PUN;`END`PLN\n' +
+      '`END`PUN}`END'
       )
 };
 </script>