Merge branch 'master' into master

This commit is contained in:
Steven Zeck 2018-09-11 20:05:17 -05:00 committed by GitHub
commit 0968599c86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 1607 additions and 1159 deletions

View File

@ -41,8 +41,6 @@ addons:
- git
- libgnome-keyring-dev
- fakeroot
- crystal
- camlp4
- aspcud
- php5-cli
- golang

View File

@ -1,4 +1,11 @@
# Next
# 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)
- Remove dependency marko-prettyprint in an effort to resolve installation and update issues
# v0.33.0 (2018-08-10)
- Fixes an issue where Atom Beautify would display a Docker error instead of an executable error ([#2146](https://github.com/Glavin001/atom-beautify/issues/2146))
- Fixes Rubocop not excluding files with an exact pattern match (`db/schema.rb` vs `db/**/*`)
- Add [Black](http://github.com/ambv/black) beautifier for Python.

View File

@ -121,6 +121,7 @@ Some of the supported beautifiers are developed for Node.js and are automaticall
| Lua beautifier | :white_check_mark: | :ok_hand: Not necessary | :smiley: Nothing! |
| Marko Beautifier | :white_check_mark: | :ok_hand: Not necessary | :smiley: Nothing! |
| Nginx Beautify | :white_check_mark: | :ok_hand: Not necessary | :smiley: Nothing! |
| ocamlformat | :warning: 1 executable | :x: No Docker support | :bookmark_tabs: Manually:<br/>1. Install [ocamlformat (`ocamlformat`)](https://github.com/ocaml-ppx/ocamlformat) by following https://github.com/ocaml-ppx/ocamlformat#installation<br/> |
| ocp-indent | :warning: 1 executable | :white_check_mark: :100:% of executables | :whale: With [Docker](https://www.docker.com/):<br/>1. Install [ocp-indent (`ocp-indent`)](https://www.typerex.org/ocp-indent.html) with `docker pull unibeautify/ocp-indent`<br/><br/>:bookmark_tabs: Manually:<br/>1. Install [ocp-indent (`ocp-indent`)](https://www.typerex.org/ocp-indent.html) by following https://www.typerex.org/ocp-indent.html#installation<br/> |
| Perltidy | :warning: Manual installation | :construction: Not an executable | :page_facing_up: Go to http://perltidy.sourceforge.net/ and follow the instructions. |
| PHP-CS-Fixer | :warning: 2 executables | :warning: Only 1 of 2 executables | :whale: With [Docker](https://www.docker.com/):<br/>1. Install [PHP-CS-Fixer (`php-cs-fixer`)](https://github.com/FriendsOfPHP/PHP-CS-Fixer) with `docker pull unibeautify/php-cs-fixer`<br/><br/>:bookmark_tabs: Manually:<br/>1. Install [PHP (`php`)](http://php.net/) by following http://php.net/manual/en/install.php<br/>2. Install [PHP-CS-Fixer (`php-cs-fixer`)](https://github.com/FriendsOfPHP/PHP-CS-Fixer) by following https://github.com/FriendsOfPHP/PHP-CS-Fixer#installation<br/> |
@ -192,7 +193,7 @@ See [all supported options in the documentation at `docs/options.md`](docs/opti
| Nginx | `nginx` |`.conf` | **[`Nginx Beautify`](https://github.com/denysvitali/nginxbeautify)** |
| Nunjucks | `Nunjucks`, `Nunjucks Templates`, `HTML (Nunjucks Templates)` |`.njk`, `.nunjucks` | **[`Pretty Diff`](https://github.com/prettydiff/prettydiff)** |
| Objective-C | `Objective-C`, `Objective-C++` |`.m`, `.mm`, `.h` | **[`Uncrustify`](https://github.com/uncrustify/uncrustify)**, [`clang-format`](https://clang.llvm.org/docs/ClangFormat.html) |
| OCaml | `OCaml` |`.ml` | **[`ocp-indent`](https://www.typerex.org/ocp-indent.html)** |
| OCaml | `OCaml` |`.ml` | **[`ocp-indent`](https://www.typerex.org/ocp-indent.html)**, [`ocamlformat`](https://github.com/ocaml-ppx/ocamlformat) |
| Pawn | `Pawn` | | **[`Uncrustify`](https://github.com/uncrustify/uncrustify)** |
| Perl | `Perl`, `Perl 6` |`.pl`, `.PL`, `.pm`, `.pod`, `.t` | **[`Perltidy`](http://perltidy.sourceforge.net/)** |
| PHP | `PHP` |`.php`, `.module`, `.inc` | **[`PHP-CS-Fixer`](https://github.com/FriendsOfPHP/PHP-CS-Fixer)**, [`PHPCBF`](http://php.net/manual/en/install.php), [`hh_format`](http://hhvm.com/) |

View File

@ -1,4 +1,3 @@
language-marko
language-html-swig
language-svg
language-d

File diff suppressed because it is too large Load Diff

View File

@ -13,7 +13,7 @@ def example1():
def example2(): return {'has_key() is deprecated': True}.has_key(
{'f': 2}.has_key(''));
{'f': 2}.has_key(''))
class Example3(object):

View File

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

View File

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

441
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "atom-beautify",
"version": "0.32.5",
"version": "0.33.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -117,16 +117,6 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
"integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg="
},
"app-module-path": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz",
"integrity": "sha1-ZBqlXft9am8KgUHEucCqULbCTdU="
},
"argly": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/argly/-/argly-1.2.0.tgz",
"integrity": "sha1-KydORVGin/XnGZ0u2XiOtm7TbmA="
},
"argparse": {
"version": "0.1.16",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
@ -169,11 +159,6 @@
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
},
"assertion-error": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
"integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="
},
"async": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
@ -329,11 +314,6 @@
"concat-map": "0.0.1"
}
},
"browser-refresh-client": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/browser-refresh-client/-/browser-refresh-client-1.1.4.tgz",
"integrity": "sha1-jl/4R1/h1UHSroH3oa6gWuIaYhc="
},
"buffer-from": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
@ -378,16 +358,6 @@
"lazy-cache": "^1.0.3"
}
},
"chai": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
"integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=",
"requires": {
"assertion-error": "^1.0.1",
"deep-eql": "^0.1.3",
"type-detect": "^1.0.0"
}
},
"chalk": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
@ -398,11 +368,6 @@
"strip-ansi": "~0.1.0"
}
},
"char-props": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/char-props/-/char-props-0.1.5.tgz",
"integrity": "sha1-W5UvniDqIc0Iyn/hNaEPb+kcEJ4="
},
"character-entities": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz",
@ -861,14 +826,6 @@
"readable-stream": "^2.0.4"
}
},
"complain": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/complain/-/complain-1.2.0.tgz",
"integrity": "sha512-aP/MxFoYYVUZ8Xdih1vyaTSRiD99XLnlCloNre/UjFQFJkZ6YuMbGksi0jfxKeFOdlzm/6eE01vpJc99HiN/Mg==",
"requires": {
"error-stack-parser": "^2.0.1"
}
},
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@ -993,11 +950,6 @@
"integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
"dev": true
},
"cssbeautify": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/cssbeautify/-/cssbeautify-0.3.1.tgz",
"integrity": "sha1-Et0fc0A1wub6ymfcvc73TkKBE5c="
},
"csscomb": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/csscomb/-/csscomb-4.2.0.tgz",
@ -1100,21 +1052,6 @@
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
},
"deep-eql": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
"integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=",
"requires": {
"type-detect": "0.1.1"
},
"dependencies": {
"type-detect": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
"integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI="
}
}
},
"deep-equal": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
@ -1154,16 +1091,6 @@
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
},
"deresolve": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/deresolve/-/deresolve-1.1.2.tgz",
"integrity": "sha1-nPI3nI0tYx3EuZVylLkOSnLLbOA=",
"requires": {
"lasso-package-root": "^1.0.0",
"raptor-polyfill": "^1.0.2",
"resolve-from": "^1.0.1"
}
},
"diff": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
@ -1281,14 +1208,6 @@
"resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
"integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY="
},
"error-stack-parser": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.2.tgz",
"integrity": "sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==",
"requires": {
"stackframe": "^1.0.4"
}
},
"es5-ext": {
"version": "0.10.45",
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz",
@ -1369,31 +1288,6 @@
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
},
"escodegen": {
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
"integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
"requires": {
"esprima": "^3.1.3",
"estraverse": "^4.2.0",
"esutils": "^2.0.2",
"optionator": "^0.8.1",
"source-map": "~0.6.1"
},
"dependencies": {
"esprima": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"optional": true
}
}
},
"eslint": {
"version": "4.19.1",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
@ -1600,19 +1494,6 @@
"resolved": "https://registry.npmjs.org/event-kit/-/event-kit-2.5.0.tgz",
"integrity": "sha512-tUDxeNC9JzN2Tw/f8mLtksY34v1hHmaR7lV7X4p04XSjaeUhFMfzjF6Nwov9e0EKGEx63BaKcgXKxjpQaPo0wg=="
},
"events": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
},
"events-light": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/events-light/-/events-light-1.0.5.tgz",
"integrity": "sha1-lk5jRQugr0prAiqpVbF//vZXte4=",
"requires": {
"chai": "^3.5.0"
}
},
"execa": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz",
@ -2151,11 +2032,6 @@
"sntp": "2.x.x"
}
},
"he": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
},
"hike": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/hike/-/hike-0.1.4.tgz",
@ -2183,15 +2059,6 @@
"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8="
},
"htmljs-parser": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/htmljs-parser/-/htmljs-parser-2.3.2.tgz",
"integrity": "sha1-HMW/mCSgkcKIILM+r3gIOo6qhWw=",
"requires": {
"char-props": "^0.1.5",
"complain": "^1.0.0"
}
},
"htmlparser2": {
"version": "3.8.3",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
@ -2270,11 +2137,6 @@
"resolved": "https://registry.npmjs.org/indent/-/indent-0.0.2.tgz",
"integrity": "sha1-jHnwgBkFWbaHA0uEx676l9WpEdk="
},
"indent-string": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
"integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok="
},
"inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@ -2482,36 +2344,16 @@
"integrity": "sha1-IoveaYoMYUMdwmMKahVPFYkNIxc="
},
"js-beautify": {
"version": "1.7.5",
"resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz",
"integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==",
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.1.tgz",
"integrity": "sha512-e6Ij+fcwlnhxwfEWH148AV240ocW6z6LTZtWc9V7QEOUMu7pe2EINYbO1sM4GPHFwTVWMUWBCXGgsJGRpaQPLQ==",
"requires": {
"config-chain": "~1.1.5",
"editorconfig": "^0.13.2",
"editorconfig": "^0.15.0",
"mkdirp": "~0.5.0",
"nopt": "~3.0.1"
"nopt": "~4.0.1"
},
"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": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
@ -2760,31 +2602,6 @@
"is-buffer": "^1.1.5"
}
},
"lasso-caching-fs": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/lasso-caching-fs/-/lasso-caching-fs-1.0.2.tgz",
"integrity": "sha1-m+TrHwaqwSYDRMrq70LC8AhusQ0=",
"requires": {
"raptor-async": "^1.1.2"
}
},
"lasso-modules-client": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/lasso-modules-client/-/lasso-modules-client-2.0.5.tgz",
"integrity": "sha1-2aBnJKkAl3Y2lxZn7pwXDS/E3Sg=",
"requires": {
"lasso-package-root": "^1.0.0",
"raptor-polyfill": "^1.0.2"
}
},
"lasso-package-root": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/lasso-package-root/-/lasso-package-root-1.0.1.tgz",
"integrity": "sha1-mX0OcfQdA8Xw+gmlvCmNeW+LLCM=",
"requires": {
"lasso-caching-fs": "^1.0.0"
}
},
"lazy": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz",
@ -2813,11 +2630,6 @@
"type-check": "~0.3.2"
}
},
"listener-tracker": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/listener-tracker/-/listener-tracker-2.0.0.tgz",
"integrity": "sha1-OWCLQ1wJAfpVECF8FFJyjWvBm18="
},
"load-plugin": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/load-plugin/-/load-plugin-2.2.2.tgz",
@ -2874,115 +2686,6 @@
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.2.tgz",
"integrity": "sha1-AV2xWIZEOPJKZL3WGgQotBhwbQk="
},
"marko": {
"version": "4.10.0",
"resolved": "https://registry.npmjs.org/marko/-/marko-4.10.0.tgz",
"integrity": "sha512-J9c2f/YsG/s9BI4Qnlvy2ASsAff7Qt7nNLgpk5eBjDDa2TLfyKXIxLeDkaVPnPd358Esz41XUcMlwSygR4nKow==",
"requires": {
"app-module-path": "^2.2.0",
"argly": "^1.0.0",
"browser-refresh-client": "^1.0.0",
"char-props": "~0.1.5",
"complain": "^1.2.0",
"deresolve": "^1.1.2",
"escodegen": "^1.8.1",
"esprima": "^4.0.0",
"estraverse": "^4.2.0",
"events": "^1.0.2",
"events-light": "^1.0.0",
"he": "^1.1.0",
"htmljs-parser": "^2.3.2",
"lasso-caching-fs": "^1.0.1",
"lasso-modules-client": "^2.0.4",
"lasso-package-root": "^1.0.1",
"listener-tracker": "^2.0.0",
"minimatch": "^3.0.2",
"object-assign": "^4.1.0",
"property-handlers": "^1.0.0",
"raptor-json": "^1.0.1",
"raptor-polyfill": "^1.0.0",
"raptor-promises": "^1.0.1",
"raptor-regexp": "^1.0.0",
"raptor-util": "^3.2.0",
"resolve-from": "^2.0.0",
"shorthash": "0.0.2",
"simple-sha1": "^2.1.0",
"strip-json-comments": "^2.0.1",
"try-require": "^1.2.1",
"warp10": "^1.0.0"
},
"dependencies": {
"esprima": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
"integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
},
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"requires": {
"brace-expansion": "^1.1.7"
}
},
"resolve-from": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
"integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
}
}
},
"marko-prettyprint": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/marko-prettyprint/-/marko-prettyprint-1.4.1.tgz",
"integrity": "sha512-W4RetKBFoB8XIe2KqtqMMZQArlh24gBBCM0zFbwcCK2AmCB6FVOAdEyYGvtPdifrGHVFTpUA/qmCkUN0UIrsOA==",
"requires": {
"argly": "^1.0.0",
"cssbeautify": "^0.3.1",
"editorconfig": "^0.13.2",
"lasso-package-root": "^1.0.0",
"marko": "^4.0.0",
"minimatch": "^3.0.0",
"prettier": "^1.8.2",
"redent": "^2.0.0",
"resolve-from": "^3.0.0"
},
"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"
}
},
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"requires": {
"brace-expansion": "^1.1.7"
}
},
"resolve-from": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
}
}
},
"mdast-util-compact": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
@ -3172,11 +2875,12 @@
}
},
"nopt": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"requires": {
"abbrev": "1"
"abbrev": "1",
"osenv": "^0.1.4"
}
},
"npm-prefix": {
@ -3288,6 +2992,15 @@
"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"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": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@ -3459,11 +3172,6 @@
"mixto": "1.x"
}
},
"property-handlers": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/property-handlers/-/property-handlers-1.1.1.tgz",
"integrity": "sha1-yyDTIqq32U//rCj0bJGGvVlHtLQ="
},
"proto-list": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
@ -3484,68 +3192,11 @@
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
},
"q": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
},
"qs": {
"version": "6.5.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
},
"raptor-async": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/raptor-async/-/raptor-async-1.1.3.tgz",
"integrity": "sha1-uDw8m2A9yYXCw6n3jStAc+b2Akw="
},
"raptor-json": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/raptor-json/-/raptor-json-1.1.0.tgz",
"integrity": "sha1-cL0JsU5k99MuxQzOg3fWApwPCHY=",
"requires": {
"raptor-strings": "^1.0.0"
}
},
"raptor-polyfill": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/raptor-polyfill/-/raptor-polyfill-1.0.2.tgz",
"integrity": "sha1-ZXW852JUDYRAVtcc7xFmJIj1E+0="
},
"raptor-promises": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/raptor-promises/-/raptor-promises-1.0.3.tgz",
"integrity": "sha1-1XaxEOBCNlT3/fFyHijULk3DwOs=",
"requires": {
"q": "^1.0.1",
"raptor-util": "^1.0.0"
},
"dependencies": {
"raptor-util": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/raptor-util/-/raptor-util-1.1.2.tgz",
"integrity": "sha1-8u6AdqmuPq4uZWcuRqIgB0+i3/M="
}
}
},
"raptor-regexp": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/raptor-regexp/-/raptor-regexp-1.0.1.tgz",
"integrity": "sha1-7PD2bGZxwM2fXkjDcFAmxVCZlcA="
},
"raptor-strings": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/raptor-strings/-/raptor-strings-1.0.2.tgz",
"integrity": "sha1-ks4ssBU6/pBHDYA5oCVbTPM6tfw=",
"requires": {
"raptor-polyfill": "^1.0.1"
}
},
"raptor-util": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/raptor-util/-/raptor-util-3.2.0.tgz",
"integrity": "sha1-I7DIA8jxrIocrmfZpjiLSRYcl1g="
},
"rc": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@ -3586,15 +3237,6 @@
"util-deprecate": "~1.0.1"
}
},
"redent": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
"integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
"requires": {
"indent-string": "^3.0.0",
"strip-indent": "^2.0.0"
}
},
"regenerator-runtime": {
"version": "0.10.5",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
@ -3775,11 +3417,6 @@
"is-promise": "^2.1.0"
}
},
"rusha": {
"version": "0.8.13",
"resolved": "https://registry.npmjs.org/rusha/-/rusha-0.8.13.tgz",
"integrity": "sha1-mghOe4YLF7/zAVuSxnpqM2GRUTo="
},
"rx-lite": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
@ -3930,11 +3567,6 @@
"integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
"dev": true
},
"shorthash": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/shorthash/-/shorthash-0.0.2.tgz",
"integrity": "sha1-WbJo7sveWQOLMNogK8+93rLEpOs="
},
"sigmund": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
@ -3945,14 +3577,6 @@
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
},
"simple-sha1": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.1.tgz",
"integrity": "sha512-pFMPd+I/lQkpf4wFUeS/sED5IqdIG1lUlrQviBMV4u4mz8BRAcB5fvUx5Ckfg3kBigEglAjHg7E9k/yy2KlCqA==",
"requires": {
"rusha": "^0.8.1"
}
},
"slice-ansi": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
@ -4028,11 +3652,6 @@
"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
"integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
},
"stackframe": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
"integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw=="
},
"state-toggle": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz",
@ -4111,11 +3730,6 @@
"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
},
"strip-indent": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
"integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g="
},
"strip-json-comments": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
@ -4284,11 +3898,6 @@
"resolved": "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz",
"integrity": "sha512-FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ=="
},
"try-require": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/try-require/-/try-require-1.2.1.tgz",
"integrity": "sha1-NEiaLKwMCcHMEO2RugEVlNQzO+I="
},
"tunnel-agent": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@ -4311,11 +3920,6 @@
"prelude-ls": "~1.1.2"
}
},
"type-detect": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz",
"integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI="
},
"typedarray": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@ -4615,11 +4219,6 @@
"integrity": "sha512-HFhaD4mMWPzFSqhpyDG48KDdrjfn409YQuVW7ckZYhW4sE87mYtWifdB/+73RA7+p4s4K18n5Jfx1kHthE1gBw==",
"dev": true
},
"warp10": {
"version": "1.3.6",
"resolved": "https://registry.npmjs.org/warp10/-/warp10-1.3.6.tgz",
"integrity": "sha512-7cijX+NprqPV+UGUZXZw1I15JFHPqoy65tNVvP6cL43Vlanpcm8hBYoQTuDYUHa5x90Bct4gHhRtqqOOkLhQkw=="
},
"which": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",

View File

@ -1,7 +1,7 @@
{
"name": "atom-beautify",
"main": "./src/beautify",
"version": "0.32.5",
"version": "0.33.1",
"private": true,
"description": "Beautify HTML, CSS, JavaScript, PHP, Python, Ruby, Java, C, C++, C#, Objective-C, CoffeeScript, TypeScript, Coldfusion, SQL, and more in Atom",
"repository": "https://github.com/Glavin001/atom-beautify.git",
@ -172,6 +172,10 @@
{
"name": "Arlo Shallit",
"url": "https://github.com/arl-o"
},
{
"name": "Liam Newman",
"url": "https://github.com/bitwiseman"
}
],
"engines": {
@ -195,11 +199,10 @@
"extend": "^3.0.1",
"gherkin": "^2.12.2",
"handlebars": "^4.0.11",
"js-beautify": "^1.7.5",
"js-beautify": "^1.8.1",
"jscs": "^3.0.7",
"lodash": "^4.17.4",
"loophole": "^1.1.0",
"marko-prettyprint": "^1.4.0",
"nginxbeautify": "^2.0.1",
"node-cljfmt": "0.5.3",
"node-dir": "0.1.17",
@ -451,7 +454,8 @@
"vhdl beautifier",
"gn",
"blade",
"black"
"black",
"ocamlformat"
],
"devDependencies": {
"codo": "^2.1.2",
@ -490,4 +494,4 @@
"prettydiff2"
]
}
}
}

View File

@ -46,7 +46,7 @@ describe "BeautifyLanguages", ->
allLanguages = [
"blade", "c", "clojure", "coffee-script", "css", "csharp", "d",
"gfm", "go", "html", "html-swig", "java", "javascript",
"json", "less", "lua", "marko", "mustache", "objective-c",
"json", "less", "lua", "mustache", "objective-c",
"perl", "php", "python", "ruby", "sass", "sql",
"svg", "xml"
]

View File

@ -88,6 +88,7 @@ module.exports = class Beautifiers extends EventEmitter
'beautysh'
'terraformfmt'
'verilog-mode'
'ocamlformat'
]
###

View File

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

View File

@ -0,0 +1,38 @@
###
Requires https://github.com/ocaml-ppx/ocamlformat
###
"use strict"
Beautifier = require('./beautifier')
module.exports = class OCamlFormat extends Beautifier
name: "ocamlformat"
link: "https://github.com/ocaml-ppx/ocamlformat"
executables: [
{
name: "ocamlformat"
cmd: "ocamlformat"
homepage: "https://github.com/ocaml-ppx/ocamlformat"
installation: "https://github.com/ocaml-ppx/ocamlformat#installation"
version: {
parse: (text) ->
try
text.match(/(\d+\.\d+\.\d+)/)[1]
catch
text.match(/(\d+\.\d+)/)[1] + ".0"
}
}
]
options: {
OCaml: true
}
beautify: (text, language, options) ->
@run("ocamlformat", [
@tempFile("input", text)
], {
help: {
link: "https://github.com/ocaml-ppx/ocamlformat"
}
})

View File

@ -49,8 +49,8 @@ module.exports = {
wrap_attributes:
type: 'string'
default: "auto"
enum: ["auto", "force", "force-aligned", "force-expand-multiline"]
description: "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline]"
enum: ["auto", "aligned-multiple", "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:
type: 'integer'
default: null
@ -65,6 +65,12 @@ module.exports = {
default: 10
description: "Number of line-breaks to be preserved in one chunk"
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'
default: [
'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',
'span', 'strong', 'sub', 'sup', 'svg', 'template', 'textarea', 'time', 'u', 'var',
'video', 'wbr', 'text',
'acronym', 'address', 'big', 'dt', 'ins', 'small', 'strike', 'tt',
'pre',
'h1', 'h2', 'h3', 'h4', 'h5', 'h6'
'acronym', 'address', 'big', 'dt', 'ins', 'strike', 'tt'
]
items:
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:
type: 'boolean'
default: false

View File

@ -302,11 +302,12 @@
"default": "auto",
"enum": [
"auto",
"aligned-multiple",
"force",
"force-aligned",
"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",
"beautifiers": [
"JS Beautify"
@ -361,6 +362,23 @@
}
},
"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",
"default": [
"a",
@ -421,26 +439,38 @@
"big",
"dt",
"ins",
"small",
"strike",
"tt",
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
"tt"
],
"items": {
"type": "string"
},
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)",
"title": "Unformatted",
"description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Inline",
"beautifiers": [
"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": {
"name": "HTML",
"namespace": "html"
@ -1699,11 +1729,12 @@
"default": "auto",
"enum": [
"auto",
"aligned-multiple",
"force",
"force-aligned",
"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",
"beautifiers": [
"JS Beautify"
@ -1730,6 +1761,23 @@
}
},
"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",
"default": [
"a",
@ -1790,26 +1838,38 @@
"big",
"dt",
"ins",
"small",
"strike",
"tt",
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
"tt"
],
"items": {
"type": "string"
},
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)",
"title": "Unformatted",
"description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Inline",
"beautifiers": [
"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": {
"name": "HTML",
"namespace": "html"
@ -2559,11 +2619,12 @@
"default": "auto",
"enum": [
"auto",
"aligned-multiple",
"force",
"force-aligned",
"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",
"beautifiers": [
"JS Beautify"
@ -2619,6 +2680,23 @@
}
},
"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",
"default": [
"a",
@ -2679,26 +2757,38 @@
"big",
"dt",
"ins",
"small",
"strike",
"tt",
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
"tt"
],
"items": {
"type": "string"
},
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)",
"title": "Unformatted",
"description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Inline",
"beautifiers": [
"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": {
"name": "HTML",
"namespace": "html"
@ -2934,11 +3024,12 @@
"default": "auto",
"enum": [
"auto",
"aligned-multiple",
"force",
"force-aligned",
"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",
"beautifiers": [
"JS Beautify"
@ -2994,6 +3085,23 @@
}
},
"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",
"default": [
"a",
@ -3054,26 +3162,38 @@
"big",
"dt",
"ins",
"small",
"strike",
"tt",
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
"tt"
],
"items": {
"type": "string"
},
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)",
"title": "Unformatted",
"description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Inline",
"beautifiers": [
"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": {
"name": "HTML",
"namespace": "html"
@ -5077,11 +5197,12 @@
"default": "auto",
"enum": [
"auto",
"aligned-multiple",
"force",
"force-aligned",
"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",
"beautifiers": [
"Marko Beautifier"
@ -5136,6 +5257,23 @@
}
},
"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",
"default": [
"a",
@ -5196,26 +5334,38 @@
"big",
"dt",
"ins",
"small",
"strike",
"tt",
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
"tt"
],
"items": {
"type": "string"
},
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by Marko Beautifier)",
"title": "Unformatted",
"description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by Marko Beautifier)",
"title": "Inline",
"beautifiers": [
"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": {
"name": "HTML",
"namespace": "html"
@ -5402,11 +5552,12 @@
"default": "auto",
"enum": [
"auto",
"aligned-multiple",
"force",
"force-aligned",
"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",
"beautifiers": [
"JS Beautify"
@ -5462,6 +5613,23 @@
}
},
"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",
"default": [
"a",
@ -5522,24 +5690,37 @@
"big",
"dt",
"strike",
"tt",
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
"tt"
],
"items": {
"type": "string"
},
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)",
"title": "Unformatted",
"description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Inline",
"beautifiers": [
"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": {
"name": "HTML",
"namespace": "html"
@ -5875,7 +6056,8 @@
"description": "Options for language OCaml",
"collapsed": true,
"beautifiers": [
"ocp-indent"
"ocp-indent",
"ocamlformat"
],
"grammars": [
"OCaml"
@ -5898,7 +6080,8 @@
"default": "ocp-indent",
"description": "Default Beautifier to be used for OCaml",
"enum": [
"ocp-indent"
"ocp-indent",
"ocamlformat"
]
},
"beautify_on_save": {
@ -8437,11 +8620,12 @@
"default": "auto",
"enum": [
"auto",
"aligned-multiple",
"force",
"force-aligned",
"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",
"beautifiers": [
"Vue Beautifier"
@ -8468,6 +8652,23 @@
}
},
"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",
"default": [
"a",
@ -8528,26 +8729,38 @@
"big",
"dt",
"ins",
"small",
"strike",
"tt",
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
"tt"
],
"items": {
"type": "string"
},
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by Vue Beautifier)",
"title": "Unformatted",
"description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by Vue Beautifier)",
"title": "Inline",
"beautifiers": [
"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": {
"name": "HTML",
"namespace": "html"
@ -8891,11 +9104,12 @@
"default": "auto",
"enum": [
"auto",
"aligned-multiple",
"force",
"force-aligned",
"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",
"beautifiers": [
"JS Beautify"
@ -8951,6 +9165,23 @@
}
},
"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",
"default": [
"a",
@ -9011,26 +9242,38 @@
"big",
"dt",
"ins",
"small",
"strike",
"tt",
"pre",
"h1",
"h2",
"h3",
"h4",
"h5",
"h6"
"tt"
],
"items": {
"type": "string"
},
"description": "List of tags (defaults to inline) that should not be reformatted (Supported by JS Beautify)",
"title": "Unformatted",
"description": "List of inline tags. Behaves similar to text content, will not wrap without whitespace. (Supported by JS Beautify)",
"title": "Inline",
"beautifiers": [
"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": {
"name": "HTML",
"namespace": "html"
@ -9696,6 +9939,22 @@
"description": "Absolute path to the \"terraform\" executable's binary/script."
}
}
},
"ocamlformat": {
"key": "ocamlformat",
"title": "ocamlformat",
"type": "object",
"collapsed": true,
"description": "Options for ocamlformat executable.",
"properties": {
"path": {
"key": "path",
"title": "Binary/Script Path",
"type": "string",
"default": "",
"description": "Absolute path to the \"ocamlformat\" executable's binary/script."
}
}
}
}
}