hasufell/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1638 from ssiegel/use-vanilla-rscript

Browse Source 
Use --vanilla switch for Rscript
This commit is contained in:
w0rp 2018-06-12 19:01:45 +01:00 committed by GitHub
commit d9746a4572
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ale_linters/r/lintr.vim
View File

@ -22,7 +22,7 @@ function! ale_linters#r#lintr#GetCommand(buffer) abort
\ . l:lint_cmd \ . l:lint_cmd
return ale#path#BufferCdString(a:buffer) return ale#path#BufferCdString(a:buffer)
\ . 'Rscript -e ' \ . 'Rscript --vanilla -e '
\ . ale#Escape(l:cmd_string) . ' %t' \ . ale#Escape(l:cmd_string) . ' %t'
endfunction endfunction

6
test/command_callback/test_lintr_command_callback.vader
View File

@ -16,7 +16,7 @@ After:
Execute(The default lintr command should be correct): Execute(The default lintr command should be correct):
AssertEqual AssertEqual
\ 'cd ' . ale#Escape(getcwd()) . ' && ' \ 'cd ' . ale#Escape(getcwd()) . ' && '
\ . 'Rscript -e ' \ . 'Rscript --vanilla -e '
\ . ale#Escape('suppressPackageStartupMessages(library(lintr));' \ . ale#Escape('suppressPackageStartupMessages(library(lintr));'
\ . 'lint(cache = FALSE, commandArgs(TRUE), ' \ . 'lint(cache = FALSE, commandArgs(TRUE), '
\ . 'with_defaults())') \ . 'with_defaults())')
@ -28,7 +28,7 @@ Execute(The lintr options should be configurable):
AssertEqual AssertEqual
\ 'cd ' . ale#Escape(getcwd()) . ' && ' \ 'cd ' . ale#Escape(getcwd()) . ' && '
\ . 'Rscript -e ' \ . 'Rscript --vanilla -e '
\ . ale#Escape('suppressPackageStartupMessages(library(lintr));' \ . ale#Escape('suppressPackageStartupMessages(library(lintr));'
\ . 'lint(cache = FALSE, commandArgs(TRUE), ' \ . 'lint(cache = FALSE, commandArgs(TRUE), '
\ . 'with_defaults(object_usage_linter = NULL))') \ . '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 AssertEqual
\ 'cd ' . ale#Escape(getcwd()) . ' && ' \ 'cd ' . ale#Escape(getcwd()) . ' && '
\ . 'Rscript -e ' \ . 'Rscript --vanilla -e '
\ . ale#Escape('suppressPackageStartupMessages(library(lintr));' \ . ale#Escape('suppressPackageStartupMessages(library(lintr));'
\ . 'lint_package(cache = FALSE, ' \ . 'lint_package(cache = FALSE, '
\ . 'linters = with_defaults())') \ . 'linters = with_defaults())')