mirror of
https://github.com/amix/vimrc
synced 2025-08-08 23:04:59 +08:00
Updated vimrc
This commit is contained in:
@ -10,7 +10,7 @@
|
||||
"
|
||||
"============================================================================
|
||||
|
||||
if exists("g:loaded_syntastic_r_lint_checker")
|
||||
if exists('g:loaded_syntastic_r_lint_checker')
|
||||
finish
|
||||
endif
|
||||
let g:loaded_syntastic_r_lint_checker = 1
|
||||
@ -28,10 +28,10 @@ set cpo&vim
|
||||
|
||||
function! SyntaxCheckers_r_lint_GetHighlightRegex(item)
|
||||
let term = matchstr(a:item['text'], '\m`\zs[^`]\+\ze`')
|
||||
if term == ''
|
||||
if term ==# ''
|
||||
let term = matchstr(a:item['text'], "\\m'\\zs[^']\\+\\ze'")
|
||||
endif
|
||||
return term != '' ? '\V' . escape(term, '\') : ''
|
||||
return term !=# '' ? '\V' . escape(term, '\') : ''
|
||||
endfunction
|
||||
|
||||
function! SyntaxCheckers_r_lint_IsAvailable() dict
|
||||
|
@ -20,7 +20,7 @@
|
||||
"
|
||||
" let g:syntastic_enable_r_svtools_checker = 1
|
||||
|
||||
if exists("g:loaded_syntastic_r_svtools_checker")
|
||||
if exists('g:loaded_syntastic_r_svtools_checker')
|
||||
finish
|
||||
endif
|
||||
let g:loaded_syntastic_r_svtools_checker = 1
|
||||
@ -34,7 +34,7 @@ set cpo&vim
|
||||
|
||||
function! SyntaxCheckers_r_svtools_GetHighlightRegex(item)
|
||||
let term = matchstr(a:item['text'], "\\m'\\zs[^']\\+\\ze'")
|
||||
return term != '' ? '\V' . escape(term, '\') : ''
|
||||
return term !=# '' ? '\V' . escape(term, '\') : ''
|
||||
endfunction
|
||||
|
||||
function! SyntaxCheckers_r_svtools_IsAvailable() dict
|
||||
@ -46,11 +46,6 @@ function! SyntaxCheckers_r_svtools_IsAvailable() dict
|
||||
endfunction
|
||||
|
||||
function! SyntaxCheckers_r_svtools_GetLocList() dict
|
||||
if !exists('g:syntastic_enable_r_svtools_checker') || !g:syntastic_enable_r_svtools_checker
|
||||
call syntastic#log#error('checker r/svtools: checks disabled for security reasons; set g:syntastic_enable_r_svtools_checker to 1 to override')
|
||||
return []
|
||||
endif
|
||||
|
||||
let setwd = syntastic#util#isRunningWindows() ? 'setwd("' . escape(getcwd(), '"\') . '"); ' : ''
|
||||
let makeprg = self.getExecEscaped() . ' --slave --restore --no-save' .
|
||||
\ ' -e ' . syntastic#util#shescape(setwd . 'library(svTools); ' .
|
||||
@ -70,7 +65,8 @@ endfunction
|
||||
call g:SyntasticRegistry.CreateAndRegisterChecker({
|
||||
\ 'filetype': 'r',
|
||||
\ 'name': 'svtools',
|
||||
\ 'exec': 'R' })
|
||||
\ 'exec': 'R',
|
||||
\ 'enable': 'enable_r_svtools_checker'})
|
||||
|
||||
let &cpo = s:save_cpo
|
||||
unlet s:save_cpo
|
||||
|
Reference in New Issue
Block a user