Merge branch 'master' into master_bash_beautifier
This commit is contained in:
Glavin Wiechert
GitHub
commit
674c5ca69f
|
|
@ -89,7 +89,6 @@ before_install:
|
|||
# Sass language support
|
||||
- gem install sass
|
||||
# Python language support
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python; fi
|
||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo chmod 777 -R /opt/python; fi
|
||||
- pip install --upgrade pip
|
||||
- pip install --upgrade autopep8
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
# dev
|
||||
- Update to `remark`'s new API and fix [#1196](https://github.com/Glavin001/atom-beautify/issues/1196)
|
||||
- Add beautifier for the Lua language.
|
||||
- Add [ocp-indent](https://github.com/OCamlPro/ocp-indent) beautifier for the OCaml language.
|
||||
- Add [elm-format](https://github.com/avh4/elm-format) beautifier for the Elm language.
|
||||
|
|
|
|||
|
|
@ -2,14 +2,31 @@
|
|||
|
||||
The results of beautification are not what I expect.
|
||||
|
||||
# Expected Results
|
||||
# Input Before Beautification
|
||||
|
||||
The beautified code should have looked like:
|
||||
This is what the code looked like before:
|
||||
|
||||
```
|
||||
<INSERT CODE HERE>
|
||||
```
|
||||
|
||||
# Expected Output
|
||||
|
||||
The beautified code should have looked like this:
|
||||
|
||||
```
|
||||
<INSERT CODE HERE>
|
||||
```
|
||||
|
||||
# Actual Output
|
||||
|
||||
The beautified code actually looked like this:
|
||||
|
||||
```
|
||||
<INSERT CODE HERE>
|
||||
```
|
||||
|
||||
|
||||
# Steps to Reproduce
|
||||
|
||||
1. Add code to Atom editor
|
||||
|
|
@ -22,8 +39,11 @@ Here is a link to the `debug.md` Gist: <INSERT GIST HERE>
|
|||
|
||||
# Checklist
|
||||
|
||||
- [ ] I have tried uninstalling and reinstalling Atom Beautify to ensure it installed properly
|
||||
- [ ] I have reloaded (or restarted) Atom to ensure it is not a caching issue
|
||||
- [ ] Searched for existing Atom Beautify Issues at https://github.com/Glavin001/atom-beautify/issues
|
||||
I have:
|
||||
- [ ] Tried uninstalling and reinstalling Atom Beautify to ensure it installed properly
|
||||
- [ ] Reloaded (or restarted) Atom to ensure it is not a caching issue
|
||||
- [ ] Searched through existing Atom Beautify Issues at https://github.com/Glavin001/atom-beautify/issues
|
||||
so I know this is not a duplicate issue
|
||||
- [ ] Filled out the Input, Expected, and Actual sections above or have edited/removed them in a way that fully describes the issue.
|
||||
- [ ] Generated debugging information and added link for `debug.md` Gist to this issue
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# :lipstick: [{{package.name}}](https://github.com/Glavin001/atom-beautify)
|
||||
|
||||
| Mac OS <img src="https://cloud.githubusercontent.com/assets/1885333/17059766/2530c9d8-4ffd-11e6-9529-3fa47dbff616.png" width="50px"> | <img src="https://cloud.githubusercontent.com/assets/1885333/17059750/11c4474e-4ffd-11e6-89e1-2486ca5b3234.png" width="100px"> | <img src="https://cloud.githubusercontent.com/assets/1885333/17059763/206a7d4a-4ffd-11e6-859e-7856902fb300.png" width="100px"> |
|
||||
| --- | --- | --- |
|
||||
| [](https://travis-ci.org/Glavin001/atom-beautify) | [](https://travis-ci.org/Glavin001/atom-beautify) | [](https://ci.appveyor.com/project/Glavin001/atom-beautify) |
|
||||
| Mac OS <img src="https://cloud.githubusercontent.com/assets/1885333/17059766/2530c9d8-4ffd-11e6-9529-3fa47dbff616.png" width="50px"> and <img src="https://cloud.githubusercontent.com/assets/1885333/17059750/11c4474e-4ffd-11e6-89e1-2486ca5b3234.png" width="100px"> | <img src="https://cloud.githubusercontent.com/assets/1885333/17059763/206a7d4a-4ffd-11e6-859e-7856902fb300.png" width="100px"> |
|
||||
| --- | --- |
|
||||
| [](https://travis-ci.org/Glavin001/atom-beautify) | [](https://ci.appveyor.com/project/Glavin001/atom-beautify) |
|
||||
|
||||
|
||||
[](https://gitter.im/Glavin001/atom-beautify)
|
||||
|
|
@ -46,12 +46,18 @@ Or Settings/Preferences ➔ Packages ➔ Search for `atom-beautify`
|
|||
|
||||
By default `Anonymous Analytics` is enabled.
|
||||
If you do not wish to have usage data sent to Google Analytics then please disable `Anonymous Analytics` option before using Atom-Beautify.
|
||||
See [`Anonymous Analytics` section of docs](https://github.com/Glavin001/atom-beautify/blob/master/docs/options.md#anonymous-analytics) for details.
|
||||
See [`Anonymous Analytics` section of docs](docs/options.md#anonymous-analytics) for details.
|
||||
Thank you.
|
||||
|
||||
### Next Version: [Unibeautify](https://github.com/Unibeautify/unibeautify)
|
||||
|
||||
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).
|
||||
|
||||
|
||||
## Language Support
|
||||
|
||||
See [all supported options in the documentation at `docs/options.md`](https://github.com/Glavin001/atom-beautify/blob/master/docs/options.md).
|
||||
See [all supported options in the documentation at `docs/options.md`](docs/options.md).
|
||||
|
||||
{{language-beautifiers-support languageOptions}}
|
||||
|
||||
|
|
@ -107,13 +113,13 @@ Edit your `.jsbeautifyrc` file in any of the following locations:
|
|||
|
||||
**Note**: *Comments are supported in `.jsbeautifyrc` thanks to [strip-json-comments](https://github.com/sindresorhus/strip-json-comments).*
|
||||
|
||||
See examples of both ways inside [`examples/`](https://github.com/donaldpipowitch/atom-beautify/tree/master/examples)
|
||||
See examples of both ways inside [`examples/`](examples)
|
||||
|
||||
See [all supported options in the documentation at `docs/options.md`](https://github.com/Glavin001/atom-beautify/blob/master/docs/options.md).
|
||||
See [all supported options in the documentation at `docs/options.md`](docs/options.md).
|
||||
|
||||
### Simple
|
||||
|
||||
See [examples/simple-jsbeautifyrc/.jsbeautifyrc](https://github.com/donaldpipowitch/atom-beautify/blob/master/examples/simple-jsbeautifyrc/.jsbeautifyrc).
|
||||
See [examples/simple-jsbeautifyrc/.jsbeautifyrc](examples/simple-jsbeautifyrc/.jsbeautifyrc).
|
||||
|
||||
```json
|
||||
{
|
||||
|
|
@ -131,7 +137,7 @@ See [examples/simple-jsbeautifyrc/.jsbeautifyrc](https://github.com/donaldpipowi
|
|||
|
||||
### Nested (Recommended)
|
||||
|
||||
See [examples/nested-jsbeautifyrc/.jsbeautifyrc](https://github.com/donaldpipowitch/atom-beautify/blob/master/examples/nested-jsbeautifyrc/.jsbeautifyrc).
|
||||
See [examples/nested-jsbeautifyrc/.jsbeautifyrc](examples/nested-jsbeautifyrc/.jsbeautifyrc).
|
||||
|
||||
```json
|
||||
{
|
||||
|
|
@ -169,16 +175,16 @@ See [examples/nested-jsbeautifyrc/.jsbeautifyrc](https://github.com/donaldpipowi
|
|||
|
||||
## Troubleshooting
|
||||
|
||||
See [`docs/troubleshooting.md`](https://github.com/Glavin001/atom-beautify/blob/master/docs/troubleshooting.md).
|
||||
See [`docs/troubleshooting.md`](docs/troubleshooting.md).
|
||||
|
||||
## Contributing
|
||||
|
||||
[See all contributors on GitHub](https://github.com/donaldpipowitch/atom-beautify/graphs/contributors).
|
||||
[See all contributors on GitHub](../../graphs/contributors).
|
||||
|
||||
Please update the [CHANGELOG.md](https://github.com/donaldpipowitch/atom-beautify/blob/master/CHANGELOG.md),
|
||||
add yourself as a contributor to the [package.json](https://github.com/donaldpipowitch/atom-beautify/blob/master/package.json),
|
||||
Please update the [CHANGELOG.md](CHANGELOG.md),
|
||||
add yourself as a contributor to the [package.json](package.json),
|
||||
and submit a [Pull Request on GitHub](https://help.github.com/articles/using-pull-requests/).
|
||||
|
||||
## License
|
||||
|
||||
[MIT](https://github.com/donaldpipowitch/atom-beautify/blob/master/LICENSE.md) © [Glavin Wiechert](https://github.com/Glavin001)
|
||||
[MIT](LICENSE.md) © [Glavin Wiechert](https://github.com/Glavin001)
|
||||
|
|
|
|||
37
README.md
37
README.md
|
|
@ -1,8 +1,8 @@
|
|||
# :lipstick: [atom-beautify](https://github.com/Glavin001/atom-beautify)
|
||||
|
||||
| Mac OS <img src="https://cloud.githubusercontent.com/assets/1885333/17059766/2530c9d8-4ffd-11e6-9529-3fa47dbff616.png" width="50px"> | <img src="https://cloud.githubusercontent.com/assets/1885333/17059750/11c4474e-4ffd-11e6-89e1-2486ca5b3234.png" width="100px"> | <img src="https://cloud.githubusercontent.com/assets/1885333/17059763/206a7d4a-4ffd-11e6-859e-7856902fb300.png" width="100px"> |
|
||||
| --- | --- | --- |
|
||||
| [](https://travis-ci.org/Glavin001/atom-beautify) | [](https://travis-ci.org/Glavin001/atom-beautify) | [](https://ci.appveyor.com/project/Glavin001/atom-beautify) |
|
||||
| Mac OS <img src="https://cloud.githubusercontent.com/assets/1885333/17059766/2530c9d8-4ffd-11e6-9529-3fa47dbff616.png" width="50px"> and <img src="https://cloud.githubusercontent.com/assets/1885333/17059750/11c4474e-4ffd-11e6-89e1-2486ca5b3234.png" width="100px"> | <img src="https://cloud.githubusercontent.com/assets/1885333/17059763/206a7d4a-4ffd-11e6-859e-7856902fb300.png" width="100px"> |
|
||||
| --- | --- |
|
||||
| [](https://travis-ci.org/Glavin001/atom-beautify) | [](https://ci.appveyor.com/project/Glavin001/atom-beautify) |
|
||||
|
||||
|
||||
[](https://gitter.im/Glavin001/atom-beautify)
|
||||
|
|
@ -46,12 +46,18 @@ Or Settings/Preferences ➔ Packages ➔ Search for `atom-beautify`
|
|||
|
||||
By default `Anonymous Analytics` is enabled.
|
||||
If you do not wish to have usage data sent to Google Analytics then please disable `Anonymous Analytics` option before using Atom-Beautify.
|
||||
See [`Anonymous Analytics` section of docs](https://github.com/Glavin001/atom-beautify/blob/master/docs/options.md#anonymous-analytics) for details.
|
||||
See [`Anonymous Analytics` section of docs](docs/options.md#anonymous-analytics) for details.
|
||||
Thank you.
|
||||
|
||||
### Next Version: [Unibeautify](https://github.com/Unibeautify/unibeautify)
|
||||
|
||||
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).
|
||||
|
||||
|
||||
## Language Support
|
||||
|
||||
See [all supported options in the documentation at `docs/options.md`](https://github.com/Glavin001/atom-beautify/blob/master/docs/options.md).
|
||||
See [all supported options in the documentation at `docs/options.md`](docs/options.md).
|
||||
|
||||
| Language | Grammars | File Extensions | Supported Beautifiers |
|
||||
| --- | --- | --- | ---- |
|
||||
|
|
@ -74,6 +80,7 @@ See [all supported options in the documentation at `docs/options.md`](https://g
|
|||
| Erlang | `Erlang` |`.erl` | [`erl_tidy`](http://erlang.org/doc/man/erl_tidy.html) (Default) |
|
||||
| Fortran | `Fortran - Modern` |`.f90`, `.F90` | [`Fortran Beautifier`](https://github.com/Glavin001/atom-beautify/blob/master/src/beautifiers/fortran-beautifier/emacs-fortran-formating-script.lisp) (Default) |
|
||||
| gherkin | `Gherkin` |`.feature` | [`Gherkin formatter`](https://github.com/Glavin001/atom-beautify/blob/master/src/beautifiers/gherkin.coffee) (Default) |
|
||||
| GLSL | `C`, `opencl`, `GLSL` |`.vert`, `.frag` | [`clang-format`](https://clang.llvm.org/docs/ClangFormat.html) (Default) |
|
||||
| Go | `Go` |`.go` | [`gofmt`](https://golang.org/cmd/gofmt/) (Default) |
|
||||
| Handlebars | `Handlebars`, `HTML (Handlebars)` |`.hbs`, `.handlebars` | [`JS Beautify`](https://github.com/beautify-web/js-beautify) (Default), [`Pretty Diff`](https://github.com/prettydiff/prettydiff) |
|
||||
| Haskell | `Haskell` |`.hs` | [`stylish-haskell`](https://github.com/jaspervdj/stylish-haskell) (Default) |
|
||||
|
|
@ -94,7 +101,7 @@ See [all supported options in the documentation at `docs/options.md`](https://g
|
|||
| OCaml | `OCaml` |`.ml` | [`ocp-indent`](https://www.typerex.org/ocp-indent.html) (Default) |
|
||||
| Pawn | `Pawn` | | [`Uncrustify`](https://github.com/uncrustify/uncrustify) (Default) |
|
||||
| Perl | `Perl`, `Perl 6` |`.pl` | [`Perltidy`](http://perltidy.sourceforge.net/) (Default) |
|
||||
| PHP | `PHP` |`.php`, `.module`, `.inc` | [`PHP-CS-Fixer`](http://php.net/manual/en/install.php) (Default), [`PHPCBF`](http://php.net/manual/en/install.php) |
|
||||
| PHP | `PHP` |`.php`, `.module`, `.inc` | [`PHP-CS-Fixer`](https://github.com/FriendsOfPHP/PHP-CS-Fixer) (Default), [`PHPCBF`](http://php.net/manual/en/install.php) |
|
||||
| Puppet | `Puppet` |`.pp` | [`puppet-lint`](http://puppet-lint.com/) (Default) |
|
||||
| Python | `Python` |`.py` | [`autopep8`](https://github.com/hhatto/autopep8) (Default), [`yapf`](https://github.com/google/yapf) |
|
||||
| R | `R` |`.r`, `.R` | [`formatR`](https://github.com/yihui/formatR) (Default) |
|
||||
|
|
@ -169,13 +176,13 @@ Edit your `.jsbeautifyrc` file in any of the following locations:
|
|||
|
||||
**Note**: *Comments are supported in `.jsbeautifyrc` thanks to [strip-json-comments](https://github.com/sindresorhus/strip-json-comments).*
|
||||
|
||||
See examples of both ways inside [`examples/`](https://github.com/donaldpipowitch/atom-beautify/tree/master/examples)
|
||||
See examples of both ways inside [`examples/`](examples)
|
||||
|
||||
See [all supported options in the documentation at `docs/options.md`](https://github.com/Glavin001/atom-beautify/blob/master/docs/options.md).
|
||||
See [all supported options in the documentation at `docs/options.md`](docs/options.md).
|
||||
|
||||
### Simple
|
||||
|
||||
See [examples/simple-jsbeautifyrc/.jsbeautifyrc](https://github.com/donaldpipowitch/atom-beautify/blob/master/examples/simple-jsbeautifyrc/.jsbeautifyrc).
|
||||
See [examples/simple-jsbeautifyrc/.jsbeautifyrc](examples/simple-jsbeautifyrc/.jsbeautifyrc).
|
||||
|
||||
```json
|
||||
{
|
||||
|
|
@ -193,7 +200,7 @@ See [examples/simple-jsbeautifyrc/.jsbeautifyrc](https://github.com/donaldpipowi
|
|||
|
||||
### Nested (Recommended)
|
||||
|
||||
See [examples/nested-jsbeautifyrc/.jsbeautifyrc](https://github.com/donaldpipowitch/atom-beautify/blob/master/examples/nested-jsbeautifyrc/.jsbeautifyrc).
|
||||
See [examples/nested-jsbeautifyrc/.jsbeautifyrc](examples/nested-jsbeautifyrc/.jsbeautifyrc).
|
||||
|
||||
```json
|
||||
{
|
||||
|
|
@ -231,16 +238,16 @@ See [examples/nested-jsbeautifyrc/.jsbeautifyrc](https://github.com/donaldpipowi
|
|||
|
||||
## Troubleshooting
|
||||
|
||||
See [`docs/troubleshooting.md`](https://github.com/Glavin001/atom-beautify/blob/master/docs/troubleshooting.md).
|
||||
See [`docs/troubleshooting.md`](docs/troubleshooting.md).
|
||||
|
||||
## Contributing
|
||||
|
||||
[See all contributors on GitHub](https://github.com/donaldpipowitch/atom-beautify/graphs/contributors).
|
||||
[See all contributors on GitHub](../../graphs/contributors).
|
||||
|
||||
Please update the [CHANGELOG.md](https://github.com/donaldpipowitch/atom-beautify/blob/master/CHANGELOG.md),
|
||||
add yourself as a contributor to the [package.json](https://github.com/donaldpipowitch/atom-beautify/blob/master/package.json),
|
||||
Please update the [CHANGELOG.md](CHANGELOG.md),
|
||||
add yourself as a contributor to the [package.json](package.json),
|
||||
and submit a [Pull Request on GitHub](https://help.github.com/articles/using-pull-requests/).
|
||||
|
||||
## License
|
||||
|
||||
[MIT](https://github.com/donaldpipowitch/atom-beautify/blob/master/LICENSE.md) © [Glavin Wiechert](https://github.com/Glavin001)
|
||||
[MIT](LICENSE.md) © [Glavin Wiechert](https://github.com/Glavin001)
|
||||
|
|
|
|||
121
docs/options.md
121
docs/options.md
|
|
@ -3000,6 +3000,100 @@ Indentation size/length (Supported by Gherkin formatter)
|
|||
}
|
||||
```
|
||||
|
||||
#### [GLSL](#glsl)
|
||||
|
||||
**Supported Beautifiers**: [`clang-format`](#clang-format)
|
||||
|
||||
| Option | clang-format |
|
||||
| --- | --- |
|
||||
| `disabled` | :white_check_mark: |
|
||||
| `default_beautifier` | :white_check_mark: |
|
||||
| `beautify_on_save` | :white_check_mark: |
|
||||
| `configPath` | :white_check_mark: |
|
||||
|
||||
**Description**:
|
||||
|
||||
Options for language GLSL
|
||||
|
||||
##### [Disable Beautifying Language](#disable-beautifying-language)
|
||||
|
||||
**Important**: This option is only configurable from within Atom Beautify's setting panel.
|
||||
|
||||
**Type**: `boolean`
|
||||
|
||||
**Description**:
|
||||
|
||||
Disable GLSL Beautification
|
||||
|
||||
**How to Configure**
|
||||
|
||||
1. You can open the [Settings View](https://github.com/atom/settings-view) by navigating to
|
||||
*Edit > Preferences (Linux)*, *Atom > Preferences (OS X)*, or *File > Preferences (Windows)*.
|
||||
2. Go into *Packages* and search for "*Atom Beautify*" package.
|
||||
3. Find the option "*Disable Beautifying Language*" and change it to your desired configuration.
|
||||
|
||||
##### [Default Beautifier](#default-beautifier)
|
||||
|
||||
**Important**: This option is only configurable from within Atom Beautify's setting panel.
|
||||
|
||||
**Default**: `clang-format`
|
||||
|
||||
**Type**: `string`
|
||||
|
||||
**Enum**: `clang-format`
|
||||
|
||||
**Description**:
|
||||
|
||||
Default Beautifier to be used for GLSL
|
||||
|
||||
**How to Configure**
|
||||
|
||||
1. You can open the [Settings View](https://github.com/atom/settings-view) by navigating to
|
||||
*Edit > Preferences (Linux)*, *Atom > Preferences (OS X)*, or *File > Preferences (Windows)*.
|
||||
2. Go into *Packages* and search for "*Atom Beautify*" package.
|
||||
3. Find the option "*Default Beautifier*" and change it to your desired configuration.
|
||||
|
||||
##### [Beautify On Save](#beautify-on-save)
|
||||
|
||||
**Important**: This option is only configurable from within Atom Beautify's setting panel.
|
||||
|
||||
**Type**: `boolean`
|
||||
|
||||
**Description**:
|
||||
|
||||
Automatically beautify GLSL files on save
|
||||
|
||||
**How to Configure**
|
||||
|
||||
1. You can open the [Settings View](https://github.com/atom/settings-view) by navigating to
|
||||
*Edit > Preferences (Linux)*, *Atom > Preferences (OS X)*, or *File > Preferences (Windows)*.
|
||||
2. Go into *Packages* and search for "*Atom Beautify*" package.
|
||||
3. Find the option "*Beautify On Save*" and change it to your desired configuration.
|
||||
|
||||
##### [Config Path](#config-path)
|
||||
|
||||
**Namespace**: `glsl`
|
||||
|
||||
**Key**: `configPath`
|
||||
|
||||
**Type**: `string`
|
||||
|
||||
**Supported Beautifiers**: [`clang-format`](#clang-format)
|
||||
|
||||
**Description**:
|
||||
|
||||
Path to clang-format config file. i.e. clang-format.cfg (Supported by clang-format)
|
||||
|
||||
**Example `.jsbeautifyrc` Configuration**
|
||||
|
||||
```json
|
||||
{
|
||||
"glsl": {
|
||||
"configPath": ""
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### [Go](#go)
|
||||
|
||||
**Supported Beautifiers**: [`gofmt`](#gofmt)
|
||||
|
|
@ -16946,6 +17040,33 @@ sort imports (requires isort installed) (Supported by autopep8)
|
|||
```
|
||||
|
||||
|
||||
### clang-format
|
||||
|
||||
##### [Config Path](#config-path)
|
||||
|
||||
**Namespace**: `glsl`
|
||||
|
||||
**Key**: `configPath`
|
||||
|
||||
**Type**: `string`
|
||||
|
||||
**Supported Beautifiers**: [`clang-format`](#clang-format)
|
||||
|
||||
**Description**:
|
||||
|
||||
Path to clang-format config file. i.e. clang-format.cfg (Supported by clang-format)
|
||||
|
||||
**Example `.jsbeautifyrc` Configuration**
|
||||
|
||||
```json
|
||||
{
|
||||
"glsl": {
|
||||
"configPath": ""
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
### coffee-fmt
|
||||
|
||||
##### [Indent size](#indent-size)
|
||||
|
|
|
|||
14
package.json
14
package.json
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "atom-beautify",
|
||||
"main": "./src/beautify",
|
||||
"version": "0.29.12",
|
||||
"version": "0.29.14",
|
||||
"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": {
|
||||
|
|
@ -110,6 +110,10 @@
|
|||
{
|
||||
"name": "Elias Baryshnikov",
|
||||
"url": "https://github.com/qwemaze"
|
||||
},
|
||||
{
|
||||
"name": "Victor Uriarte",
|
||||
"url": "https://github.com/vmuriart"
|
||||
}
|
||||
],
|
||||
"engines": {
|
||||
|
|
@ -122,15 +126,14 @@
|
|||
"bluebird": "^3.4.3",
|
||||
"coffee-fmt": "^0.12.0",
|
||||
"coffee-formatter": "^0.1.2",
|
||||
"coffee-script": "^1.10.0",
|
||||
"coffee-script": "^1.11.0",
|
||||
"csscomb": "^3.1.7",
|
||||
"diff": "^3.0.0",
|
||||
"diff": "3.0.0",
|
||||
"editorconfig": "^0.13.2",
|
||||
"event-kit": "^2.1.0",
|
||||
"expand-home-dir": "0.0.3",
|
||||
"extend": "^3.0.0",
|
||||
"gherkin": "2.12.2",
|
||||
"github": "^3.1.0",
|
||||
"handlebars": "^4.0.2",
|
||||
"js-beautify": "^1.6.3",
|
||||
"jscs": "^3.0.7",
|
||||
|
|
@ -286,7 +289,8 @@
|
|||
"ux markup",
|
||||
"cljfmt",
|
||||
"bash",
|
||||
"beautysh"
|
||||
"beautysh",
|
||||
"glsl"
|
||||
],
|
||||
"devDependencies": {
|
||||
"coffeelint": "^1.10.1",
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ module.exports = class ClangFormat extends Beautifier
|
|||
"C++": false
|
||||
"C": false
|
||||
"Objective-C": false
|
||||
"GLSL": true
|
||||
}
|
||||
|
||||
###
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ module.exports = class JSBeautify extends Beautifier
|
|||
Handlebars: true
|
||||
Mustache: true
|
||||
JavaScript: true
|
||||
EJS: true
|
||||
JSX: true
|
||||
JSON: true
|
||||
CSS:
|
||||
indent_size: true
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ path = require('path')
|
|||
module.exports = class PHPCSFixer extends Beautifier
|
||||
|
||||
name: 'PHP-CS-Fixer'
|
||||
link: "http://php.net/manual/en/install.php"
|
||||
link: "https://github.com/FriendsOfPHP/PHP-CS-Fixer"
|
||||
|
||||
options:
|
||||
PHP: true
|
||||
|
|
@ -44,7 +44,7 @@ module.exports = class PHPCSFixer extends Beautifier
|
|||
], {
|
||||
ignoreReturnCode: true
|
||||
help: {
|
||||
link: "http://php.net/manual/en/install.php"
|
||||
link: "https://github.com/FriendsOfPHP/PHP-CS-Fixer"
|
||||
}
|
||||
})
|
||||
.then(=>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ module.exports = class Remark extends Beautifier
|
|||
return new @Promise((resolve, reject) ->
|
||||
try
|
||||
remark = require 'remark'
|
||||
cleanMarkdown = remark.process(text, options)
|
||||
cleanMarkdown = remark().process(text, options).toString()
|
||||
resolve cleanMarkdown
|
||||
catch err
|
||||
@error("Remark error: #{err}")
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@ $ = null
|
|||
# }
|
||||
getScrollTop = (editor) ->
|
||||
view = atom.views.getView(editor)
|
||||
view.getScrollTop()
|
||||
view?.getScrollTop()
|
||||
setScrollTop = (editor, value) ->
|
||||
view = atom.views.getView(editor)
|
||||
view.setScrollTop value
|
||||
view?.setScrollTop value
|
||||
|
||||
getCursors = (editor) ->
|
||||
cursors = editor.getCursors()
|
||||
|
|
@ -281,11 +281,9 @@ beautifyDirectory = ({target}) ->
|
|||
return
|
||||
|
||||
debug = () ->
|
||||
|
||||
try
|
||||
open = require("open")
|
||||
fs ?= require "fs"
|
||||
GitHubApi = require("github")
|
||||
github = new GitHubApi()
|
||||
|
||||
plugin.checkUnsupportedOptions()
|
||||
|
||||
|
|
@ -302,11 +300,7 @@ debug = () ->
|
|||
if not editor?
|
||||
return confirm("Active Editor not found.\n" +
|
||||
"Please select a Text Editor first to beautify.")
|
||||
return unless confirm('Are you ready to debug Atom Beautify?\n\n'+
|
||||
'Warning: This will create an anonymous Gist on GitHub (publically accessible and cannot be easily deleted) '+
|
||||
'containing the contents of your active Text Editor.\n'+
|
||||
'Be sure to delete any private text from your active Text Editor before continuing '+
|
||||
'to ensure you are not sharing undesirable private information.')
|
||||
return unless confirm('Are you ready to debug Atom Beautify?')
|
||||
debugInfo = ""
|
||||
headers = []
|
||||
tocEl = "<TABLEOFCONTENTS/>"
|
||||
|
|
@ -367,7 +361,7 @@ debug = () ->
|
|||
addInfo('Selected Beautifier', selectedBeautifier.name)
|
||||
|
||||
# Get current editor's text
|
||||
text = editor.getText()
|
||||
text = editor.getText() or ""
|
||||
|
||||
# Contents
|
||||
codeBlockSyntax = (language?.name ? grammarName).toLowerCase().split(' ')[0]
|
||||
|
|
@ -450,8 +444,9 @@ debug = () ->
|
|||
addInfo('Beautified File Contents', "\n```#{codeBlockSyntax}\n#{result}\n```")
|
||||
# Diff
|
||||
JsDiff = require('diff')
|
||||
diff = JsDiff.createPatch(filePath, text, \
|
||||
result, "original", "beautified")
|
||||
if typeof result is "string"
|
||||
diff = JsDiff.createPatch(filePath or "", text or "", \
|
||||
result or "", "original", "beautified")
|
||||
addInfo('Original vs. Beautified Diff', "\n```#{codeBlockSyntax}\n#{diff}\n```")
|
||||
|
||||
addHeader(3, "Logs")
|
||||
|
|
@ -472,40 +467,20 @@ debug = () ->
|
|||
# Replace TABLEOFCONTENTS
|
||||
debugInfo = debugInfo.replace(tocEl, toc)
|
||||
|
||||
# Save to clipboard
|
||||
# atom.clipboard.write(debugInfo)
|
||||
github.gists.create({
|
||||
files: {
|
||||
"debug.md": {
|
||||
"content": debugInfo
|
||||
}
|
||||
},
|
||||
public: true,
|
||||
description: "Atom-Beautify debugging information"
|
||||
}, (err, res) ->
|
||||
# console.log(err, res)
|
||||
if err
|
||||
confirm("An error occurred when creating the Gist: "+err)
|
||||
else
|
||||
gistUrl = res.html_url
|
||||
# Create Gist
|
||||
open(gistUrl)
|
||||
confirm("Your Atom Beautify debugging information can be found in the public Gist:\n#{res.html_url}\n\n" +
|
||||
# 'You can now paste this into an Issue you are reporting here\n' +
|
||||
# 'https://github.com/Glavin001/atom-beautify/issues/\n\n' +
|
||||
# 'Please follow the contribution guidelines found at\n' +
|
||||
# 'https://github.com/Glavin001/atom-beautify/blob/master/CONTRIBUTING.md\n\n' +
|
||||
'Warning: Be sure to look over the debug info before you send it '+
|
||||
'to ensure you are not sharing undesirable private information.\n\n'+
|
||||
'If you want to delete this anonymous Gist read\n'+
|
||||
'https://help.github.com/articles/deleting-an-anonymous-gist/'
|
||||
)
|
||||
# Create GitHub Issue
|
||||
return unless confirm("Would you like to create a new Issue on GitHub now?")
|
||||
issueTemplate = fs.readFileSync(path.resolve(__dirname, "../ISSUE_TEMPLATE.md")).toString()
|
||||
body = issueTemplate.replace("<INSERT GIST HERE>", gistUrl)#.replace("<INSERT CODE HERE>", text)
|
||||
open("https://github.com/Glavin001/atom-beautify/issues/new?body=#{encodeURIComponent(body)}")
|
||||
# Save to new TextEditor
|
||||
atom.workspace.open()
|
||||
.then((editor) ->
|
||||
editor.setText(debugInfo)
|
||||
confirm("""Please login to GitHub and create a Gist named \"debug.md\" (Markdown file) with your debugging information.
|
||||
Then add a link to your Gist in your GitHub Issue.
|
||||
Thank you!
|
||||
|
||||
Gist: https://gist.github.com/
|
||||
GitHub Issues: https://github.com/Glavin001/atom-beautify/issues
|
||||
""")
|
||||
)
|
||||
.catch((error) ->
|
||||
confirm("An error occurred when creating the Gist: "+error.message)
|
||||
)
|
||||
try
|
||||
beautifier.beautify(text, allOptions, grammarName, filePath)
|
||||
|
|
@ -514,6 +489,19 @@ debug = () ->
|
|||
catch e
|
||||
return cb(e)
|
||||
)
|
||||
.catch((error) ->
|
||||
stack = error.stack
|
||||
detail = error.description or error.message
|
||||
atom?.notifications?.addError(error.message, {
|
||||
stack, detail, dismissable : true
|
||||
})
|
||||
)
|
||||
catch error
|
||||
stack = error.stack
|
||||
detail = error.description or error.message
|
||||
atom?.notifications?.addError(error.message, {
|
||||
stack, detail, dismissable : true
|
||||
})
|
||||
|
||||
handleSaveEvent = ->
|
||||
atom.workspace.observeTextEditors (editor) ->
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ module.exports = {
|
|||
Supported Grammars
|
||||
###
|
||||
grammars: [
|
||||
"EJS"
|
||||
"JavaScript Template"
|
||||
"HTML (Angular)"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ module.exports = {
|
|||
extensions: [
|
||||
"f90"
|
||||
"F90"
|
||||
"f95"
|
||||
"F95"
|
||||
]
|
||||
|
||||
###
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
module.exports = {
|
||||
|
||||
name: "GLSL"
|
||||
namespace: "glsl"
|
||||
|
||||
###
|
||||
Supported Grammars
|
||||
###
|
||||
grammars: [
|
||||
"C"
|
||||
"opencl"
|
||||
"GLSL"
|
||||
]
|
||||
|
||||
###
|
||||
Supported extensions
|
||||
###
|
||||
extensions: [
|
||||
"vert"
|
||||
"frag"
|
||||
]
|
||||
|
||||
options:
|
||||
configPath:
|
||||
type: 'string'
|
||||
default: ""
|
||||
description: "Path to clang-format config file. i.e. clang-format.cfg"
|
||||
|
||||
}
|
||||
|
|
@ -30,6 +30,7 @@ module.exports = class Languages
|
|||
"erb"
|
||||
"erlang"
|
||||
"gherkin"
|
||||
"glsl"
|
||||
"go"
|
||||
"fortran"
|
||||
"handlebars"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ module.exports = {
|
|||
Supported extensions
|
||||
###
|
||||
extensions: [
|
||||
'sld', 'xml', 'xhtml', 'xsd', 'xsl', 'jsp', 'gsp'
|
||||
'sld', 'xml', 'xhtml', 'xsd', 'xsl', 'jsp', 'gsp', 'plist', 'recipe'
|
||||
]
|
||||
|
||||
defaultBeautifier: "Pretty Diff"
|
||||
|
|
|
|||
Loading…
Reference in New Issue