From 62dae1cc6b492a1d408cbc9b961ef4b050d8e357 Mon Sep 17 00:00:00 2001 From: w0rp Date: Sat, 27 May 2017 18:31:52 +0100 Subject: Support both prettier and prettier-eslint --- doc/ale-javascript.txt | 58 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 14 deletions(-) (limited to 'doc/ale-javascript.txt') diff --git a/doc/ale-javascript.txt b/doc/ale-javascript.txt index 4340ffee..2eab1177 100644 --- a/doc/ale-javascript.txt +++ b/doc/ale-javascript.txt @@ -45,20 +45,16 @@ prettier *ale-javascript-prettier* g:ale_javascript_prettier_executable *g:ale_javascript_prettier_executable* *b:ale_javascript_prettier_executable* Type: |String| - Default: `'prettier-eslint'` + Default: `'prettier'` - ALE will first discover the prettier-eslint path in an ancestor node_modules + ALE will first discover the prettier path in an ancestor node_modules directory. If no such path exists, this variable will be used instead. - This variable can be set to change the path to prettier-eslint or if you want - to use the original Prettier CLI. - - If you wish to use only a globally installed version of prettier or - prettier-eslint, set the set + If you wish to use only a globally installed version of prettier set |g:ale_javascript_prettier_use_global| to `1`. -g:ale_javascript_prettier_options *g:ale_javascript_prettier_options* +g:ale_javascript_prettier_options *g:ale_javascript_prettier_options* *b:ale_javascript_prettier_options* Type: |String| Default: `''` @@ -66,16 +62,50 @@ g:ale_javascript_prettier_options *g:ale_javascript_prettier_options This variable can be set to pass additional options to prettier. -g:ale_javascript_prettier_use_global *g:ale_javascript_eslint_use_global* - *b:ale_javascript_eslint_use_global* +g:ale_javascript_prettier_use_global *g:ale_javascript_prettier_use_global* + *b:ale_javascript_prettier_use_global* + Type: |Number| + Default: `0` + + This variable controls whether or not ALE will search for a local path for + prettier first. If this variable is set to `1`, then ALE will always use the + global version of Prettier. + + +------------------------------------------------------------------------------- +prettier-eslint *ale-javascript-prettier-eslint* + +g:ale_javascript_prettier_eslint_executable + *g:ale_javascript_prettier_eslint_executable* + *b:ale_javascript_prettier_eslint_executable* + Type: |String| + Default: `'prettier-eslint'` + + ALE will first discover the prettier-eslint path in an ancestor node_modules + directory. If no such path exists, this variable will be used instead. + + If you wish to use only a globally installed version of prettier-eslint set + |g:ale_javascript_prettier_eslint_use_global| to `1`. + + +g:ale_javascript_prettier_eslint_options + *g:ale_javascript_prettier_eslint_options* + *b:ale_javascript_prettier_eslint_options* + Type: |String| + Default: `''` + + This variable can be set to pass additional options to prettier-eslint. + + +g:ale_javascript_prettier_eslint_use_global + *g:ale_javascript_prettier_eslint_use_global* + *b:ale_javascript_prettier_eslint_use_global* Type: |Number| Default: `0` This variable controls whether or not ALE will search for a local path for - prettier-eslint-cli first. If this variable is set to `1`, - then ALE will always use the global version of Prettier or Prettier-ESLint, - depending on g:ale_javascript_prettier_executable, in preference to - locally installed versions of Prettier / Prettier-ESLint in node_modules. + prettier-eslint first. If this variable is set to `1`, then ALE will always + use the global version of Prettier-eslint. ------------------------------------------------------------------------------- -- cgit v1.2.3