summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ale_linters/r/lintr.vim9
-rw-r--r--test/command_callback/test_lintr_command_callback.vader8
2 files changed, 9 insertions, 8 deletions
diff --git a/ale_linters/r/lintr.vim b/ale_linters/r/lintr.vim
index 006bf47c..ac1d8569 100644
--- a/ale_linters/r/lintr.vim
+++ b/ale_linters/r/lintr.vim
@@ -11,14 +11,15 @@ let g:ale_r_lintr_lint_package = get(g:, 'ale_r_lintr_lint_package', 0)
function! ale_linters#r#lintr#GetCommand(buffer) abort
if ale#Var(a:buffer, 'r_lintr_lint_package')
- let l:lint_cmd = 'lint_package'
+ let l:lint_cmd = 'lint_package(cache = FALSE, linters = '
+ \ . ale#Var(a:buffer, 'r_lintr_options') . ')'
else
- let l:lint_cmd = 'lint'
+ let l:lint_cmd = 'lint(cache = FALSE, commandArgs(TRUE), '
+ \ . ale#Var(a:buffer, 'r_lintr_options') . ')'
endif
let l:cmd_string = 'suppressPackageStartupMessages(library(lintr));'
- \ . l:lint_cmd . '(cache = FALSE, commandArgs(TRUE),'
- \ . ale#Var(a:buffer, 'r_lintr_options') . ')'
+ \ . l:lint_cmd
return ale#path#BufferCdString(a:buffer)
\ . 'Rscript -e '
diff --git a/test/command_callback/test_lintr_command_callback.vader b/test/command_callback/test_lintr_command_callback.vader
index 33259e05..e655328b 100644
--- a/test/command_callback/test_lintr_command_callback.vader
+++ b/test/command_callback/test_lintr_command_callback.vader
@@ -18,7 +18,7 @@ Execute(The default lintr command should be correct):
\ 'cd ' . ale#Escape(getcwd()) . ' && '
\ . 'Rscript -e '
\ . ale#Escape('suppressPackageStartupMessages(library(lintr));'
- \ . 'lint(cache = FALSE, commandArgs(TRUE),'
+ \ . 'lint(cache = FALSE, commandArgs(TRUE), '
\ . 'with_defaults())')
\ . ' %t',
\ ale_linters#r#lintr#GetCommand(bufnr(''))
@@ -30,7 +30,7 @@ Execute(The lintr options should be configurable):
\ 'cd ' . ale#Escape(getcwd()) . ' && '
\ . 'Rscript -e '
\ . ale#Escape('suppressPackageStartupMessages(library(lintr));'
- \ . 'lint(cache = FALSE, commandArgs(TRUE),'
+ \ . 'lint(cache = FALSE, commandArgs(TRUE), '
\ . 'with_defaults(object_usage_linter = NULL))')
\ . ' %t',
\ ale_linters#r#lintr#GetCommand(bufnr(''))
@@ -42,7 +42,7 @@ Execute(If the lint_package flag is set, lintr::lint_package should be called):
\ 'cd ' . ale#Escape(getcwd()) . ' && '
\ . 'Rscript -e '
\ . ale#Escape('suppressPackageStartupMessages(library(lintr));'
- \ . 'lint_package(cache = FALSE, commandArgs(TRUE),'
- \ . 'with_defaults())')
+ \ . 'lint_package(cache = FALSE, '
+ \ . 'linters = with_defaults())')
\ . ' %t',
\ ale_linters#r#lintr#GetCommand(bufnr(''))