Allow min_attrs=1 for force-expand-multiline

beautifier · Apr 20, 2021 · d8bcf29 · d8bcf29
1 parent 6edbfb5
commit d8bcf29
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/js/src/html/beautifier.js b/js/src/html/beautifier.js
@@ -396,7 +396,7 @@ Beautifier.prototype._handle_inside_tag = function(printer, raw_token, last_tag_
       if (this._is_wrap_attributes_force &&
         last_tag_token.attr_count >= this._options.wrap_attributes_min_attrs &&
         (last_token.type !== TOKEN.TAG_OPEN || // ie. second attribute and beyond
-          (this._is_wrap_attributes_force_expand_multiline && last_tag_token.attr_count > 1))) {
+          this._is_wrap_attributes_force_expand_multiline)) {
         printer.print_newline(false);
         wrapped = true;
       }

diff --git a/test/data/html/tests.js b/test/data/html/tests.js
@@ -1258,6 +1258,40 @@ exports.test_data = {
         '</cmpnt>'
       ]
     }]
+  }, {
+    name: "Test wrap_attributes_min_attrs = 1 with force/force-xx options",
+    description: "",
+    matrix: [{
+      // Should not wrap, by design
+      options: [
+        { name: "wrap_attributes", value: "'force'" },
+        { name: "wrap_attributes_min_attrs", value: "1" }
+      ],
+      indent_attr: ' ',
+      newline_end: ' '
+    }, {
+      // Should not wrap, by design
+      options: [
+        { name: "wrap_attributes", value: "'force-aligned'" },
+        { name: "wrap_attributes_min_attrs", value: "1" }
+      ],
+      indent_attr: ' ',
+      newline_end: ' '
+    }, {
+      // Should wrap
+      options: [
+        { name: "wrap_attributes", value: "'force-expand-multiline'" },
+        { name: "wrap_attributes_min_attrs", value: "1" }
+      ],
+      indent_attr: '\n    ',
+      newline_end: '\n'
+    }],
+    tests: [{
+      input: [
+        '<input type="one attribute"/>'
+      ],
+      output: '<input{{indent_attr}}type="one attribute"{{newline_end}}/>'
+    }]
   }, {
     name: "Handlebars Indenting Off",
     description: "Test handlebar behavior when indenting is off",