summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Pertsev <morhetz@gmail.com>2017-08-17 16:38:02 +0300
committerw0rp <devw0rp@gmail.com>2017-08-30 22:20:35 +0100
commit6e423a94cd428917a5efed6611f46bbc9fe33176 (patch)
tree0e977295d54c03c04bfb6019b1884042c5b79521
parentc09f8f576407dae8792eae0af5da969e16958125 (diff)
downloadale-6e423a94cd428917a5efed6611f46bbc9fe33176.zip
Fix docs for prettier-eslint ver
-rw-r--r--README.md2
-rw-r--r--doc/ale-javascript.txt11
-rw-r--r--doc/ale.txt2
3 files changed, 2 insertions, 13 deletions
diff --git a/README.md b/README.md
index 67238dcd..fd1ef322 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ formatting.
| HTML | [HTMLHint](http://htmlhint.com/), [proselint](http://proselint.com/), [tidy](http://www.html-tidy.org/) |
| Idris | [idris](http://www.idris-lang.org/) |
| Java | [checkstyle](http://checkstyle.sourceforge.net), [javac](http://www.oracle.com/technetwork/java/javase/downloads/index.html) |
-| JavaScript | [eslint](http://eslint.org/), [jscs](http://jscs.info/), [jshint](http://jshint.com/), [flow](https://flowtype.org/), [prettier](https://github.com/prettier/prettier), prettier-eslint, prettier-standard, [standard](http://standardjs.com/), [xo](https://github.com/sindresorhus/xo)
+| JavaScript | [eslint](http://eslint.org/), [jscs](http://jscs.info/), [jshint](http://jshint.com/), [flow](https://flowtype.org/), [prettier](https://github.com/prettier/prettier), prettier-eslint >= 4.2.0, prettier-standard, [standard](http://standardjs.com/), [xo](https://github.com/sindresorhus/xo)
| JSON | [jsonlint](http://zaa.ch/jsonlint/) |
| Kotlin | [kotlinc](https://kotlinlang.org) !!, [ktlint](https://ktlint.github.io) !! see `:help ale-integration-kotlin` for configuration instructions
| LaTeX | [chktex](http://www.nongnu.org/chktex/), [lacheck](https://www.ctan.org/pkg/lacheck), [proselint](http://proselint.com/) |
diff --git a/doc/ale-javascript.txt b/doc/ale-javascript.txt
index 95d2504a..806c7f8c 100644
--- a/doc/ale-javascript.txt
+++ b/doc/ale-javascript.txt
@@ -96,17 +96,6 @@ g:ale_javascript_prettier_use_local_config *g:ale_javascript_prettier_use_lo
===============================================================================
prettier-eslint *ale-javascript-prettier-eslint*
-ALE supports `prettier-eslint` for easy integration with projects, but it is
-not recommended for new projects. ALE instead recommends configuring
-|g:ale_fixers| to run `'prettier'` and `'eslint'` in a sequence like so: >
-
- let g:ale_fixers = {'javascript': ['prettier', 'eslint']}
-<
-
-This is because `prettier-eslint` cannot be configured to use the ESLint
-configuration file for input given via stdin, which is how ALE integrates with
-the tool.
-
g:ale_javascript_prettier_eslint_executable
*g:ale_javascript_prettier_eslint_executable*
*b:ale_javascript_prettier_eslint_executable*
diff --git a/doc/ale.txt b/doc/ale.txt
index dfdb2693..9055d866 100644
--- a/doc/ale.txt
+++ b/doc/ale.txt
@@ -215,7 +215,7 @@ Notes:
* HTML: `HTMLHint`, `proselint`, `tidy`
* Idris: `idris`
* Java: `checkstyle`, `javac`
-* JavaScript: `eslint`, `jscs`, `jshint`, `flow`, `prettier`, `prettier-eslint`, `prettier-standard`, `standard`, `xo`
+* JavaScript: `eslint`, `jscs`, `jshint`, `flow`, `prettier`, `prettier-eslint` >= 4.2.0, `prettier-standard`, `standard`, `xo`
* JSON: `jsonlint`
* Kotlin: `kotlinc`, `ktlint`
* LaTeX (tex): `chktex`, `lacheck`, `proselint`