From e4ddd32c840c405b12abe76fefc860062989e429 Mon Sep 17 00:00:00 2001
From: ourigen <79729735+ourigen@users.noreply.github.com>
Date: Sun, 4 Jul 2021 12:34:35 +0000
Subject: [PATCH] Let R_languageserver consider .Renviron (#3744)

* Fix languageserver.vim to consider Renviron

* Update test_r_languageserver.vader

* Update credits
---
 ale_linters/r/languageserver.vim        | 3 ++-
 test/linter/test_r_languageserver.vader | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ale_linters/r/languageserver.vim b/ale_linters/r/languageserver.vim
index febe66bd..bab869d1 100644
--- a/ale_linters/r/languageserver.vim
+++ b/ale_linters/r/languageserver.vim
@@ -1,4 +1,5 @@
 " Author: Eric Zhao <21zhaoe@protonmail.com>
+" Author: ourigen <https://github.com/ourigen>
 " Description: Implementation of the Language Server Protocol for R.
 
 call ale#Set('r_languageserver_cmd', 'languageserver::run()')
@@ -7,7 +8,7 @@ call ale#Set('r_languageserver_config', {})
 function! ale_linters#r#languageserver#GetCommand(buffer) abort
     let l:cmd_string = ale#Var(a:buffer, 'r_languageserver_cmd')
 
-    return 'Rscript --vanilla -e ' . ale#Escape(l:cmd_string)
+    return 'Rscript --no-save --no-restore --no-site-file --no-init-file -e ' . ale#Escape(l:cmd_string)
 endfunction
 
 function! ale_linters#r#languageserver#GetProjectRoot(buffer) abort
diff --git a/test/linter/test_r_languageserver.vader b/test/linter/test_r_languageserver.vader
index b5be0396..1a6fe851 100644
--- a/test/linter/test_r_languageserver.vader
+++ b/test/linter/test_r_languageserver.vader
@@ -5,7 +5,7 @@ After:
   call ale#assert#TearDownLinterTest()
 
 Execute(The default executable path should be correct):
-  AssertLinter 'Rscript', 'Rscript --vanilla -e ' . ale#Escape('languageserver::run()')
+  AssertLinter 'Rscript', 'Rscript --no-save --no-restore --no-site-file --no-init-file -e ' . ale#Escape('languageserver::run()')
 
 Execute(The project root should be detected correctly):
   AssertLSPProject '.'