fixed issue 86: newlines in <code> elements being treated as significant even when the code element is not preformatted.

Author: [email protected]

src/prettify.js

@@ -273,6 +273,27 @@ window['_pr_isIE6'] = function () {
     return 'XMP' === node.tagName;
   }
 
+  var newlineRe = /[\r\n]/g;
+  /**
+   * Are newlines and adjacent spaces significant in the given node's innerHTML?
+   */
+  function isPreformatted(node, content) {
+    // PRE means preformatted, and is a very common case, so don't create
+    // unnecessary computed style objects.
+    if ('PRE' === node.tagName) { return true; }
+    if (!newlineRe.test(content)) { return true; }  // Don't care
+    var whitespace;
+    // For disconnected nodes, IE has no currentStyle.
+    if (node.currentStyle) {
+      whitespace = node.currentStyle.whiteSpace;
+    } else if (window.getComputedStyle) {
+      // Firefox makes a best guess if node is disconnected whereas Safari
+      // returns the empty string.
+      whitespace = window.getComputedStyle(node, null).whiteSpace;
+    }
+    return !whitespace || whitespace === 'pre';
+  }
+
   function normalizedHtml(node, out) {
     switch (node.nodeType) {
       case 1:  // an element
@@ -548,6 +569,9 @@ window['_pr_isIE6'] = function () {
       // XMP tags contain unescaped entities so require special handling.
       if (isRawContent(node)) {
         content = textToHtml(content);
+      } else if (!isPreformatted(node, content)) {
+        content = content.replace(/(<br\s*\/?>)[\r\n]+/g, '$1')
+            .replace(/(?:[\r\n]+[ \t]*)+/g, ' ');
       }
       return content;
     }

tests/prettify_test.html

@@ -1012,6 +1012,20 @@ <h1>CSS w/ language specified</h1>
 blink { text-decoration: BLINK !IMPORTANT; font-weight: bolder }
 --&gt;
 </pre>
+
+<h1>Issue 86</h1>
+<p><code class="prettyprint" id="issue86_0">#One
+Two words</code></p>
+<p><code class="prettyprint known_ie6_failure" id="issue86_1" style="white-space: pre">#One
+Two lines</code></p>
+<pre class="prettyprint" id="issue86_2">#One
+Two lines</pre>
+<pre><code class="prettyprint known_ie6_failure" id="issue86_3">#One
+Two lines</code></pre>
+<xmp class="prettyprint" id="issue86_4">#One
+Two lines</xmp>
+<p><code class="prettyprint" id="issue86_5">#One<br>
+Two lines</code></p>
 </body>
 
 <script type="text/javascript">
@@ -2375,7 +2389,16 @@ <h1>CSS w/ language specified</h1>
           '`PLN BLINK `END`KWD!IMPORTANT`END`PUN;`END`PLN `END' +
           '`KWDfont-weight`END`PUN:`END`PLN bolder `END`PUN}`END`PLN<br>' +
       '`END`COM--&gt;`END'
-      )
+      ),
+  issue86_0: '`COM#One Two words`END',
+  issue86_1: '`COM#One`END`PLN<br>' +
+      '`END`TYPTwo`END`PLN lines`END',
+  issue86_2: '`COM#One`END`PLN<br>' +
+      '`END`TYPTwo`END`PLN lines`END',
+  issue86_3: '`COM#One`END`PLN<br>' +
+      '`END`TYPTwo`END`PLN lines`END',
+  issue86_4: '`COM#One`END`PLN<br>' +
+      '`END`TYPTwo`END`PLN lines`END'
 };
 </script>
 

tests/test_base.js

@@ -1,6 +1,7 @@
 // get accurate timing.
 // This file must be loaded after prettify.js for this to work.
 PR_SHOULD_USE_CONTINUATION = false;
+var realIsIE6 = _pr_isIE6();
 if (!/\btestcopypaste\b/.test(location.fragment)) {
   _pr_isIE6 = function() { return false; };  // Ensure consistent output.
 }
@@ -69,12 +70,16 @@ function runTests(goldens) {
       '<h1>Running tests&hellip;<\/h1>';
   htmlOut.push('<h1>Test results<\/h1>');
   for (var lang in goldens) {
+    var container = document.getElementById(lang);
+    if (realIsIE6 && /\bknown_ie6_failure\b/.test(container.className)) {
+      continue;
+    }
     var golden = goldens[lang].replace(/`([A-Z]{3})/g, function (_, lbl) {
         return (lbl == 'END'
             ? '<\/span>'
             : '<span class="' + lbl.toLowerCase() + '">');
       });
-    var actual = normalizedInnerHtml(document.getElementById(lang));
+    var actual = normalizedInnerHtml(container);
     if (golden !== actual) {  // test failed
       // write out
       var pre = commonPrefix(golden, actual);