From 947566fbf3d22eed1cc95576ce956955efd34395 Mon Sep 17 00:00:00 2001
From: Ze Yu <angzeyu@gmail.com>
Date: Sun, 19 Jul 2020 14:18:10 +0800
Subject: [PATCH] Add newline for block end tag with multiline child

---
 index.html                               |  3 ++-
 js/src/html/beautifier.js                | 13 ++++++++----
 js/test/generated/beautify-html-tests.js | 15 ++++++++++++++
 test/data/html/tests.js                  | 25 ++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index dd5c15f63..c76332139 100644
--- a/index.html
+++ b/index.html
@@ -206,7 +206,8 @@ <h2>Browser extensions and other uses</h2>
         <li>A
           <a href="javascript:(function(){s=document.getElementsByTagName('SCRIPT');tx='';sr=[];for(i=0;i<s.length;i++){with(s.item(i)){t=text;if(t){tx+=t;}else{sr.push(src)};}};with(window.open()){document.write('<textarea id=&quot;t&quot;>'+(sr.join(&quot;\n&quot;))+&quot;\n\n-----\n\n&quot;+tx+'</textarea><script src=&quot;https://beautifier.io/js/lib/beautify.js&quot;></script><script>with(document.getElementById(&quot;t&quot;)){value=js_beautify(value);with(style){width=&quot;99%&quot;;height=&quot;99%&quot;;borderStyle=&quot;none&quot;;}};</script>');document.close();}})();">
             <strong>bookmarklet</strong></a>
-          (drag it to your bookmarks) by Ichiro Hiroshi to see all scripts used on the page,</li>
+          (drag it to your bookmarks) by Ichiro Hiroshi to see all scripts used on the page,
+        </li>
 
         <li><strong>Chrome</strong>, in case the built-in CSS and javascript formatting isn't enough for you:<br>
           — <a href="https://chrome.google.com/webstore/detail/cfmcghennfbpmhemnnfjhkdmnbidpanb">Quick source viewer</a> by Tomi Mickelsson (<a href="https://github.com/tomimick/chrome-ext-view-src">github</a>, <a href="http://tomicloud.com/2012/07/viewsrc-chrome-ext">blog</a>),<br>
diff --git a/js/src/html/beautifier.js b/js/src/html/beautifier.js
index 15cba62be..7c222bf8b 100644
--- a/js/src/html/beautifier.js
+++ b/js/src/html/beautifier.js
@@ -734,12 +734,17 @@ Beautifier.prototype._set_tag_position = function(printer, raw_token, parser_tok
       }
     }
 
-    if (!parser_token.is_inline_element && last_token.type !== 'TK_CONTENT') {
-      if (parser_token.parent) {
-        parser_token.parent.multiline_content = true;
-      }
+    var do_set_parent_multiline;
+    if (parser_token.is_inline_element) {
+      do_set_parent_multiline = raw_token.newlines && parser_token.parent && !parser_token.parent.is_inline_element;
+    } else if (last_token.type !== 'TK_CONTENT') {
+      do_set_parent_multiline = parser_token.parent;
       printer.print_newline(false);
     }
+
+    if (do_set_parent_multiline) {
+      parser_token.parent.multiline_content = true;
+    }
   }
 };
 
diff --git a/js/test/generated/beautify-html-tests.js b/js/test/generated/beautify-html-tests.js
index bb461d9cd..0984121d5 100644
--- a/js/test/generated/beautify-html-tests.js
+++ b/js/test/generated/beautify-html-tests.js
@@ -172,6 +172,21 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
             '<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="none" x="0" y="0" viewBox="0 0 900 710" width="100%" height="100%">\n' +
             '    <circle id="mycircle" cx="182.901" cy="91.4841" style="fill:rosybrown;stroke:black;stroke-width:1px;" r="48" />\n' +
             '</svg>');
+        test_fragment(
+            '<div class="col-xs-2">\n' +
+            '<input type="radio" class="control-label" ng-disabled="!col" ng-model="col" value="2" class="form-control" id="coli" name="coli" />\n' +
+            '<label for="coli" class="control-label">Collision</label></div>',
+            //  -- output --
+            '<div class="col-xs-2">\n' +
+            '    <input type="radio" class="control-label" ng-disabled="!col" ng-model="col" value="2" class="form-control" id="coli" name="coli" />\n' +
+            '    <label for="coli" class="control-label">Collision</label>\n' +
+            '</div>');
+        test_fragment(
+            '<label class="col-xs-2">Collision\n' +
+            '<input type="radio" class="control-label" ng-disabled="!col" ng-model="col" value="2" class="form-control" id="coli" name="coli" /></label>',
+            //  -- output --
+            '<label class="col-xs-2">Collision\n' +
+            '    <input type="radio" class="control-label" ng-disabled="!col" ng-model="col" value="2" class="form-control" id="coli" name="coli" /></label>');
 
 
         //============================================================
diff --git a/test/data/html/tests.js b/test/data/html/tests.js
index bfe43a95a..b1e0dcee9 100644
--- a/test/data/html/tests.js
+++ b/test/data/html/tests.js
@@ -70,6 +70,31 @@ exports.test_data = {
         '    <circle id="mycircle" cx="182.901" cy="91.4841" style="fill:rosybrown;stroke:black;stroke-width:1px;" r="48" />',
         '</svg>'
       ]
+    }, {
+      // Issue #1365 -- Inline tags with newlines should break block parent ending tags into another line
+      fragment: true,
+      input: [
+        '<div class="col-xs-2">',
+        '<input type="radio" class="control-label" ng-disabled="!col" ng-model="col" value="2" class="form-control" id="coli" name="coli" />',
+        '<label for="coli" class="control-label">Collision</label></div>'
+      ],
+      output: [
+        '<div class="col-xs-2">',
+        '    <input type="radio" class="control-label" ng-disabled="!col" ng-model="col" value="2" class="form-control" id="coli" name="coli" />',
+        '    <label for="coli" class="control-label">Collision</label>',
+        '</div>'
+      ]
+    }, {
+      // Issue #1365 -- Inline tags with newlines should not break inline parent ending tags into another line
+      fragment: true,
+      input: [
+        '<label class="col-xs-2">Collision',
+        '<input type="radio" class="control-label" ng-disabled="!col" ng-model="col" value="2" class="form-control" id="coli" name="coli" /></label>'
+      ],
+      output: [
+        '<label class="col-xs-2">Collision',
+        '    <input type="radio" class="control-label" ng-disabled="!col" ng-model="col" value="2" class="form-control" id="coli" name="coli" /></label>'
+      ]
     }]
   }, {
     name: "End With Newline",