Merge pull request #1520 from re6exp/master

Add support for additional wrap attribute options of js-beautify (html): force-aligned and force-expand-multiline.

CHANGELOG.md

@@ -1,4 +1,5 @@
 # dev
+- Add support for additional wrap attribute options of js-beautify (html): force-aligned and force-expand-multiline.
 - Update to `remark`'s new API and fix [#1196](https://github.com/Glavin001/atom-beautify/issues/1196)
 - Add beautifier for the Lua language.
 - Add [ocp-indent](https://github.com/OCamlPro/ocp-indent) beautifier for the OCaml language.

package.json

@@ -115,6 +115,10 @@
       "name": "Victor Uriarte",
       "url": "https://github.com/vmuriart"
     },
+    {
+      "name": "Anton Brok-Volchansky",
+      "url": "https://github.com/re6exp"
+    },
     {
       "name": "Taylon Silmer",
       "url": "https://github.com/taylon"

src/languages/html.coffee

@@ -56,8 +56,8 @@ module.exports = {
     wrap_attributes:
       type: 'string'
       default: "auto"
-      enum: ["auto", "force"]
+      enum: ["auto", "force", "force-aligned", "force-expand-multiline"]
-      description: "Wrap attributes to new lines [auto|force]"
+      description: "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline]"
     wrap_attributes_indent_size:
       type: 'integer'
       default: defaultIndentSize