Compare commits
No commits in common. "master" and "v0.32.0" have entirely different histories.
|
|
@ -1,15 +0,0 @@
|
|||
labelName: waiting-for-user-information
|
||||
|
||||
labelColor: f7c6c7
|
||||
|
||||
commentText: >
|
||||
Please follow the [issue template](https://github.com/Glavin001/atom-beautify/blob/master/ISSUE_TEMPLATE.md) provided.
|
||||
More specifically, update the original comment for this issue by adding a link to the
|
||||
required [debug.md](https://github.com/Glavin001/atom-beautify/blob/master/docs/troubleshooting.md#how-to-create-debugmd-gist)
|
||||
gist which includes debugging information that answers our most commonly asked questions.
|
||||
Thank you.
|
||||
|
||||
checkCheckboxes: true
|
||||
|
||||
keywords:
|
||||
- gist.github.com
|
||||
11
.travis.yml
11
.travis.yml
|
|
@ -41,6 +41,8 @@ addons:
|
|||
- git
|
||||
- libgnome-keyring-dev
|
||||
- fakeroot
|
||||
- crystal
|
||||
- camlp4
|
||||
- aspcud
|
||||
- php5-cli
|
||||
- golang
|
||||
|
|
@ -58,17 +60,16 @@ before_install:
|
|||
# linux: Install Nix, Nix packages, upgrade pip, and install python packages
|
||||
# osx: Update Homebrew, remove conflicting cask, brew bundle, symlink elm-format,
|
||||
# upgrade pip, and install python packages
|
||||
- echo $TRAVIS_COMMIT_MESSAGE
|
||||
- export TRAVIS_COMMIT_MESSAGE=""
|
||||
- echo $TRAVIS_COMMIT_MESSAGE
|
||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
curl https://nixos.org/nix/install | sh &&
|
||||
. ~/.nix-profile/etc/profile.d/nix.sh &&
|
||||
nix-env -i uncrustify R elm-format terraform atom atom-beta &&
|
||||
nix-env -i uncrustify R elm-format terraform atom atom-beta opam &&
|
||||
pip install --upgrade pip &&
|
||||
pip install --user -r requirements.txt;
|
||||
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||
brew update && brew cask zap oclint && brew bundle &&
|
||||
ln -s /usr/local/bin/elm-format-0.17 /usr/local/bin/elm-format &&
|
||||
pip2 install --upgrade pip &&
|
||||
pip2 install -r requirements.txt;
|
||||
else
|
||||
echo Error:TRAVIS_OS_NAME && exit 1;
|
||||
|
|
@ -79,6 +80,8 @@ before_install:
|
|||
- Rscript --version
|
||||
# PHP
|
||||
- composer install
|
||||
# CoffeeScript
|
||||
- npm install coffee-formatter
|
||||
# OCaml
|
||||
# - opam init --auto-setup
|
||||
# Init environment variables for opam
|
||||
|
|
|
|||
2
Brewfile
2
Brewfile
|
|
@ -1,7 +1,9 @@
|
|||
tap 'homebrew/php'
|
||||
tap 'caskroom/versions'
|
||||
brew 'uncrustify'
|
||||
brew 'r'
|
||||
brew 'composer'
|
||||
brew 'opam'
|
||||
brew 'crystal-lang'
|
||||
brew 'terraform'
|
||||
brew 'elm-format'
|
||||
|
|
|
|||
51
CHANGELOG.md
51
CHANGELOG.md
|
|
@ -1,48 +1,7 @@
|
|||
# v0.33.4 (2018-09-28)
|
||||
# Next
|
||||
- ...
|
||||
|
||||
- Fix [#2204](https://github.com/Glavin001/atom-beautify/issues/2204). Auto-remove docker containers after run.
|
||||
|
||||
You can clean up old Docker containers by running:
|
||||
|
||||
```bash
|
||||
docker ps --all | grep "unibeautify/" | awk '{ print $1 }' | xargs docker rm
|
||||
```
|
||||
|
||||
# v0.33.2 (2018-09-26)
|
||||
- (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))
|
||||
- ocamlformat formatter added for OCaml [#2207](https://github.com/Glavin001/atom-beautify/pull/2207)
|
||||
- [Black](https://github.com/ambv/black) beautifier added [#2189](https://github.com/Glavin001/atom-beautify/pull/2189)
|
||||
|
||||
# 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.
|
||||
|
||||
# v0.32.5 (2018-05-28)
|
||||
- Fixes an issue with Rubocop not working on Windows ([#2092](https://github.com/Glavin001/atom-beautify/issues/2092))
|
||||
- Fixes an issue with PHPCBF not running when specifying a path to it ([#2140](https://github.com/Glavin001/atom-beautify/issues/2140))
|
||||
- Fixes the repository link to Atom Beautify within Atom's settings ([#2086](https://github.com/Glavin001/atom-beautify/pull/2086))
|
||||
|
||||
# v0.32.4 (2018-05-15)
|
||||
- Fix php-cs-fixer not running when using `.phar` files ([#2134](https://github.com/Glavin001/atom-beautify/pull/2134))
|
||||
- Fix error `Error is not defined` ([#2134](https://github.com/Glavin001/atom-beautify/pull/2134))
|
||||
|
||||
# v0.32.3 (2018-05-14)
|
||||
- Issue [#448](https://github.com/Glavin001/atom-beautify/issues/448) Add support for Laravel Blade templates (beta)
|
||||
- Fix Docker Executable with optional Executable, PHP-CS-Fixer ([#2129](https://github.com/Glavin001/atom-beautify/pull/2129))
|
||||
|
||||
# v0.32.2 (2018-03-10)
|
||||
- Revert fix package.json repository field (#2062)
|
||||
|
||||
# v0.32.1 (2018-03-10)
|
||||
- Update Prettier to 1.11.1. (#2060)
|
||||
- Fix package.json repository field (#2062)
|
||||
- Fix "Reindent" option for sqlformat. (#2064)
|
||||
|
||||
# v0.32.0 (2018-03-02)
|
||||
# v0.31.0 (2018-03-02)
|
||||
- See [#2026](https://github.com/Glavin001/atom-beautify/issues/2026) Add Vue support to ESLint Fixer beautifier. Should be used with [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue).
|
||||
- Fix Beauify File option for .lua files
|
||||
- Switch to Remark as a default markdown beautifier due to a more active state of its community compared to Tidy Markdown ([#2004](https://github.com/Glavin001/atom-beautify/pull/2004)).
|
||||
|
|
@ -81,8 +40,8 @@ docker ps --all | grep "unibeautify/" | awk '{ print $1 }' | xargs docker rm
|
|||
- Fix for [#1888](https://github.com/Glavin001/atom-beautify/issues/1888). Allow 0 for minor and patch versions of Docker
|
||||
- Add Atom-Beautify package settings menu item to Packages menu [#1869](https://github.com/Glavin001/atom-beautify/issues/1869)
|
||||
- Add `.ttslua` file extension to Lua language
|
||||
- Fix [#1638](https://github.com/Glavin001/atom-beautify/issues/1638). Update TypeScript Formatter dependency
|
||||
- Fix [#1833](https://github.com/Glavin001/atom-beautify/issues/1833) `os.tmpDir` deprecation warning
|
||||
- Fix [#1638]. Update TypeScript Formatter dependency
|
||||
- Fix [#1833] `os.tmpDir` deprecation warning
|
||||
|
||||
# v0.30.5 (2017-08-11)
|
||||
- Fix for [#1721](https://github.com/Glavin001/atom-beautify/issues/1721). Changes required due to TextBuffer.save becoming async in Atom 1.19
|
||||
|
|
|
|||
|
|
@ -1,22 +1,14 @@
|
|||
# :lipstick: [{{package.name}}](https://github.com/Glavin001/atom-beautify)
|
||||
[](https://atom.io/packages/atom-beautify)
|
||||
[](https://github.com/Glavin001/atom-beautify/stargazers)
|
||||
[](https://github.com/Glavin001/atom-beautify/issues)
|
||||
[](https://greenkeeper.io/)
|
||||
|
||||
[](https://unibeautify-slack.glitch.me/)
|
||||
[](https://twitter.com/unibeautify)
|
||||
[](https://github.com/Glavin001/atom-beautify/issues)
|
||||
[](https://github.com/Glavin001/atom-beautify/stargazers)
|
||||
[](https://gitter.im/Glavin001/atom-beautify)
|
||||
[](https://www.bountysource.com/teams/atom-beautify)
|
||||
[](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=X2RK5DKN6YXPJ&lc=CA&item_name=Atom%2dBeautify&item_number=atom%2dbeautify¤cy_code=CAD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted)
|
||||
[](https://twitter.com/unibeautify)
|
||||
|
||||
<!--
|
||||
**Sign up for Unibeautify CI: [https://goo.gl/jmM4QN](https://goo.gl/jmM4QN)**
|
||||
-->
|
||||
|
||||
:point_right: Sign up for [**CodePass**, *the Quickest Way To Solve Your Coding Errors*](https://codepass.ca/)! :boom:
|
||||
|
||||
[:tada: **Install Unibeautify CI for GitHub** :tada:](https://github.com/apps/unibeautify-ci)
|
||||
|
||||
**Help improve Atom-Beautify by completing the quick questionnaire: [https://goo.gl/iEHBNr](https://goo.gl/iEHBNr)**
|
||||
|
||||
|
|
@ -61,8 +53,6 @@ apm install atom-beautify
|
|||
|
||||
Or Settings/Preferences ➔ Install ➔ Search for `atom-beautify`
|
||||
|
||||
[:tada: **Install Unibeautify CI for GitHub** :tada:](https://github.com/apps/unibeautify-ci)
|
||||
|
||||
### Important Notice: Analytics
|
||||
|
||||
[Atom-Beautify respects the `core.telemetryConsent` configuration option from Atom editor.](https://github.com/Glavin001/atom-beautify/issues/1179)
|
||||
|
|
@ -80,8 +70,6 @@ Thank you.
|
|||
Atom-Beautify is going to be completely rewritten with [Unibeautify](https://github.com/Unibeautify/unibeautify) at its core!
|
||||
See [`unibeautify` branch](../../tree/unibeautify) for work in progress and [Issue #1174](https://github.com/Glavin001/atom-beautify/issues/1174).
|
||||
|
||||
[:tada: **Install Unibeautify CI for GitHub** :tada:](https://github.com/apps/unibeautify-ci)
|
||||
|
||||
### Poll: Improving installation of third-party beautifiers
|
||||
|
||||
Many users are experiencing issues when installing third party beautifiers (e.g. Uncrustify, PHP-CS-Fixer, and many more).
|
||||
|
|
|
|||
27
README.md
27
README.md
|
|
@ -1,22 +1,14 @@
|
|||
# :lipstick: [atom-beautify](https://github.com/Glavin001/atom-beautify)
|
||||
[](https://atom.io/packages/atom-beautify)
|
||||
[](https://github.com/Glavin001/atom-beautify/stargazers)
|
||||
[](https://github.com/Glavin001/atom-beautify/issues)
|
||||
[](https://greenkeeper.io/)
|
||||
|
||||
[](https://unibeautify-slack.glitch.me/)
|
||||
[](https://twitter.com/unibeautify)
|
||||
[](https://github.com/Glavin001/atom-beautify/issues)
|
||||
[](https://github.com/Glavin001/atom-beautify/stargazers)
|
||||
[](https://gitter.im/Glavin001/atom-beautify)
|
||||
[](https://www.bountysource.com/teams/atom-beautify)
|
||||
[](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=X2RK5DKN6YXPJ&lc=CA&item_name=Atom%2dBeautify&item_number=atom%2dbeautify¤cy_code=CAD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted)
|
||||
[](https://twitter.com/unibeautify)
|
||||
|
||||
<!--
|
||||
**Sign up for Unibeautify CI: [https://goo.gl/jmM4QN](https://goo.gl/jmM4QN)**
|
||||
-->
|
||||
|
||||
:point_right: Sign up for [**CodePass**, *the Quickest Way To Solve Your Coding Errors*](https://codepass.ca/)! :boom:
|
||||
|
||||
[:tada: **Install Unibeautify CI for GitHub** :tada:](https://github.com/apps/unibeautify-ci)
|
||||
|
||||
**Help improve Atom-Beautify by completing the quick questionnaire: [https://goo.gl/iEHBNr](https://goo.gl/iEHBNr)**
|
||||
|
||||
|
|
@ -61,8 +53,6 @@ apm install atom-beautify
|
|||
|
||||
Or Settings/Preferences ➔ Install ➔ Search for `atom-beautify`
|
||||
|
||||
[:tada: **Install Unibeautify CI for GitHub** :tada:](https://github.com/apps/unibeautify-ci)
|
||||
|
||||
### Important Notice: Analytics
|
||||
|
||||
[Atom-Beautify respects the `core.telemetryConsent` configuration option from Atom editor.](https://github.com/Glavin001/atom-beautify/issues/1179)
|
||||
|
|
@ -80,8 +70,6 @@ Thank you.
|
|||
Atom-Beautify is going to be completely rewritten with [Unibeautify](https://github.com/Unibeautify/unibeautify) at its core!
|
||||
See [`unibeautify` branch](../../tree/unibeautify) for work in progress and [Issue #1174](https://github.com/Glavin001/atom-beautify/issues/1174).
|
||||
|
||||
[:tada: **Install Unibeautify CI for GitHub** :tada:](https://github.com/apps/unibeautify-ci)
|
||||
|
||||
### Poll: Improving installation of third-party beautifiers
|
||||
|
||||
Many users are experiencing issues when installing third party beautifiers (e.g. Uncrustify, PHP-CS-Fixer, and many more).
|
||||
|
|
@ -103,7 +91,6 @@ Some of the supported beautifiers are developed for Node.js and are automaticall
|
|||
| align-yaml | :white_check_mark: | :ok_hand: Not necessary | :smiley: Nothing! |
|
||||
| autopep8 | :warning: 2 executables | :warning: Only 1 of 2 executables | :whale: With [Docker](https://www.docker.com/):<br/>1. Install [autopep8 (`autopep8`)](https://github.com/hhatto/autopep8) with `docker pull unibeautify/autopep8`<br/><br/>:bookmark_tabs: Manually:<br/>1. Install [autopep8 (`autopep8`)](https://github.com/hhatto/autopep8) by following https://github.com/hhatto/autopep8#installation<br/>2. Install [isort (`isort`)](https://github.com/timothycrosley/isort) by following https://github.com/timothycrosley/isort#installing-isort<br/> |
|
||||
| beautysh | :warning: 1 executable | :white_check_mark: :100:% of executables | :whale: With [Docker](https://www.docker.com/):<br/>1. Install [beautysh (`beautysh`)](https://github.com/bemeurer/beautysh) with `docker pull unibeautify/beautysh`<br/><br/>:bookmark_tabs: Manually:<br/>1. Install [beautysh (`beautysh`)](https://github.com/bemeurer/beautysh) by following https://github.com/bemeurer/beautysh#installation<br/> |
|
||||
| black | :warning: 1 executable | :x: No Docker support | :bookmark_tabs: Manually:<br/>1. Install [black (`black`)](https://github.com/ambv/black) by following https://github.com/ambv/black#installation<br/> |
|
||||
| brittany | :warning: Manual installation | :construction: Not an executable | :page_facing_up: Go to https://github.com/lspitzner/brittany and follow the instructions. |
|
||||
| clang-format | :warning: 1 executable | :white_check_mark: :100:% of executables | :whale: With [Docker](https://www.docker.com/):<br/>1. Install [ClangFormat (`clang-format`)](https://clang.llvm.org/docs/ClangFormat.html) with `docker pull unibeautify/clang-format`<br/><br/>:bookmark_tabs: Manually:<br/>1. Install [ClangFormat (`clang-format`)](https://clang.llvm.org/docs/ClangFormat.html) by following https://clang.llvm.org/docs/ClangFormat.html<br/> |
|
||||
| cljfmt | :white_check_mark: | :ok_hand: Not necessary | :smiley: Nothing! |
|
||||
|
|
@ -131,7 +118,6 @@ 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/> |
|
||||
|
|
@ -142,7 +128,7 @@ Some of the supported beautifiers are developed for Node.js and are automaticall
|
|||
| puppet-lint | :warning: 1 executable | :white_check_mark: :100:% of executables | :whale: With [Docker](https://www.docker.com/):<br/>1. Install [puppet-lint (`puppet-lint`)](http://puppet-lint.com/) with `docker pull unibeautify/puppet-lint`<br/><br/>:bookmark_tabs: Manually:<br/>1. Install [puppet-lint (`puppet-lint`)](http://puppet-lint.com/) by following http://puppet-lint.com/<br/> |
|
||||
| pybeautifier | :warning: Manual installation | :construction: Not an executable | :page_facing_up: Go to https://github.com/guyskk/pybeautifier and follow the instructions. |
|
||||
| Remark | :white_check_mark: | :ok_hand: Not necessary | :smiley: Nothing! |
|
||||
| Rubocop | :warning: 1 executable | :x: No Docker support | :bookmark_tabs: Manually:<br/>1. Install [Rubocop (`rubocop`)](http://rubocop.readthedocs.io/) by following http://rubocop.readthedocs.io/en/latest/installation/<br/> |
|
||||
| Rubocop | :warning: Manual installation | :construction: Not an executable | :page_facing_up: Go to https://github.com/bbatsov/rubocop and follow the instructions. |
|
||||
| Ruby Beautify | :warning: Manual installation | :construction: Not an executable | :page_facing_up: Go to https://github.com/erniebrodeur/ruby-beautify and follow the instructions. |
|
||||
| rustfmt | :warning: Manual installation | :construction: Not an executable | :page_facing_up: Go to https://github.com/rust-lang-nursery/rustfmt and follow the instructions. |
|
||||
| SassConvert | :warning: 1 executable | :white_check_mark: :100:% of executables | :whale: With [Docker](https://www.docker.com/):<br/>1. Install [SassConvert (`sass-convert`)](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#syntax) with `docker pull unibeautify/sass-convert`<br/><br/>:bookmark_tabs: Manually:<br/>1. Install [SassConvert (`sass-convert`)](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#syntax) by following http://sass-lang.com/documentation/file.SASS_REFERENCE.html#syntax<br/> |
|
||||
|
|
@ -165,7 +151,6 @@ See [all supported options in the documentation at `docs/options.md`](docs/opti
|
|||
| Apex | `Apex` |`.cls`, `.trigger` | **[`Uncrustify`](https://github.com/uncrustify/uncrustify)** |
|
||||
| Arduino | `Arduino` |`.ino`, `.pde` | **[`Uncrustify`](https://github.com/uncrustify/uncrustify)** |
|
||||
| Bash | `Shell Script` |`.bash`, `.sh` | **[`beautysh`](https://github.com/bemeurer/beautysh)** |
|
||||
| Blade | `Blade` |`.blade.php` | **[`JS Beautify`](https://github.com/beautify-web/js-beautify)** |
|
||||
| C | `C`, `opencl` |`.h`, `.c`, `.cl` | **[`Uncrustify`](https://github.com/uncrustify/uncrustify)**, [`clang-format`](https://clang.llvm.org/docs/ClangFormat.html) |
|
||||
| Coldfusion | `html` |`.cfm`, `.cfml`, `.cfc` | **[`Pretty Diff`](https://github.com/prettydiff/prettydiff)** |
|
||||
| Clojure | `Clojure` |`.clj`, `.cljs`, `.edn` | **[`cljfmt`](https://github.com/snoe/node-cljfmt)** |
|
||||
|
|
@ -203,12 +188,12 @@ 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)**, [`ocamlformat`](https://github.com/ocaml-ppx/ocamlformat) |
|
||||
| OCaml | `OCaml` |`.ml` | **[`ocp-indent`](https://www.typerex.org/ocp-indent.html)** |
|
||||
| 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/) |
|
||||
| Puppet | `Puppet` |`.pp` | **[`puppet-lint`](http://puppet-lint.com/)** |
|
||||
| Python | `Python`, `MagicPython` |`.py` | **[`autopep8`](https://github.com/hhatto/autopep8)**, [`black`](https://github.com/ambv/black), [`pybeautifier`](https://github.com/guyskk/pybeautifier), [`yapf`](https://github.com/google/yapf) |
|
||||
| Python | `Python`, `MagicPython` |`.py` | **[`autopep8`](https://github.com/hhatto/autopep8)**, [`pybeautifier`](https://github.com/guyskk/pybeautifier), [`yapf`](https://github.com/google/yapf) |
|
||||
| R | `R` |`.r`, `.R` | **[`formatR`](https://github.com/yihui/formatR)** |
|
||||
| Riot.js | `Riot.js`, `HTML (Riot Tag)` |`.tag` | **[`Pretty Diff`](https://github.com/prettydiff/prettydiff)** |
|
||||
| Ruby | `Ruby`, `Ruby on Rails` |`.rb` | **[`Rubocop`](https://github.com/bbatsov/rubocop)**, [`Ruby Beautify`](https://github.com/erniebrodeur/ruby-beautify) |
|
||||
|
|
|
|||
|
|
@ -25,9 +25,6 @@ install:
|
|||
- pip install -r requirements.txt
|
||||
|
||||
# Gemfile Install
|
||||
- set PATH=C:\Ruby24-x64\bin;%PATH%
|
||||
- ruby -v
|
||||
- gem update --system
|
||||
- bundle install
|
||||
|
||||
# PHP
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
language-marko
|
||||
language-html-swig
|
||||
language-svg
|
||||
language-d
|
||||
|
|
@ -7,4 +8,3 @@ language-elm
|
|||
language-puppet
|
||||
fuse
|
||||
react
|
||||
language-blade
|
||||
|
|
|
|||
2920
docs/options.md
2920
docs/options.md
File diff suppressed because it is too large
Load Diff
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -15,6 +15,6 @@ hash = { hosts: [
|
|||
|
||||
],
|
||||
|
||||
logger: mylog, # This enables callback logging!
|
||||
logger: mylog, # This enables callback logging!
|
||||
|
||||
max_reconnect_attempts: 5 }
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ hash = { :hosts => [
|
|||
|
||||
],
|
||||
|
||||
:logger => mylog, # This enables callback logging!
|
||||
:logger => mylog, # This enables callback logging!
|
||||
|
||||
:max_reconnect_attempts => 5,
|
||||
|
||||
|
|
@ -12,8 +12,7 @@
|
|||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h1>My Webpage</h1>
|
||||
{{ a_variable }}
|
||||
<h1>My Webpage</h1> {{ a_variable }}
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
<html>
|
||||
|
||||
<head>
|
||||
<title>App Name - @yield('title')</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
@section('sidebar')
|
||||
This is the {{ $mater }} sidebar.
|
||||
@show
|
||||
|
||||
<div class="container">
|
||||
@yield('content')
|
||||
</div>
|
||||
|
||||
@component('alert')
|
||||
@slot('title')
|
||||
Forbidden
|
||||
@endslot
|
||||
<strong>Whoops!</strong> Something went wrong!
|
||||
@endcomponent
|
||||
|
||||
@foreach ($users as $user)
|
||||
@if ($user->type == 1)
|
||||
@continue
|
||||
@endif
|
||||
<li>{{ $user->name }}</li>
|
||||
@if ($user->number == 5)
|
||||
@break
|
||||
@endif
|
||||
@endforeach
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>App Name - @yield('title')</title>
|
||||
</head>
|
||||
<body>
|
||||
@section('sidebar')
|
||||
This is the {{ $mater }} sidebar.
|
||||
@show
|
||||
|
||||
<div class="container">
|
||||
@yield('content')
|
||||
</div>
|
||||
|
||||
@component('alert')
|
||||
@slot('title')
|
||||
Forbidden
|
||||
@endslot
|
||||
<strong>Whoops!</strong> Something went wrong!
|
||||
@endcomponent
|
||||
|
||||
@foreach ($users as $user)
|
||||
@if ($user->type == 1)
|
||||
@continue
|
||||
@endif
|
||||
<li>{{ $user->name }}</li>
|
||||
@if ($user->number == 5)
|
||||
@break
|
||||
@endif
|
||||
@endforeach
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -19,7 +19,7 @@ function aaa(a, b, c)
|
|||
-- comment 2 1231
|
||||
-- comment 1 123 123 123123 12
|
||||
-- [[ comment 1 ]]
|
||||
--[[
|
||||
--[[
|
||||
muli comments
|
||||
ssss
|
||||
@asdasd sad
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ SELECT ca.proj_id AS proj_id,
|
|||
ca.ca_date_start AS proj_start,
|
||||
ca.ca_date_end AS proj_end,
|
||||
|
||||
(SELECT COUNT(*)
|
||||
(SELECT count(*)
|
||||
FROM rotations r
|
||||
WHERE r.proj_id = proj_id
|
||||
AND r.r_status = 'R'
|
||||
|
|
@ -12,7 +12,7 @@ SELECT ca.proj_id AS proj_id,
|
|||
(SELECT count(*)
|
||||
FROM rotations r
|
||||
WHERE r.proj_id = proj_id
|
||||
AND r.channel_id = 24 ) r_rtb_count
|
||||
AND r.channel_id = 24) r_rtb_count
|
||||
FROM projs ca,
|
||||
clients c,
|
||||
proj_auth caa
|
||||
|
|
@ -20,6 +20,6 @@ WHERE ca.client_id = 12345
|
|||
AND ca.client_id = c.client_id
|
||||
AND ca_type = 'zzz'
|
||||
AND c.agency_id = 0
|
||||
AND ca.client_id = NVL(caa.client_id, ca.client_id)
|
||||
AND proj_id = NVL(caa.proj_id, proj_id)
|
||||
AND ca.client_id = nvl(caa.client_id, ca.client_id)
|
||||
AND proj_id = nvl(caa.proj_id, proj_id)
|
||||
AND caa.contact_id = 7890
|
||||
|
|
@ -4,30 +4,21 @@ VALUES('hallpclnx',
|
|||
CURRENT_TIMESTAMP);
|
||||
|
||||
|
||||
INSERT INTO THREAD (THREAD,
|
||||
description,
|
||||
created_at,
|
||||
client_id)
|
||||
INSERT INTO thread (thread, description, created_at, client_id)
|
||||
VALUES(1,
|
||||
'Living room camera',
|
||||
CURRENT_TIMESTAMP,
|
||||
1);
|
||||
|
||||
|
||||
INSERT INTO THREAD (THREAD,
|
||||
description,
|
||||
created_at,
|
||||
client_id)
|
||||
INSERT INTO thread (thread, description, created_at, client_id)
|
||||
VALUES(2,
|
||||
'Porch camera',
|
||||
CURRENT_TIMESTAMP,
|
||||
1);
|
||||
|
||||
|
||||
INSERT INTO THREAD (THREAD,
|
||||
description,
|
||||
created_at,
|
||||
client_id)
|
||||
INSERT INTO thread (thread, description, created_at, client_id)
|
||||
VALUES(2,
|
||||
'Garden camera',
|
||||
CURRENT_TIMESTAMP,
|
||||
|
|
@ -37,4 +28,5 @@ VALUES(2,
|
|||
INSERT INTO client (HOST, description, created_at)
|
||||
VALUES('shedpclnx',
|
||||
'My shed linux machine',
|
||||
CURRENT_TIMESTAMP);
|
||||
CURRENT_TIMESTAMP);
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
SELECT ca.proj_id AS proj_id, ca.ca_name AS proj_name, ca.ca_date_start AS proj_start, ca.ca_date_end AS proj_end,(SELECT COUNT(*) FROM rotations r WHERE r.proj_id = proj_id AND r.r_status = 'R' GROUP BY r.proj_id) r_count, (SELECT count(*) FROM rotations r WHERE r.proj_id = proj_id AND r.channel_id = 24 ) r_rtb_count FROM projs ca, clients c, proj_auth caa WHERE ca.client_id = 12345 AND ca.client_id = c.client_id AND ca_type = 'zzz' AND c.agency_id = 0 AND ca.client_id = NVL( caa.client_id, ca.client_id ) AND proj_id = NVL( caa.proj_id, proj_id ) AND caa.contact_id = 7890
|
||||
SELECT ca.proj_id AS proj_id, ca.ca_name AS proj_name, ca.ca_date_start AS proj_start, ca.ca_date_end AS proj_end,(SELECT COUNT(*) FROM rotations r WHERE r.proj_id = proj_id AND r.r_status = 'R' GROUP BY r.proj_id) r_count, (SELECT count(*) FROM rotations r WHERE r.proj_id = proj_id AND r.channel_id = 24 ) r_rtb_count FROM projs ca, clients c, proj_auth caa WHERE ca.client_id = 12345 AND ca.client_id = c.client_id AND ca_type = 'zzz' AND c.agency_id = 0 AND ca.client_id = NVL( caa.client_id, ca.client_id ) AND proj_id = NVL( caa.proj_id, proj_id ) AND caa.contact_id = 7890
|
||||
|
|
@ -2,4 +2,4 @@ INSERT INTO client (host, description, created_at) VALUES('hallpclnx', 'My linux
|
|||
INSERT INTO thread (thread, description, created_at, client_id) VALUES(1, 'Living room camera', CURRENT_TIMESTAMP, 1);
|
||||
INSERT INTO thread (thread, description, created_at, client_id) VALUES(2, 'Porch camera', CURRENT_TIMESTAMP, 1);
|
||||
INSERT INTO thread (thread, description, created_at, client_id) VALUES(2, 'Garden camera', CURRENT_TIMESTAMP, 1);
|
||||
INSERT INTO client (host, description, created_at) VALUES('shedpclnx', 'My shed linux machine', CURRENT_TIMESTAMP);
|
||||
INSERT INTO client (host, description, created_at) VALUES('shedpclnx', 'My shed linux machine', CURRENT_TIMESTAMP);
|
||||
File diff suppressed because it is too large
Load Diff
39
package.json
39
package.json
|
|
@ -1,10 +1,13 @@
|
|||
{
|
||||
"name": "atom-beautify",
|
||||
"main": "./src/beautify",
|
||||
"version": "0.33.4",
|
||||
"version": "0.32.0",
|
||||
"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",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git@github.com:Glavin001/atom-beautify.git"
|
||||
},
|
||||
"bugs": {
|
||||
"url": "https://github.com/Glavin001/atom-beautify/issues"
|
||||
},
|
||||
|
|
@ -168,14 +171,6 @@
|
|||
{
|
||||
"name": "Kohei Hiraga",
|
||||
"url": "https://github.com/range3"
|
||||
},
|
||||
{
|
||||
"name": "Arlo Shallit",
|
||||
"url": "https://github.com/arl-o"
|
||||
},
|
||||
{
|
||||
"name": "Liam Newman",
|
||||
"url": "https://github.com/bitwiseman"
|
||||
}
|
||||
],
|
||||
"engines": {
|
||||
|
|
@ -196,18 +191,19 @@
|
|||
"eslint": "^4.16.0",
|
||||
"event-kit": "^2.4.0",
|
||||
"expand-home-dir": "0.0.3",
|
||||
"extend": "^3.0.2",
|
||||
"extend": "^3.0.1",
|
||||
"gherkin": "^2.12.2",
|
||||
"handlebars": "^4.1.2",
|
||||
"js-beautify": "^1.8.1",
|
||||
"handlebars": "^4.0.11",
|
||||
"js-beautify": "^1.7.5",
|
||||
"jscs": "^3.0.7",
|
||||
"lodash": "^4.17.13",
|
||||
"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",
|
||||
"open": "6.0.0",
|
||||
"prettier": "^1.11.1",
|
||||
"open": "0.0.5",
|
||||
"prettier": "^1.10.2",
|
||||
"prettydiff2": "^2.2.7",
|
||||
"pug-beautify": "^0.1.1",
|
||||
"remark": "6.0.1",
|
||||
|
|
@ -221,8 +217,8 @@
|
|||
"typescript": "^2.6.2",
|
||||
"typescript-formatter": "^7.0.0",
|
||||
"underscore-plus": "^1.6.6",
|
||||
"universal-analytics": "^0.4.16",
|
||||
"uuid": "^3.1.0",
|
||||
"universal-analytics": "^0.4.16",
|
||||
"which": "^1.3.0",
|
||||
"winston": "^2.4.0",
|
||||
"yaml-front-matter": "3.4.1"
|
||||
|
|
@ -307,8 +303,7 @@
|
|||
"atom-beautify:beautify-language-tsx",
|
||||
"atom-beautify:beautify-language-verilog",
|
||||
"atom-beautify:beautify-language-vhdl",
|
||||
"atom-beautify:beautify-language-gn",
|
||||
"atom-beautify:beautify-language-blade"
|
||||
"atom-beautify:beautify-language-gn"
|
||||
],
|
||||
".tree-view .file .name": [
|
||||
"atom-beautify:beautify-file"
|
||||
|
|
@ -452,10 +447,7 @@
|
|||
"emacs verilog mode",
|
||||
"vhdl",
|
||||
"vhdl beautifier",
|
||||
"gn",
|
||||
"blade",
|
||||
"black",
|
||||
"ocamlformat"
|
||||
"gn"
|
||||
],
|
||||
"devDependencies": {
|
||||
"codo": "^2.1.2",
|
||||
|
|
@ -467,7 +459,6 @@
|
|||
"prepare": "npm run docs",
|
||||
"lint": "coffeelint src/ spec/",
|
||||
"code-docs": "codo && open docs/code/index.html",
|
||||
"pretest": "npm run lint",
|
||||
"test": "atom --test spec"
|
||||
},
|
||||
"config": {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="atom" />
|
||||
<package id="emacs64" version="24.5" />
|
||||
<package id="emacs" />
|
||||
<package id="terraform" />
|
||||
<package id="composer" />
|
||||
<!--package id="uncrustify" /-->
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@ describe "BeautifyLanguages", ->
|
|||
|
||||
# Activate all of the languages
|
||||
allLanguages = [
|
||||
"blade", "c", "clojure", "coffee-script", "css", "csharp", "d",
|
||||
"c", "clojure", "coffee-script", "css", "csharp", "d",
|
||||
"gfm", "go", "html", "html-swig", "java", "javascript",
|
||||
"json", "less", "lua", "mustache", "objective-c",
|
||||
"json", "less", "lua", "marko", "mustache", "objective-c",
|
||||
"perl", "php", "python", "ruby", "sass", "sql",
|
||||
"svg", "xml"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
###
|
||||
Requires [black](https://github.com/ambv/black)
|
||||
###
|
||||
"use strict"
|
||||
Beautifier = require('./beautifier')
|
||||
path = require('path')
|
||||
|
||||
module.exports = class Black extends Beautifier
|
||||
name: "black"
|
||||
link: "https://github.com/ambv/black"
|
||||
executables: [
|
||||
{
|
||||
name: "black"
|
||||
cmd: "black"
|
||||
homepage: "https://github.com/ambv/black"
|
||||
installation: "https://github.com/ambv/black#installation"
|
||||
version: {
|
||||
parse: (text) ->
|
||||
# Try to read beta values, eg "black, version 18.6b4" -> 18.6.4
|
||||
try
|
||||
text.match(/black, version (\d+\.\d+)/)[1] + "." + text.match(/b(\d+)$/)[1]
|
||||
catch
|
||||
text.match(/black, version (\d+\.\d+)/)[1] + ".0"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
options: {
|
||||
Python: false
|
||||
}
|
||||
|
||||
beautify: (text, language, options, context) ->
|
||||
cwd = context.filePath and path.dirname context.filePath
|
||||
# `-` as filename reads from stdin
|
||||
@exe("black").run(["-"], {
|
||||
cwd: cwd
|
||||
onStdin: (stdin) ->
|
||||
stdin.end text
|
||||
})
|
||||
|
|
@ -49,7 +49,6 @@ class Executable
|
|||
.then(() => @)
|
||||
.catch((error) =>
|
||||
if not @.required
|
||||
@verbose("Not required")
|
||||
@
|
||||
else
|
||||
Promise.reject(error)
|
||||
|
|
@ -367,7 +366,6 @@ class HybridExecutable extends Executable
|
|||
|
||||
constructor: (options) ->
|
||||
super(options)
|
||||
@verbose("HybridExecutable Options", options)
|
||||
if options.docker?
|
||||
@dockerOptions = Object.assign({}, @dockerOptions, options.docker)
|
||||
@docker = @constructor.dockerExecutable()
|
||||
|
|
@ -389,44 +387,20 @@ class HybridExecutable extends Executable
|
|||
installedWithDocker: false
|
||||
init: () ->
|
||||
super()
|
||||
.then(() =>
|
||||
return @
|
||||
)
|
||||
.catch((error) =>
|
||||
return Promise.reject(error) if not @docker?
|
||||
return Promise.resolve(error)
|
||||
)
|
||||
.then((errorOrThis) =>
|
||||
shouldTryWithDocker = not @isInstalled and @docker?
|
||||
@verbose("Executable shouldTryWithDocker", shouldTryWithDocker, @isInstalled, @docker?)
|
||||
if shouldTryWithDocker
|
||||
return @initDocker().catch(() -> Promise.reject(errorOrThis))
|
||||
return @
|
||||
)
|
||||
.catch((error) =>
|
||||
if not @.required
|
||||
@verbose("Not required")
|
||||
@
|
||||
else
|
||||
Promise.reject(error)
|
||||
)
|
||||
|
||||
initDocker: () ->
|
||||
@docker.init()
|
||||
.then(=> @runImage(@versionArgs, @versionRunOptions))
|
||||
.then((text) => @saveVersion(text))
|
||||
.then(() => @installedWithDocker = true)
|
||||
.then(=> @)
|
||||
.catch((dockerError) =>
|
||||
@debug(dockerError)
|
||||
Promise.reject(dockerError)
|
||||
@docker.init()
|
||||
.then(=> @runImage(@versionArgs, @versionRunOptions))
|
||||
.then((text) => @saveVersion(text))
|
||||
.then(() => @installedWithDocker = true)
|
||||
.then(=> @)
|
||||
.catch((dockerError) =>
|
||||
@debug(dockerError)
|
||||
Promise.reject(error)
|
||||
)
|
||||
)
|
||||
|
||||
run: (args, options = {}) ->
|
||||
@verbose("Running HybridExecutable")
|
||||
@verbose("installedWithDocker", @installedWithDocker)
|
||||
@verbose("docker", @docker)
|
||||
@verbose("docker.isInstalled", @docker and @docker.isInstalled)
|
||||
if @installedWithDocker and @docker and @docker.isInstalled
|
||||
return @runImage(args, options)
|
||||
super(args, options)
|
||||
|
|
@ -450,15 +424,15 @@ class HybridExecutable extends Executable
|
|||
|
||||
@docker.run([
|
||||
"run",
|
||||
"--rm",
|
||||
"--volume", "#{pwd}:#{workingDir}",
|
||||
"--volume", "#{path.resolve('/')}:#{rootPath}",
|
||||
"--workdir", workingDir,
|
||||
image,
|
||||
newArgs
|
||||
],
|
||||
Object.assign({}, options, { cmd: undefined })
|
||||
options
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
module.exports = HybridExecutable
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ module.exports = class Beautifiers extends EventEmitter
|
|||
'cljfmt'
|
||||
'clang-format'
|
||||
'crystal'
|
||||
'black'
|
||||
'dfmt'
|
||||
'elm-format'
|
||||
'hh_format'
|
||||
|
|
@ -88,7 +87,6 @@ module.exports = class Beautifiers extends EventEmitter
|
|||
'beautysh'
|
||||
'terraformfmt'
|
||||
'verilog-mode'
|
||||
'ocamlformat'
|
||||
]
|
||||
|
||||
###
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ module.exports = class JSBeautify extends Beautifier
|
|||
link: "https://github.com/beautify-web/js-beautify"
|
||||
|
||||
options: {
|
||||
Blade: true
|
||||
HTML: true
|
||||
XML: true
|
||||
Handlebars: true
|
||||
|
|
@ -52,16 +51,6 @@ module.exports = class JSBeautify extends Beautifier
|
|||
beautifyCSS = require("js-beautify").css
|
||||
text = beautifyCSS(text, options)
|
||||
resolve text
|
||||
when "Blade"
|
||||
beautifyHTML = require("js-beautify").html
|
||||
# pre script (Workaround)
|
||||
text = text.replace(/\@(?!yield)([^\n\s]*)/ig, "<blade $1 />")
|
||||
text = beautifyHTML(text, options)
|
||||
# post script (Workaround)
|
||||
text = text.replace(/<blade ([^\n\s]*)\s*\/>/ig, "@$1")
|
||||
text = text.replace(/\(\ \'/ig, "('")
|
||||
@debug("Beautified HTML: #{text}")
|
||||
resolve text
|
||||
else
|
||||
reject(new Error("Unknown language for JS Beautify: "+language))
|
||||
catch err
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ module.exports = (str, indent, warn_fn, opts = {}) ->
|
|||
else
|
||||
return line
|
||||
res1 = line.match(/\[(=*)\[/)
|
||||
if res1 and (not new RegExp("\\]#{'='.repeat res1[1].length}\\]").test line)
|
||||
if res1
|
||||
$template = res1[1].length + 1
|
||||
if !$template_flag
|
||||
line = line.trim()
|
||||
|
|
@ -62,9 +62,9 @@ module.exports = (str, indent, warn_fn, opts = {}) ->
|
|||
if !line.length
|
||||
return ''
|
||||
raw_line = line
|
||||
line = line.replace(/(['"])[^\1]*?\1/g, '')
|
||||
line = line.replace(/(['"])[^\1]*?\1/, '')
|
||||
# remove all quoted fragments for proper bracket processing
|
||||
line = line.replace(/\s*--.+$/, '')
|
||||
line = line.replace(/\s*--.+/, '')
|
||||
# remove all comments; this ignores long bracket style comments
|
||||
if /^((local )?function|repeat|while)\b/.test(line) and !/\bend\s*[\),;]*$/.test(line) or /\b(then|do)$/.test(line) and !/^elseif\b/.test(line) or /^if\b/.test(line) and /\bthen\b/.test(line) and !/\bend$/.test(line) or /\bfunction ?(?:\w+ )?\([^\)]*\)$/.test(line) and !/\bend$/.test(line)
|
||||
$nextIndent = $currIndent + 1
|
||||
|
|
@ -102,4 +102,4 @@ module.exports = (str, indent, warn_fn, opts = {}) ->
|
|||
new_line or undefined
|
||||
|
||||
warn_fn 'positive indentation at the end' if $currIndent > 0
|
||||
new_code.join eol
|
||||
new_code.join eol
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
###
|
||||
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"
|
||||
}
|
||||
})
|
||||
|
|
@ -67,8 +67,7 @@ module.exports = class PHPCSFixer extends Beautifier
|
|||
phpCsFixerOptions = [
|
||||
"fix"
|
||||
"--rules=#{options.rules}" if options.rules
|
||||
"--config" if options.cs_fixer_config_file
|
||||
"#{options.cs_fixer_config_file}" if options.cs_fixer_config_file
|
||||
"--config=#{options.cs_fixer_config_file}" if options.cs_fixer_config_file
|
||||
"--allow-risky=#{options.allow_risky}" if options.allow_risky
|
||||
"--using-cache=no"
|
||||
]
|
||||
|
|
@ -106,7 +105,7 @@ module.exports = class PHPCSFixer extends Beautifier
|
|||
isPhpScript = (finalPhpCsFixerPath.indexOf(".phar") isnt -1) or (finalPhpCsFixerPath.indexOf(".php") isnt -1)
|
||||
@verbose('isPhpScript', isPhpScript)
|
||||
|
||||
if not phpCsFixer.isInstalled and finalPhpCsFixerPath and isPhpScript
|
||||
if finalPhpCsFixerPath and isPhpScript
|
||||
php.run([finalPhpCsFixerPath, phpCsFixerOptions, tempFile], runOptions)
|
||||
.then(=>
|
||||
@readFile(tempFile)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ Requires https://github.com/FriendsOfPHP/phpcbf
|
|||
|
||||
"use strict"
|
||||
Beautifier = require('./beautifier')
|
||||
path = require('path')
|
||||
|
||||
module.exports = class PHPCBF extends Beautifier
|
||||
name: "PHPCBF"
|
||||
|
|
@ -24,7 +23,6 @@ module.exports = class PHPCBF extends Beautifier
|
|||
cmd: "phpcbf"
|
||||
homepage: "https://github.com/squizlabs/PHP_CodeSniffer"
|
||||
installation: "https://github.com/squizlabs/PHP_CodeSniffer#installation"
|
||||
optional: true
|
||||
version: {
|
||||
parse: (text) -> text.match(/version (\d+\.\d+\.\d+)/)[1]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ module.exports = class Prettier extends Beautifier
|
|||
prettierLanguage = _.find(prettier.getSupportInfo().languages, 'name': language)
|
||||
if prettierLanguage
|
||||
parser = prettierLanguage.parsers[0]
|
||||
options.parser = parser
|
||||
else
|
||||
reject(new Error("Unknown language for Prettier"))
|
||||
|
||||
|
|
@ -39,7 +38,7 @@ module.exports = class Prettier extends Beautifier
|
|||
|
||||
try
|
||||
prettier.resolveConfig(filePath).then((configOptions) ->
|
||||
result = prettier.format(text, configOptions or options)
|
||||
result = prettier.format(text, configOptions or options, parser)
|
||||
prettier.clearConfigCache()
|
||||
resolve result
|
||||
)
|
||||
|
|
|
|||
|
|
@ -17,26 +17,10 @@ module.exports = class Rubocop extends Beautifier
|
|||
rubocop_path: true
|
||||
}
|
||||
|
||||
executables: [
|
||||
{
|
||||
name: "Rubocop"
|
||||
cmd: "rubocop"
|
||||
homepage: "http://rubocop.readthedocs.io/"
|
||||
installation: "http://rubocop.readthedocs.io/en/latest/installation/"
|
||||
version: {
|
||||
parse: (text) -> text.match(/(\d+\.\d+\.\d+)/)[1]
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
beautify: (text, language, options, context) ->
|
||||
fullPath = context.filePath or ""
|
||||
[projectPath, _relativePath] = atom.project.relativizePath(fullPath)
|
||||
|
||||
# Deprecate options.rubocop_path
|
||||
if options.rubocop_path
|
||||
@deprecateOptionForExecutable("Rubocop", "Ruby - Rubocop Path (rubocop_path)", "Path")
|
||||
|
||||
# Find the rubocop path
|
||||
@Promise.all([
|
||||
@which(options.rubocop_path) if options.rubocop_path
|
||||
|
|
@ -62,27 +46,21 @@ module.exports = class Rubocop extends Beautifier
|
|||
rubocopArguments = [
|
||||
"--auto-correct"
|
||||
"--force-exclusion"
|
||||
"--stdin", fullPath or "atom-beautify.rb" # --stdin requires an argument
|
||||
"--stdin", "atom-beautify.rb" # filename is required but not used
|
||||
]
|
||||
exeOptions = {
|
||||
ignoreReturnCode: true,
|
||||
cwd: projectPath if configFile?,
|
||||
onStdin: (stdin) -> stdin.end text
|
||||
}
|
||||
rubocopArguments.push("--config", tempConfig) if tempConfig?
|
||||
@debug("rubocop arguments", rubocopArguments)
|
||||
|
||||
(if options.rubocop_path then \
|
||||
@run(rubocopPath, rubocopArguments, exeOptions) else \
|
||||
@exe("rubocop").run(rubocopArguments, exeOptions)
|
||||
).then((stdout) =>
|
||||
@run(rubocopPath, rubocopArguments, {
|
||||
ignoreReturnCode: true,
|
||||
cwd: projectPath,
|
||||
onStdin: (stdin) -> stdin.end text
|
||||
}).then((stdout) =>
|
||||
@debug("rubocop output", stdout)
|
||||
# Rubocop output an error if stdout is empty
|
||||
return text if stdout.length == 0
|
||||
|
||||
result = stdout.split("====================\n")
|
||||
result = stdout.split("====================\r\n") if result.length == 1
|
||||
|
||||
result[result.length - 1]
|
||||
)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ module.exports = class Sqlformat extends Beautifier
|
|||
beautify: (text, language, options) ->
|
||||
@run("sqlformat", [
|
||||
@tempFile("input", text)
|
||||
"--reindent" if options.reindent is true
|
||||
"--reindent=#{options.reindent}" if options.reindent?
|
||||
"--indent_width=#{options.indent_size}" if options.indent_size?
|
||||
"--keywords=#{options.keywords}" if (options.keywords? && options.keywords != 'unchanged')
|
||||
"--identifiers=#{options.identifiers}" if (options.identifiers? && options.identifiers != 'unchanged')
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
module.exports = {
|
||||
|
||||
name: "Blade"
|
||||
namespace: "blade"
|
||||
fallback: ["html"]
|
||||
|
||||
###
|
||||
Supported Grammars
|
||||
###
|
||||
grammars: [
|
||||
"Blade"
|
||||
]
|
||||
|
||||
###
|
||||
Supported extensions
|
||||
###
|
||||
extensions: [
|
||||
"blade.php"
|
||||
]
|
||||
|
||||
options: []
|
||||
}
|
||||
|
|
@ -49,8 +49,8 @@ module.exports = {
|
|||
wrap_attributes:
|
||||
type: 'string'
|
||||
default: "auto"
|
||||
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]"
|
||||
enum: ["auto", "force", "force-aligned", "force-expand-multiline"]
|
||||
description: "Wrap attributes to new lines [auto|force|force-aligned|force-expand-multiline]"
|
||||
wrap_attributes_indent_size:
|
||||
type: 'integer'
|
||||
default: null
|
||||
|
|
@ -65,12 +65,6 @@ 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',
|
||||
|
|
@ -79,17 +73,13 @@ 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', 'strike', 'tt'
|
||||
'acronym', 'address', 'big', 'dt', 'ins', 'small', 'strike', 'tt',
|
||||
'pre',
|
||||
'h1', 'h2', 'h3', 'h4', 'h5', 'h6'
|
||||
]
|
||||
items:
|
||||
type: 'string'
|
||||
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."
|
||||
description: "List of tags (defaults to inline) that should not be reformatted"
|
||||
end_with_newline:
|
||||
type: 'boolean'
|
||||
default: false
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ module.exports = class Languages
|
|||
"apex"
|
||||
"arduino"
|
||||
"bash"
|
||||
"blade"
|
||||
"c-sharp"
|
||||
"c"
|
||||
"clojure"
|
||||
|
|
|
|||
784
src/options.json
784
src/options.json
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue