Merge pull request #1624 from e2tha-e/issue-1623-indent-inverted-sect…

…ions Fix indenting of Handlebars/Mustache inverted sections
beautifier · Jan 30, 2019 · 3d3bbf2 · 3d3bbf2
2 parents bf66ca1 + 33db5b5
commit 3d3bbf2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/js/src/html/beautifier.js b/js/src/html/beautifier.js
@@ -561,7 +561,7 @@ var TagOpenParserToken = function(parent, raw_token) {
       tag_check_match = raw_token.text.match(/^<([^\s>]*)/);
       this.tag_check = tag_check_match ? tag_check_match[1] : '';
     } else {
-      tag_check_match = raw_token.text.match(/^{{\#?([^\s}]+)/);
+      tag_check_match = raw_token.text.match(/^{{[#\^]?([^\s}]+)/);
       this.tag_check = tag_check_match ? tag_check_match[1] : '';
     }
     this.tag_check = this.tag_check.toLowerCase();

diff --git a/js/test/generated/beautify-html-tests.js b/js/test/generated/beautify-html-tests.js
@@ -6029,9 +6029,9 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
 
 
         //============================================================
-        // Handlebars Else If and Each tag indenting
+        // Handlebars Else If, Each, and Inverted Section tag indenting
         reset_options();
-        set_name('Handlebars Else If and Each tag indenting');
+        set_name('Handlebars Else If, Each, and Inverted Section tag indenting');
         opts.indent_handlebars = true;
         bth(
             '{{#if test}}<div></div>{{else}}<div></div>{{/if}}',
@@ -6067,6 +6067,12 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
             '{{else}}\n' +
             '    <p>Unfortunately no clinics found.</p>\n' +
             '{{/each}}');
+
+        // Issue #1623 - Fix indentation of `^` inverted section tags in Handlebars/Mustache code
+        bth(
+            '{{^inverted-condition}}\n' +
+            '    <p>Unfortunately this condition is false.</p>\n' +
+            '{{/inverted-condition}}');
 
 
         //============================================================

diff --git a/test/data/html/tests.js b/test/data/html/tests.js
@@ -1349,8 +1349,8 @@ exports.test_data = {
         }
       ]
     }, {
-      name: "Handlebars Else If and Each tag indenting",
-      description: "Handlebar Else If and Each Handling tags should be newlined after formatted tags",
+      name: "Handlebars Else If, Each, and Inverted Section tag indenting",
+      description: "Handlebar Else If, Each, and Inverted Section handling tags should be newlined after formatted tags",
       template: "^^^ $$$",
       options: [
         { name: "indent_handlebars", value: "true" }
@@ -1392,6 +1392,15 @@ exports.test_data = {
             '    <p>Unfortunately no clinics found.</p>',
             '{{/each}}'
           ]
+        },
+        // Inverted section handling.
+        {
+          comment: "Issue #1623 - Fix indentation of `^` inverted section tags in Handlebars/Mustache code",
+          unchanged: [
+            '{{^inverted-condition}}',
+            '    <p>Unfortunately this condition is false.</p>',
+            '{{/inverted-condition}}'
+          ]
         }
       ]
     }, {