Merge pull request #2215 from bitwiseman/patch-2

Update html.coffee with js-beautify v1.8.1
This commit is contained in:
Steven Zeck 2018-09-11 19:59:08 -05:00 committed by GitHub
commit 67f4ca4249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 1513 additions and 749 deletions

View File

@ -1,3 +1,7 @@
# v0.33.2 (2018-09-12)
- (BREAKING CHANGE) Added `inline` and `content_unformatted` options from `js-beautify` html settings and cleared `unformatted`. Breaking change but generally improves the behavior to more accurately beautify html. ([#2210](https://github.com/Glavin001/atom-beautify/issues/2210), [#2215](https://github.com/Glavin001/atom-beautify/pull/2215), [js-beautify#1407](https://github.com/beautify-web/js-beautify/pull/1407))
# v0.33.1 (2018-09-09) # v0.33.1 (2018-09-09)
- Remove dependency marko-prettyprint in an effort to resolve installation and update issues - Remove dependency marko-prettyprint in an effort to resolve installation and update issues

File diff suppressed because it is too large Load Diff

View File

@ -12,7 +12,8 @@
{% endfor %} {% endfor %}
</ul> </ul>
<h1>My Webpage</h1> {{ a_variable }} <h1>My Webpage</h1>
{{ a_variable }}
</body> </body>
</html> </html>

View File

@ -5,7 +5,8 @@
</head> </head>
<body> <body>
@section('sidebar') This is the {{ $mater }} sidebar. @section('sidebar')
This is the {{ $mater }} sidebar.
@show @show
<div class="container"> <div class="container">
@ -13,7 +14,8 @@
</div> </div>
@component('alert') @component('alert')
@slot('title') Forbidden @slot('title')
Forbidden
@endslot @endslot
<strong>Whoops!</strong> Something went wrong! <strong>Whoops!</strong> Something went wrong!
@endcomponent @endcomponent

50
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "atom-beautify", "name": "atom-beautify",
"version": "0.33.0", "version": "0.33.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -2344,36 +2344,16 @@
"integrity": "sha1-IoveaYoMYUMdwmMKahVPFYkNIxc=" "integrity": "sha1-IoveaYoMYUMdwmMKahVPFYkNIxc="
}, },
"js-beautify": { "js-beautify": {
"version": "1.7.5", "version": "1.8.1",
"resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz", "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.1.tgz",
"integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==", "integrity": "sha512-e6Ij+fcwlnhxwfEWH148AV240ocW6z6LTZtWc9V7QEOUMu7pe2EINYbO1sM4GPHFwTVWMUWBCXGgsJGRpaQPLQ==",
"requires": { "requires": {
"config-chain": "~1.1.5", "config-chain": "~1.1.5",
"editorconfig": "^0.13.2", "editorconfig": "^0.15.0",
"mkdirp": "~0.5.0", "mkdirp": "~0.5.0",
"nopt": "~3.0.1" "nopt": "~4.0.1"
}, },
"dependencies": { "dependencies": {
"editorconfig": {
"version": "0.13.3",
"resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz",
"integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==",
"requires": {
"bluebird": "^3.0.5",
"commander": "^2.9.0",
"lru-cache": "^3.2.0",
"semver": "^5.1.0",
"sigmund": "^1.0.1"
}
},
"lru-cache": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
"integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=",
"requires": {
"pseudomap": "^1.0.1"
}
},
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
@ -2895,11 +2875,12 @@
} }
}, },
"nopt": { "nopt": {
"version": "3.0.6", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"requires": { "requires": {
"abbrev": "1" "abbrev": "1",
"osenv": "^0.1.4"
} }
}, },
"npm-prefix": { "npm-prefix": {
@ -3011,6 +2992,15 @@
"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
}, },
"osenv": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
"requires": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
}
},
"p-finally": { "p-finally": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",

View File

@ -168,6 +168,10 @@
{ {
"name": "Kohei Hiraga", "name": "Kohei Hiraga",
"url": "https://github.com/range3" "url": "https://github.com/range3"
},
{
"name": "Liam Newman",
"url": "https://github.com/bitwiseman"
} }
], ],
"engines": { "engines": {
@ -191,7 +195,7 @@
"extend": "^3.0.1", "extend": "^3.0.1",
"gherkin": "^2.12.2", "gherkin": "^2.12.2",
"handlebars": "^4.0.11", "handlebars": "^4.0.11",
"js-beautify": "~1.7.5", "js-beautify": "^1.8.1",
"jscs": "^3.0.7", "jscs": "^3.0.7",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"loophole": "^1.1.0", "loophole": "^1.1.0",

View File

@ -55,10 +55,10 @@ module.exports = class JSBeautify extends Beautifier
when "Blade" when "Blade"
beautifyHTML = require("js-beautify").html beautifyHTML = require("js-beautify").html
# pre script (Workaround) # pre script (Workaround)
text = text.replace(/\@(?!yield)([^\n\s]*)/ig, "<blade $1/>") text = text.replace(/\@(?!yield)([^\n\s]*)/ig, "<blade $1 />")
text = beautifyHTML(text, options) text = beautifyHTML(text, options)
# post script (Workaround) # post script (Workaround)
text = text.replace(/<blade ([^\n]*)\/>/ig, "@$1") text = text.replace(/<blade ([^\n\s]*)\s*\/>/ig, "@$1")
text = text.replace(/\(\ \'/ig, "('") text = text.replace(/\(\ \'/ig, "('")
@debug("Beautified HTML: #{text}") @debug("Beautified HTML: #{text}")
resolve text resolve text

View File

@ -49,8 +49,8 @@ module.exports = {
wrap_attributes: wrap_attributes:
type: 'string' type: 'string'
default: "auto" default: "auto"
enum: ["auto", "force", "force-aligned", "force-expand-multiline"] enum: ["auto", "aligned-multiple", "force", "force-aligned", "force-expand-multiline"]
description: "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline]" description: "Wrap attributes to new lines [auto|aligned-multiple|force|force-aligned|force-expand-multiline]"
wrap_attributes_indent_size: wrap_attributes_indent_size:
type: 'integer' type: 'integer'
default: null default: null
@ -65,6 +65,12 @@ module.exports = {
default: 10 default: 10
description: "Number of line-breaks to be preserved in one chunk" description: "Number of line-breaks to be preserved in one chunk"
unformatted: unformatted:
type: 'array'
default: []
items:
type: 'string'
description: "(Deprecated for most scenarios - consider inline or content_unformatted) List of tags that should not be reformatted at all. NOTE: Set this to [] to get improved beautifier behavior."
inline:
type: 'array' type: 'array'
default: [ default: [
'a', 'abbr', 'area', 'audio', 'b', 'bdi', 'bdo', 'br', 'button', 'canvas', 'cite', 'a', 'abbr', 'area', 'audio', 'b', 'bdi', 'bdo', 'br', 'button', 'canvas', 'cite',
@ -73,13 +79,17 @@ module.exports = {
'object', 'output', 'progress', 'q', 'ruby', 's', 'samp', 'select', 'small', 'object', 'output', 'progress', 'q', 'ruby', 's', 'samp', 'select', 'small',
'span', 'strong', 'sub', 'sup', 'svg', 'template', 'textarea', 'time', 'u', 'var', 'span', 'strong', 'sub', 'sup', 'svg', 'template', 'textarea', 'time', 'u', 'var',
'video', 'wbr', 'text', 'video', 'wbr', 'text',
'acronym', 'address', 'big', 'dt', 'ins', 'small', 'strike', 'tt', 'acronym', 'address', 'big', 'dt', 'ins', 'strike', 'tt'
'pre',
'h1', 'h2', 'h3', 'h4', 'h5', 'h6'
] ]
items: items:
type: 'string' type: 'string'
description: "List of tags (defaults to inline) that should not be reformatted" description: "List of inline tags. Behaves similar to text content, will not wrap without whitespace."
content_unformatted:
type: 'array'
default: [ 'pre', 'textarea' ]
items:
type: 'string'
description: "List of tags whose contents should not be reformatted. Attributes will be reformatted, inner html will not."
end_with_newline: end_with_newline:
type: 'boolean' type: 'boolean'
default: false default: false

View File

@ -302,11 +302,12 @@
"default": "auto", "default": "auto",
"enum": [ "enum": [
"auto", "auto",
"aligned-multiple",
"force", "force",
"force-aligned", "force-aligned",
"force-expand-multiline" "force-expand-multiline"
], ],
"description": "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)", "description": "Wrap attributes to new lines [auto|aligned-multiple|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)",
"title": "Wrap attributes", "title": "Wrap attributes",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
@ -361,6 +362,23 @@
} }
}, },
"unformatted": { "unformatted": {
"type": "array",
"default": [],
"items": {
"type": "string"
},
"description": "(Deprecated for most scenarios - consider inline or content_unformatted) List of tags that should not be reformatted at all. NOTE: Set this to [] to get improved beautifier behavior. (Supported by JS Beautify)",
"title": "Unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "unformatted",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"inline": {
"type": "array", "type": "array",
"default": [ "default": [
"a", "a",
@ -421,26 +439,38 @@
"big", "big",
"dt", "dt",
"ins", "ins",
"small",
"strike", "strike",
"tt", "tt"
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
], ],
"items": { "items": {
"type": "string" "type": "string"
}, },
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)", "description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Unformatted", "title": "Inline",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
], ],
"key": "unformatted", "key": "inline",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"content_unformatted": {
"type": "array",
"default": [
"pre",
"textarea"
],
"items": {
"type": "string"
},
"description": "List of tags whose contents should not be reformatted. Attributes will be reformatted, inner html will not. (Supported by JS Beautify)",
"title": "Content unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "content_unformatted",
"language": { "language": {
"name": "HTML", "name": "HTML",
"namespace": "html" "namespace": "html"
@ -1699,11 +1729,12 @@
"default": "auto", "default": "auto",
"enum": [ "enum": [
"auto", "auto",
"aligned-multiple",
"force", "force",
"force-aligned", "force-aligned",
"force-expand-multiline" "force-expand-multiline"
], ],
"description": "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)", "description": "Wrap attributes to new lines [auto|aligned-multiple|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)",
"title": "Wrap attributes", "title": "Wrap attributes",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
@ -1730,6 +1761,23 @@
} }
}, },
"unformatted": { "unformatted": {
"type": "array",
"default": [],
"items": {
"type": "string"
},
"description": "(Deprecated for most scenarios - consider inline or content_unformatted) List of tags that should not be reformatted at all. NOTE: Set this to [] to get improved beautifier behavior. (Supported by JS Beautify)",
"title": "Unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "unformatted",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"inline": {
"type": "array", "type": "array",
"default": [ "default": [
"a", "a",
@ -1790,26 +1838,38 @@
"big", "big",
"dt", "dt",
"ins", "ins",
"small",
"strike", "strike",
"tt", "tt"
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
], ],
"items": { "items": {
"type": "string" "type": "string"
}, },
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)", "description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Unformatted", "title": "Inline",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
], ],
"key": "unformatted", "key": "inline",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"content_unformatted": {
"type": "array",
"default": [
"pre",
"textarea"
],
"items": {
"type": "string"
},
"description": "List of tags whose contents should not be reformatted. Attributes will be reformatted, inner html will not. (Supported by JS Beautify)",
"title": "Content unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "content_unformatted",
"language": { "language": {
"name": "HTML", "name": "HTML",
"namespace": "html" "namespace": "html"
@ -2559,11 +2619,12 @@
"default": "auto", "default": "auto",
"enum": [ "enum": [
"auto", "auto",
"aligned-multiple",
"force", "force",
"force-aligned", "force-aligned",
"force-expand-multiline" "force-expand-multiline"
], ],
"description": "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)", "description": "Wrap attributes to new lines [auto|aligned-multiple|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)",
"title": "Wrap attributes", "title": "Wrap attributes",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
@ -2619,6 +2680,23 @@
} }
}, },
"unformatted": { "unformatted": {
"type": "array",
"default": [],
"items": {
"type": "string"
},
"description": "(Deprecated for most scenarios - consider inline or content_unformatted) List of tags that should not be reformatted at all. NOTE: Set this to [] to get improved beautifier behavior. (Supported by JS Beautify)",
"title": "Unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "unformatted",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"inline": {
"type": "array", "type": "array",
"default": [ "default": [
"a", "a",
@ -2679,26 +2757,38 @@
"big", "big",
"dt", "dt",
"ins", "ins",
"small",
"strike", "strike",
"tt", "tt"
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
], ],
"items": { "items": {
"type": "string" "type": "string"
}, },
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)", "description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Unformatted", "title": "Inline",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
], ],
"key": "unformatted", "key": "inline",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"content_unformatted": {
"type": "array",
"default": [
"pre",
"textarea"
],
"items": {
"type": "string"
},
"description": "List of tags whose contents should not be reformatted. Attributes will be reformatted, inner html will not. (Supported by JS Beautify)",
"title": "Content unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "content_unformatted",
"language": { "language": {
"name": "HTML", "name": "HTML",
"namespace": "html" "namespace": "html"
@ -2934,11 +3024,12 @@
"default": "auto", "default": "auto",
"enum": [ "enum": [
"auto", "auto",
"aligned-multiple",
"force", "force",
"force-aligned", "force-aligned",
"force-expand-multiline" "force-expand-multiline"
], ],
"description": "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)", "description": "Wrap attributes to new lines [auto|aligned-multiple|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)",
"title": "Wrap attributes", "title": "Wrap attributes",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
@ -2994,6 +3085,23 @@
} }
}, },
"unformatted": { "unformatted": {
"type": "array",
"default": [],
"items": {
"type": "string"
},
"description": "(Deprecated for most scenarios - consider inline or content_unformatted) List of tags that should not be reformatted at all. NOTE: Set this to [] to get improved beautifier behavior. (Supported by JS Beautify)",
"title": "Unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "unformatted",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"inline": {
"type": "array", "type": "array",
"default": [ "default": [
"a", "a",
@ -3054,26 +3162,38 @@
"big", "big",
"dt", "dt",
"ins", "ins",
"small",
"strike", "strike",
"tt", "tt"
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
], ],
"items": { "items": {
"type": "string" "type": "string"
}, },
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)", "description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Unformatted", "title": "Inline",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
], ],
"key": "unformatted", "key": "inline",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"content_unformatted": {
"type": "array",
"default": [
"pre",
"textarea"
],
"items": {
"type": "string"
},
"description": "List of tags whose contents should not be reformatted. Attributes will be reformatted, inner html will not. (Supported by JS Beautify)",
"title": "Content unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "content_unformatted",
"language": { "language": {
"name": "HTML", "name": "HTML",
"namespace": "html" "namespace": "html"
@ -5077,11 +5197,12 @@
"default": "auto", "default": "auto",
"enum": [ "enum": [
"auto", "auto",
"aligned-multiple",
"force", "force",
"force-aligned", "force-aligned",
"force-expand-multiline" "force-expand-multiline"
], ],
"description": "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline] (Supported by Marko Beautifier)", "description": "Wrap attributes to new lines [auto|aligned-multiple|force|force-aligned|force-expand-multiline] (Supported by Marko Beautifier)",
"title": "Wrap attributes", "title": "Wrap attributes",
"beautifiers": [ "beautifiers": [
"Marko Beautifier" "Marko Beautifier"
@ -5136,6 +5257,23 @@
} }
}, },
"unformatted": { "unformatted": {
"type": "array",
"default": [],
"items": {
"type": "string"
},
"description": "(Deprecated for most scenarios - consider inline or content_unformatted) List of tags that should not be reformatted at all. NOTE: Set this to [] to get improved beautifier behavior. (Supported by Marko Beautifier)",
"title": "Unformatted",
"beautifiers": [
"Marko Beautifier"
],
"key": "unformatted",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"inline": {
"type": "array", "type": "array",
"default": [ "default": [
"a", "a",
@ -5196,26 +5334,38 @@
"big", "big",
"dt", "dt",
"ins", "ins",
"small",
"strike", "strike",
"tt", "tt"
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
], ],
"items": { "items": {
"type": "string" "type": "string"
}, },
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by Marko Beautifier)", "description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by Marko Beautifier)",
"title": "Unformatted", "title": "Inline",
"beautifiers": [ "beautifiers": [
"Marko Beautifier" "Marko Beautifier"
], ],
"key": "unformatted", "key": "inline",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"content_unformatted": {
"type": "array",
"default": [
"pre",
"textarea"
],
"items": {
"type": "string"
},
"description": "List of tags whose contents should not be reformatted. Attributes will be reformatted, inner html will not. (Supported by Marko Beautifier)",
"title": "Content unformatted",
"beautifiers": [
"Marko Beautifier"
],
"key": "content_unformatted",
"language": { "language": {
"name": "HTML", "name": "HTML",
"namespace": "html" "namespace": "html"
@ -5402,11 +5552,12 @@
"default": "auto", "default": "auto",
"enum": [ "enum": [
"auto", "auto",
"aligned-multiple",
"force", "force",
"force-aligned", "force-aligned",
"force-expand-multiline" "force-expand-multiline"
], ],
"description": "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)", "description": "Wrap attributes to new lines [auto|aligned-multiple|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)",
"title": "Wrap attributes", "title": "Wrap attributes",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
@ -5462,6 +5613,23 @@
} }
}, },
"unformatted": { "unformatted": {
"type": "array",
"default": [],
"items": {
"type": "string"
},
"description": "(Deprecated for most scenarios - consider inline or content_unformatted) List of tags that should not be reformatted at all. NOTE: Set this to [] to get improved beautifier behavior. (Supported by JS Beautify)",
"title": "Unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "unformatted",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"inline": {
"type": "array", "type": "array",
"default": [ "default": [
"a", "a",
@ -5522,24 +5690,37 @@
"big", "big",
"dt", "dt",
"strike", "strike",
"tt", "tt"
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
], ],
"items": { "items": {
"type": "string" "type": "string"
}, },
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)", "description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Unformatted", "title": "Inline",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
], ],
"key": "unformatted", "key": "inline",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"content_unformatted": {
"type": "array",
"default": [
"pre",
"textarea"
],
"items": {
"type": "string"
},
"description": "List of tags whose contents should not be reformatted. Attributes will be reformatted, inner html will not. (Supported by JS Beautify)",
"title": "Content unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "content_unformatted",
"language": { "language": {
"name": "HTML", "name": "HTML",
"namespace": "html" "namespace": "html"
@ -8435,11 +8616,12 @@
"default": "auto", "default": "auto",
"enum": [ "enum": [
"auto", "auto",
"aligned-multiple",
"force", "force",
"force-aligned", "force-aligned",
"force-expand-multiline" "force-expand-multiline"
], ],
"description": "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline] (Supported by Vue Beautifier)", "description": "Wrap attributes to new lines [auto|aligned-multiple|force|force-aligned|force-expand-multiline] (Supported by Vue Beautifier)",
"title": "Wrap attributes", "title": "Wrap attributes",
"beautifiers": [ "beautifiers": [
"Vue Beautifier" "Vue Beautifier"
@ -8466,6 +8648,23 @@
} }
}, },
"unformatted": { "unformatted": {
"type": "array",
"default": [],
"items": {
"type": "string"
},
"description": "(Deprecated for most scenarios - consider inline or content_unformatted) List of tags that should not be reformatted at all. NOTE: Set this to [] to get improved beautifier behavior. (Supported by Vue Beautifier)",
"title": "Unformatted",
"beautifiers": [
"Vue Beautifier"
],
"key": "unformatted",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"inline": {
"type": "array", "type": "array",
"default": [ "default": [
"a", "a",
@ -8526,26 +8725,38 @@
"big", "big",
"dt", "dt",
"ins", "ins",
"small",
"strike", "strike",
"tt", "tt"
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
], ],
"items": { "items": {
"type": "string" "type": "string"
}, },
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by Vue Beautifier)", "description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by Vue Beautifier)",
"title": "Unformatted", "title": "Inline",
"beautifiers": [ "beautifiers": [
"Vue Beautifier" "Vue Beautifier"
], ],
"key": "unformatted", "key": "inline",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"content_unformatted": {
"type": "array",
"default": [
"pre",
"textarea"
],
"items": {
"type": "string"
},
"description": "List of tags whose contents should not be reformatted. Attributes will be reformatted, inner html will not. (Supported by Vue Beautifier)",
"title": "Content unformatted",
"beautifiers": [
"Vue Beautifier"
],
"key": "content_unformatted",
"language": { "language": {
"name": "HTML", "name": "HTML",
"namespace": "html" "namespace": "html"
@ -8889,11 +9100,12 @@
"default": "auto", "default": "auto",
"enum": [ "enum": [
"auto", "auto",
"aligned-multiple",
"force", "force",
"force-aligned", "force-aligned",
"force-expand-multiline" "force-expand-multiline"
], ],
"description": "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)", "description": "Wrap attributes to new lines [auto|aligned-multiple|force|force-aligned|force-expand-multiline] (Supported by JS Beautify)",
"title": "Wrap attributes", "title": "Wrap attributes",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
@ -8949,6 +9161,23 @@
} }
}, },
"unformatted": { "unformatted": {
"type": "array",
"default": [],
"items": {
"type": "string"
},
"description": "(Deprecated for most scenarios - consider inline or content_unformatted) List of tags that should not be reformatted at all. NOTE: Set this to [] to get improved beautifier behavior. (Supported by JS Beautify)",
"title": "Unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "unformatted",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"inline": {
"type": "array", "type": "array",
"default": [ "default": [
"a", "a",
@ -9009,26 +9238,38 @@
"big", "big",
"dt", "dt",
"ins", "ins",
"small",
"strike", "strike",
"tt", "tt"
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
], ],
"items": { "items": {
"type": "string" "type": "string"
}, },
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)", "description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Unformatted", "title": "Inline",
"beautifiers": [ "beautifiers": [
"JS Beautify" "JS Beautify"
], ],
"key": "unformatted", "key": "inline",
"language": {
"name": "HTML",
"namespace": "html"
}
},
"content_unformatted": {
"type": "array",
"default": [
"pre",
"textarea"
],
"items": {
"type": "string"
},
"description": "List of tags whose contents should not be reformatted. Attributes will be reformatted, inner html will not. (Supported by JS Beautify)",
"title": "Content unformatted",
"beautifiers": [
"JS Beautify"
],
"key": "content_unformatted",
"language": { "language": {
"name": "HTML", "name": "HTML",
"namespace": "html" "namespace": "html"