From 369e3876f00d497ee9f7d2f6a3936837f6bcdcb7 Mon Sep 17 00:00:00 2001
From: w0rp <devw0rp@gmail.com>
Date: Fri, 28 Aug 2020 08:23:02 +0100
Subject: [PATCH] #3324 - Enable rls by default

---
 autoload/ale/linter.vim                  |  4 ++--
 doc/ale-rust.txt                         | 19 +++++++++++--------
 doc/ale.txt                              |  2 +-
 test/test_filetype_linter_defaults.vader |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/autoload/ale/linter.vim b/autoload/ale/linter.vim
index fecfeed6..8d89cd5c 100644
--- a/autoload/ale/linter.vim
+++ b/autoload/ale/linter.vim
@@ -32,7 +32,7 @@ let s:default_ale_linter_aliases = {
 "
 " No linters are used for plaintext files by default.
 "
-" Only cargo is enabled for Rust by default.
+" Only cargo and rls are enabled for Rust by default.
 " rpmlint is disabled by default because it can result in code execution.
 " hhast is disabled by default because it executes code in the project root.
 "
@@ -46,7 +46,7 @@ let s:default_ale_linters = {
 \   'perl': ['perlcritic'],
 \   'perl6': [],
 \   'python': ['flake8', 'mypy', 'pylint', 'pyright'],
-\   'rust': ['cargo'],
+\   'rust': ['cargo', 'rls'],
 \   'spec': [],
 \   'text': [],
 \   'vue': ['eslint', 'vls'],
diff --git a/doc/ale-rust.txt b/doc/ale-rust.txt
index 2c0222b7..f4b4e7b7 100644
--- a/doc/ale-rust.txt
+++ b/doc/ale-rust.txt
@@ -31,11 +31,11 @@ Integration Information
   5. rustfmt -- If you have `rustfmt` installed, you can use it as a fixer to
      consistently reformat your Rust code.
 
-  Only cargo is enabled by default. To switch to using rustc instead of cargo,
-  configure |g:ale_linters| appropriately: >
+  Only cargo and rls are enabled by default. To switch to using rustc instead
+  of cargo, configure |g:ale_linters| appropriately: >
 
   " See the help text for the option for more information.
-  let g:ale_linters = {'rust': ['rustc']}
+  let g:ale_linters = {'rust': ['rustc', 'rls']}
 <
 
   Also note that rustc 1.12. or later is needed.
@@ -60,6 +60,7 @@ g:ale_rust_analyzer_config                         *g:ale_rust_analyzer_config*
 
   Dictionary with configuration settings for rust-analyzer.
 
+
 ===============================================================================
 cargo                                                          *ale-rust-cargo*
 
@@ -252,23 +253,25 @@ g:ale_rust_ignore_error_codes                   *g:ale_rust_ignore_error_codes*
   >
   let g:ale_rust_ignore_error_codes = ['E0432', 'E0433']
 
+
 g:ale_rust_ignore_secondary_spans           *g:ale_rust_ignore_secondary_spans*
                                             *b:ale_rust_ignore_secondary_spans*
   Type: Number
   Default: 0
 
-	When set to 1, instructs the Rust error repporting to ignore secondary
-	spans. The problem with secondary spans is that they sometimes appear in
-	error messages before the main cause of the error, for example: >
+  When set to 1, instructs the Rust error reporting to ignore secondary spans.
+  The problem with secondary spans is that they sometimes appear in error
+  messages before the main cause of the error, for example: >
 
   1 src/main.rs|98 col 5 error| this function takes 4 parameters but 5
-	parameters were supplied: defined here
+    parameters were supplied: defined here
   2 src/main.rs|430 col 32 error| this function takes 4 parameters but 5
-	parameters were supplied: expected 4 parameters
+    parameters were supplied: expected 4 parameters
 <
   This is due to the sorting by line numbers. With this option set to 1,
   the 'defined here' span will not be presented.
 
+
 ===============================================================================
 rustfmt                                                      *ale-rust-rustfmt*
 
diff --git a/doc/ale.txt b/doc/ale.txt
index da430042..f2f77a83 100644
--- a/doc/ale.txt
+++ b/doc/ale.txt
@@ -1441,7 +1441,7 @@ g:ale_linters                                                   *g:ale_linters*
   \   'perl': ['perlcritic'],
   \   'perl6': [],
   \   'python': ['flake8', 'mypy', 'pylint', 'pyright'],
-  \   'rust': ['cargo'],
+  \   'rust': ['cargo', 'rls'],
   \   'spec': [],
   \   'text': [],
   \   'vue': ['eslint', 'vls'],
diff --git a/test/test_filetype_linter_defaults.vader b/test/test_filetype_linter_defaults.vader
index 842cc394..e9980536 100644
--- a/test/test_filetype_linter_defaults.vader
+++ b/test/test_filetype_linter_defaults.vader
@@ -39,7 +39,7 @@ Execute(The defaults for the python filetype should be correct):
   AssertEqual [], GetLinterNames('python')
 
 Execute(The defaults for the rust filetype should be correct):
-  AssertEqual ['cargo'], GetLinterNames('rust')
+  AssertEqual ['cargo', 'rls'], GetLinterNames('rust')
 
   let g:ale_linters_explicit = 1