diff options
| author | w0rp <w0rp@users.noreply.github.com> | 2018-06-12 19:01:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 19:01:45 +0100 |
| commit | d9746a4572c5f097f602cb3a06b18a4ad2fad678 (patch) | |
| tree | 6971afc6e90f55542d7c2ba953c4cc7793e56381 | |
| parent | 22a9dcd03e3585851c48717c70c7ae7363b6e70c (diff) | |
| parent | 42192c1593e106922b483e94a738697aa29fa1ce (diff) | |
| download | ale-d9746a4572c5f097f602cb3a06b18a4ad2fad678.zip | |
Merge pull request #1638 from ssiegel/use-vanilla-rscript
Use --vanilla switch for Rscript
| -rw-r--r-- | ale_linters/r/lintr.vim | 2 | ||||
| -rw-r--r-- | test/command_callback/test_lintr_command_callback.vader | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ale_linters/r/lintr.vim b/ale_linters/r/lintr.vim index 51e5c562..8f74c9b8 100644 --- a/ale_linters/r/lintr.vim +++ b/ale_linters/r/lintr.vim @@ -22,7 +22,7 @@ function! ale_linters#r#lintr#GetCommand(buffer) abort \ . l:lint_cmd return ale#path#BufferCdString(a:buffer) - \ . 'Rscript -e ' + \ . 'Rscript --vanilla -e ' \ . ale#Escape(l:cmd_string) . ' %t' endfunction diff --git a/test/command_callback/test_lintr_command_callback.vader b/test/command_callback/test_lintr_command_callback.vader index e655328b..2f7dfb1d 100644 --- a/test/command_callback/test_lintr_command_callback.vader +++ b/test/command_callback/test_lintr_command_callback.vader @@ -16,7 +16,7 @@ After: Execute(The default lintr command should be correct): AssertEqual \ 'cd ' . ale#Escape(getcwd()) . ' && ' - \ . 'Rscript -e ' + \ . 'Rscript --vanilla -e ' \ . ale#Escape('suppressPackageStartupMessages(library(lintr));' \ . 'lint(cache = FALSE, commandArgs(TRUE), ' \ . 'with_defaults())') @@ -28,7 +28,7 @@ Execute(The lintr options should be configurable): AssertEqual \ 'cd ' . ale#Escape(getcwd()) . ' && ' - \ . 'Rscript -e ' + \ . 'Rscript --vanilla -e ' \ . ale#Escape('suppressPackageStartupMessages(library(lintr));' \ . 'lint(cache = FALSE, commandArgs(TRUE), ' \ . 'with_defaults(object_usage_linter = NULL))') @@ -40,7 +40,7 @@ Execute(If the lint_package flag is set, lintr::lint_package should be called): AssertEqual \ 'cd ' . ale#Escape(getcwd()) . ' && ' - \ . 'Rscript -e ' + \ . 'Rscript --vanilla -e ' \ . ale#Escape('suppressPackageStartupMessages(library(lintr));' \ . 'lint_package(cache = FALSE, ' \ . 'linters = with_defaults())') |