Merge remote-tracking branch 'upstream/master'

5 files changed, 151 insertions, 147 deletions

diff --git a/doc/ale-c.txt b/doc/ale-c.txt
index fc0d941a..fe28cf4a 100644
--- a/doc/ale-c.txt
+++ b/doc/ale-c.txt
@@ -1,6 +1,9 @@
 ===============================================================================
 ALE C Integration                                               *ale-c-options*
 
+For basic checking of problems with C files, ALE offers the `cc` linter, which
+runs either `clang`, or `gcc`. See |ale-c-cc|.
+
 
 ===============================================================================
 Global Options
@@ -11,12 +14,12 @@ g:ale_c_build_dir_names                               *g:ale_c_build_dir_names*
   Type: |List|
   Default: `['build', 'bin']`
 
-  A list of directory names to be used when searching upwards from cpp
-  files to discover compilation databases with. For directory named `'foo'`,
-  ALE will search for `'foo/compile_commands.json'` in all directories on and above
-  the directory containing the cpp file to find path to compilation database.
-  This feature is useful for the clang tools wrapped around LibTooling (namely
-  here, clang-tidy)
+  A list of directory names to be used when searching upwards from cpp files
+  to discover compilation databases with. For directory named `'foo'`, ALE
+  will search for `'foo/compile_commands.json'` in all directories on and
+  above the directory containing the cpp file to find path to compilation
+  database.  This feature is useful for the clang tools wrapped around
+  LibTooling (namely here, clang-tidy)
 
 
 g:ale_c_build_dir                                           *g:ale_c_build_dir*
@@ -94,22 +97,58 @@ g:ale_c_astyle_project_options                 *g:ale_c_astyle_project_options*
 
 
 ===============================================================================
-clang                                                             *ale-c-clang*
+cc                                                                   *ale-c-cc*
+                                                                    *ale-c-gcc*
+                                                                  *ale-c-clang*
 
-g:ale_c_clang_executable                             *g:ale_c_clang_executable*
-                                                     *b:ale_c_clang_executable*
+g:ale_c_cc_executable                                   *g:ale_c_cc_executable*
+                                                        *b:ale_c_cc_executable*
   Type: |String|
-  Default: `'clang'`
+  Default: `'<auto>'`
+
+  This variable can be changed to use a different executable for a C compiler.
 
-  This variable can be changed to use a different executable for clang.
+  ALE will try to use `clang` if Clang is available, otherwise ALE will
+  default to checking C code with `gcc`.
 
 
-g:ale_c_clang_options                                   *g:ale_c_clang_options*
-                                                        *b:ale_c_clang_options*
+g:ale_c_cc_options                                         *g:ale_c_cc_options*
+                                                           *b:ale_c_cc_options*
   Type: |String|
   Default: `'-std=c11 -Wall'`
 
-  This variable can be changed to modify flags given to clang.
+  This variable can be change to modify flags given to the C compiler.
+
+
+===============================================================================
+ccls                                                               *ale-c-ccls*
+
+g:ale_c_ccls_executable                               *g:ale_c_ccls_executable*
+                                                      *b:ale_c_ccls_executable*
+  Type: |String|
+  Default: `'ccls'`
+
+  This variable can be changed to use a different executable for ccls.
+
+
+g:ale_c_ccls_init_options                           *g:ale_c_ccls_init_options*
+                                                    *b:ale_c_ccls_init_options*
+  Type: |Dictionary|
+  Default: `{}`
+
+  This variable can be changed to customize ccls initialization options.
+  Example: >
+      {
+    \   'cacheDirectory': '/tmp/ccls',
+    \   'cacheFormat': 'binary',
+    \   'diagnostics': {
+    \     'onOpen': 0,
+    \     'opChange': 1000,
+    \   },
+    \ }
+<
+  Visit https://github.com/MaskRay/ccls/wiki/Initialization-options for all
+  available options and explanations.
 
 
 ===============================================================================
@@ -295,25 +334,6 @@ g:ale_c_flawfinder_error_severity           *g:ale_c_flawfinder_error_severity*
 
 
 ===============================================================================
-gcc                                                                 *ale-c-gcc*
-
-g:ale_c_gcc_executable                                 *g:ale_c_gcc_executable*
-                                                       *b:ale_c_gcc_executable*
-  Type: |String|
-  Default: `'gcc'`
-
-  This variable can be changed to use a different executable for gcc.
-
-
-g:ale_c_gcc_options                                       *g:ale_c_gcc_options*
-                                                          *b:ale_c_gcc_options*
-  Type: |String|
-  Default: `'-std=c11 -Wall'`
-
-  This variable can be change to modify flags given to gcc.
-
-
-===============================================================================
 uncrustify                                                   *ale-c-uncrustify*
 
 g:ale_c_uncrustify_executable                   *g:ale_c_uncrustify_executable*
@@ -333,35 +353,4 @@ g:ale_c_uncrustify_options                         *g:ale_c_uncrustify_options*
 
 
 ===============================================================================
-ccls                                                               *ale-c-ccls*
-
-g:ale_c_ccls_executable                               *g:ale_c_ccls_executable*
-                                                      *b:ale_c_ccls_executable*
-  Type: |String|
-  Default: `'ccls'`
-
-  This variable can be changed to use a different executable for ccls.
-
-
-g:ale_c_ccls_init_options                           *g:ale_c_ccls_init_options*
-                                                    *b:ale_c_ccls_init_options*
-  Type: |Dictionary|
-  Default: `{}`
-
-  This variable can be changed to customize ccls initialization options.
-  Example: >
-      {
-    \   'cacheDirectory': '/tmp/ccls',
-    \   'cacheFormat': 'binary',
-    \   'diagnostics': {
-    \     'onOpen': 0,
-    \     'opChange': 1000,
-    \   },
-    \ }
-<
-  Visit https://github.com/MaskRay/ccls/wiki/Initialization-options for all
-  available options and explanations.
-
-
-===============================================================================
   vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/doc/ale-cpp.txt b/doc/ale-cpp.txt
index fbe31370..651b4160 100644
--- a/doc/ale-cpp.txt
+++ b/doc/ale-cpp.txt
@@ -1,6 +1,9 @@
 ===============================================================================
 ALE C++ Integration                                           *ale-cpp-options*
 
+For basic checking of problems with C++ files, ALE offers the `cc` linter,
+which runs either `clang++`, or `gcc`. See |ale-cpp-cc|.
+
 
 ===============================================================================
 Global Options
@@ -38,41 +41,58 @@ g:ale_cpp_astyle_project_options             *g:ale_cpp_astyle_project_options*
 
 
 ===============================================================================
-clang                                                           *ale-cpp-clang*
+cc                                                                 *ale-cpp-cc*
+                                                                  *ale-cpp-gcc*
+                                                                *ale-cpp-clang*
 
-g:ale_cpp_clang_executable                         *g:ale_cpp_clang_executable*
-                                                   *b:ale_cpp_clang_executable*
+g:ale_cpp_cc_executable                               *g:ale_cpp_cc_executable*
+                                                      *b:ale_cpp_cc_executable*
   Type: |String|
-  Default: `'clang++'`
+  Default: `'<auto>'`
+
+  This variable can be changed to use a different executable for a C++ compiler.
 
-  This variable can be changed to use a different executable for clang.
+  ALE will try to use `clang++` if Clang is available, otherwise ALE will
+  default to checking C++ code with `gcc`.
 
 
-g:ale_cpp_clang_options                               *g:ale_cpp_clang_options*
-                                                      *b:ale_cpp_clang_options*
+g:ale_cpp_cc_options                                     *g:ale_cpp_cc_options*
+                                                         *b:ale_cpp_cc_options*
   Type: |String|
   Default: `'-std=c++14 -Wall'`
 
-  This variable can be changed to modify flags given to clang.
+  This variable can be change to modify flags given to the C++ compiler.
 
 
 ===============================================================================
-clangd                                                         *ale-cpp-clangd*
+ccls                                                             *ale-cpp-ccls*
 
-g:ale_cpp_clangd_executable                       *g:ale_cpp_clangd_executable*
-                                                  *b:ale_cpp_clangd_executable*
+g:ale_cpp_ccls_executable                           *g:ale_cpp_ccls_executable*
+                                                    *b:ale_cpp_ccls_executable*
   Type: |String|
-  Default: `'clangd'`
+  Default: `'ccls'`
 
-  This variable can be changed to use a different executable for clangd.
+  This variable can be changed to use a different executable for ccls.
 
 
-g:ale_cpp_clangd_options                             *g:ale_cpp_clangd_options*
-                                                     *b:ale_cpp_clangd_options*
-  Type: |String|
-  Default: `''`
+g:ale_cpp_ccls_init_options                       *g:ale_cpp_ccls_init_options*
+                                                  *b:ale_cpp_ccls_init_options*
+  Type: |Dictionary|
+  Default: `{}`
 
-  This variable can be changed to modify flags given to clangd.
+  This variable can be changed to customize ccls initialization options.
+  Example: >
+      {
+    \   'cacheDirectory': '/tmp/ccls',
+    \   'cacheFormat': 'binary',
+    \   'diagnostics': {
+    \     'onOpen': 0,
+    \     'opChange': 1000,
+    \   },
+    \ }
+<
+  Visit https://github.com/MaskRay/ccls/wiki/Initialization-options for all
+  available options and explanations.
 
 
 ===============================================================================
@@ -107,6 +127,25 @@ g:ale_cpp_clangcheck_options                     *g:ale_cpp_clangcheck_options*
 
 
 ===============================================================================
+clangd                                                         *ale-cpp-clangd*
+
+g:ale_cpp_clangd_executable                       *g:ale_cpp_clangd_executable*
+                                                  *b:ale_cpp_clangd_executable*
+  Type: |String|
+  Default: `'clangd'`
+
+  This variable can be changed to use a different executable for clangd.
+
+
+g:ale_cpp_clangd_options                             *g:ale_cpp_clangd_options*
+                                                     *b:ale_cpp_clangd_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be changed to modify flags given to clangd.
+
+
+===============================================================================
 clang-format                                              *ale-cpp-clangformat*
 
 See |ale-c-clangformat| for information about the available options.
@@ -296,60 +335,10 @@ g:ale_cpp_flawfinder_options                             *g:ale-cpp-flawfinder*
 
 
 ===============================================================================
-gcc                                                               *ale-cpp-gcc*
-
-g:ale_cpp_gcc_executable                             *g:ale_cpp_gcc_executable*
-                                                     *b:ale_cpp_gcc_executable*
-  Type: |String|
-  Default: `'gcc'`
-
-  This variable can be changed to use a different executable for gcc.
-
-
-g:ale_cpp_gcc_options                                   *g:ale_cpp_gcc_options*
-                                                        *b:ale_cpp_gcc_options*
-  Type: |String|
-  Default: `'-std=c++14 -Wall'`
-
-  This variable can be changed to modify flags given to gcc.
-
-
-===============================================================================
 uncrustify                                                 *ale-cpp-uncrustify*
 
 See |ale-c-uncrustify| for information about the available options.
 
 
 ===============================================================================
-ccls                                                             *ale-cpp-ccls*
-
-g:ale_cpp_ccls_executable                           *g:ale_cpp_ccls_executable*
-                                                    *b:ale_cpp_ccls_executable*
-  Type: |String|
-  Default: `'ccls'`
-
-  This variable can be changed to use a different executable for ccls.
-
-
-g:ale_cpp_ccls_init_options                       *g:ale_cpp_ccls_init_options*
-                                                  *b:ale_cpp_ccls_init_options*
-  Type: |Dictionary|
-  Default: `{}`
-
-  This variable can be changed to customize ccls initialization options.
-  Example: >
-      {
-    \   'cacheDirectory': '/tmp/ccls',
-    \   'cacheFormat': 'binary',
-    \   'diagnostics': {
-    \     'onOpen': 0,
-    \     'opChange': 1000,
-    \   },
-    \ }
-<
-  Visit https://github.com/MaskRay/ccls/wiki/Initialization-options for all
-  available options and explanations.
-
-
-===============================================================================
   vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl:
diff --git a/doc/ale-markdown.txt b/doc/ale-markdown.txt
index 4e27eb91..99848878 100644
--- a/doc/ale-markdown.txt
+++ b/doc/ale-markdown.txt
@@ -3,6 +3,17 @@ ALE Markdown Integration                                 *ale-markdown-options*
 
 
 ===============================================================================
+markdownlint                                        *ale-markdown-markdownlint*
+
+g:ale_markdown_markdownlint_options       *g:ale_markdown_markdownlint_options*
+                                          *b:ale_markdown_markdownlint_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be set to pass additional options to markdownlint.
+
+
+===============================================================================
 mdl                                                          *ale-markdown-mdl*
 
 g:ale_markdown_mdl_executable                   *g:ale_markdown_mdl_executable*
diff --git a/doc/ale-supported-languages-and-tools.txt b/doc/ale-supported-languages-and-tools.txt
index 6d495fa9..e1a91b20 100644
--- a/doc/ale-supported-languages-and-tools.txt
+++ b/doc/ale-supported-languages-and-tools.txt
@@ -22,6 +22,7 @@ Notes:
   * `drafter`
 * AsciiDoc
   * `alex`!!
+  * `languagetool`!!
   * `proselint`
   * `redpen`
   * `textlint`
@@ -48,7 +49,7 @@ Notes:
 * C
   * `astyle`
   * `ccls`
-  * `clang`
+  * `clang` (`cc`)
   * `clangd`
   * `clang-format`
   * `clangtidy`!!
@@ -56,7 +57,7 @@ Notes:
   * `cpplint`!!
   * `cquery`
   * `flawfinder`
-  * `gcc`
+  * `gcc` (`cc`)
   * `uncrustify`
 * C#
   * `csc`!!
@@ -66,7 +67,7 @@ Notes:
 * C++ (filetype cpp)
   * `astyle`
   * `ccls`
-  * `clang`
+  * `clang` (`cc`)
   * `clangcheck`!!
   * `clangd`
   * `clang-format`
@@ -76,7 +77,7 @@ Notes:
   * `cpplint`!!
   * `cquery`
   * `flawfinder`
-  * `gcc`
+  * `gcc` (`cc`)
   * `uncrustify`
 * Chef
   * `cookstyle`
@@ -454,6 +455,7 @@ Notes:
 * Swift
   * `sourcekit-lsp`
   * `swiftformat`
+  * `swift-format`
   * `swiftlint`
 * Tcl
   * `nagelfar`!!
diff --git a/doc/ale.txt b/doc/ale.txt
index 1951d7bd..df55b544 100644
--- a/doc/ale.txt
+++ b/doc/ale.txt
@@ -684,7 +684,9 @@ g:ale_completion_enabled                             *g:ale_completion_enabled*
 
   See |ale-completion|
 
-g:ale_completion_tsserver_remove_warnings *g:ale_completion_tsserver_remove_warnings*
+
+                                    *g:ale_completion_tsserver_remove_warnings*
+g:ale_completion_tsserver_remove_warnings
 
   Type: Number
   Default: `0`
@@ -693,6 +695,7 @@ g:ale_completion_tsserver_remove_warnings *g:ale_completion_tsserver_remove_warn
   including those that are a warning. Warnings can be excluded from completed
   items by setting it to `1`.
 
+
 g:ale_completion_autoimport                       *g:ale_completion_autoimport*
 
   Type: Number
@@ -2320,16 +2323,15 @@ documented in additional help files.
     bibclean..............................|ale-bib-bibclean|
   c.......................................|ale-c-options|
     astyle................................|ale-c-astyle|
-    clang.................................|ale-c-clang|
+    cc....................................|ale-c-cc|
+    ccls..................................|ale-c-ccls|
     clangd................................|ale-c-clangd|
     clang-format..........................|ale-c-clangformat|
     clangtidy.............................|ale-c-clangtidy|
     cppcheck..............................|ale-c-cppcheck|
     cquery................................|ale-c-cquery|
     flawfinder............................|ale-c-flawfinder|
-    gcc...................................|ale-c-gcc|
     uncrustify............................|ale-c-uncrustify|
-    ccls..................................|ale-c-ccls|
   chef....................................|ale-chef-options|
     cookstyle.............................|ale-chef-cookstyle|
     foodcritic............................|ale-chef-foodcritic|
@@ -2343,9 +2345,10 @@ documented in additional help files.
     cmake-format..........................|ale-cmake-cmakeformat|
   cpp.....................................|ale-cpp-options|
     astyle................................|ale-cpp-astyle|
-    clang.................................|ale-cpp-clang|
-    clangd................................|ale-cpp-clangd|
+    cc....................................|ale-cpp-cc|
+    ccls..................................|ale-cpp-ccls|
     clangcheck............................|ale-cpp-clangcheck|
+    clangd................................|ale-cpp-clangd|
     clang-format..........................|ale-cpp-clangformat|
     clangtidy.............................|ale-cpp-clangtidy|
     clazy.................................|ale-cpp-clazy|
@@ -2353,9 +2356,7 @@ documented in additional help files.
     cpplint...............................|ale-cpp-cpplint|
     cquery................................|ale-cpp-cquery|
     flawfinder............................|ale-cpp-flawfinder|
-    gcc...................................|ale-cpp-gcc|
     uncrustify............................|ale-cpp-uncrustify|
-    ccls..................................|ale-cpp-ccls|
   c#......................................|ale-cs-options|
     csc...................................|ale-cs-csc|
     mcs...................................|ale-cs-mcs|
@@ -2503,6 +2504,7 @@ documented in additional help files.
     luac..................................|ale-lua-luac|
     luacheck..............................|ale-lua-luacheck|
   markdown................................|ale-markdown-options|
+    markdownlint..........................|ale-markdown-markdownlint|
     mdl...................................|ale-markdown-mdl|
     prettier..............................|ale-markdown-prettier|
     remark-lint...........................|ale-markdown-remark-lint|
@@ -2809,7 +2811,13 @@ ALEGoToDefinition `<options>`                               *ALEGoToDefinition*
   command. Otherwise, Vim will refuse to leave the buffer you're jumping from
   unless you have saved your edits.
 
-  A plug mapping `<Plug>(ale_go_to_definition)` is defined for this command.
+  The following Plug mappings are defined for this command, which correspond
+  to the following commands.
+
+  `<Plug>(ale_go_to_definition)`           - `:ALEGoToDefinition`
+  `<Plug>(ale_go_to_definition_in_tab)`    - `:ALEGoToDefinition -tab`
+  `<Plug>(ale_go_to_definition_in_split)`  - `:ALEGoToDefinition -split`
+  `<Plug>(ale_go_to_definition_in_vsplit)` - `:ALEGoToDefinition -vsplit`
 
 
 ALEGoToTypeDefinition                                   *ALEGoToTypeDefinition*
@@ -2831,8 +2839,13 @@ ALEGoToTypeDefinition                                   *ALEGoToTypeDefinition*
   You can jump back to the position you were at before going to the definition
   of something with jump motions like CTRL-O. See |jump-motions|.
 
-  A plug mapping `<Plug>(ale_go_to_type_definition)` is defined for this
-  command.
+  The following Plug mappings are defined for this command, which correspond
+  to the following commands.
+
+  `<Plug>(ale_go_to_type_definition)`           - `:ALEGoToTypeDefinition`
+  `<Plug>(ale_go_to_type_definition_in_tab)`    - `:ALEGoToTypeDefinition -tab`
+  `<Plug>(ale_go_to_type_definition_in_split)`  - `:ALEGoToTypeDefinition -split`
+  `<Plug>(ale_go_to_type_definition_in_vsplit)` - `:ALEGoToTypeDefinition -vsplit`
 
 
 ALEHover                                                             *ALEHover*