bug 69: preprocessor directives that end with a multiline comment still open break.

Author: [email protected]

src/prettify.js

@@ -922,7 +922,14 @@ if (patternParts[2]) { console.log(uneval(patternParts)); }
            null, '"\'']);
     }
     if (options['hashComments']) {
-      shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']);
+      if (options['cStyleComments']) {
+        // Stop C preprocessor declarations at an unclosed open comment
+        shortcutStylePatterns.push(
+            [PR_COMMENT, /^#(?:[^\r\n\/]|\/(?!\*)|\/\*[^\r\n]*?\*\/)*/,
+             null, '#']);
+      } else {
+        shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']);
+      }
     }
     if (options['cStyleComments']) {
       fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]);

tests/prettify_test.html

@@ -115,6 +115,9 @@ <h1>C w/ language specified</h1>
 void main() {
   printf("%u", fib(10));
 }
+
+#define ZERO 0 /* a
+  multiline comment */
 </pre>
 
 <h1>C++</h1>
@@ -1113,7 +1116,10 @@ <h1>CSS w/ language specified</h1>
       '`END`KWDvoid`END`PLN main`END`PUN()`END`PLN `END`PUN{`END`PLN<br>' +
       '&nbsp; printf`END`PUN(`END`STR"%u"`END`PUN,`END`PLN fib`END`PUN(`END' +
           '`LIT10`END`PUN));`END`PLN<br>' +
-      '`END`PUN}`END'),
+      '`END`PUN}`END`PLN<br>' +
+      '<br>' +
+      '`END`COM#define ZERO 0 /* a<br>' +
+      '&nbsp; multiline comment */`END'),
   Cpp: (
       '`COM#include &lt;iostream&gt;`END`PLN<br>' +
       '<br>' +