vim/syntastic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More preparations for the foreign checkers feature.

Browse Source
This commit is contained in:
LCD 47 2014-02-24 11:04:34 +02:00
parent 25271f89ae
commit e323437303
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugin/syntastic.vim
View File

@ -66,7 +66,7 @@ let g:syntastic_defaults = {
\ 'stl_format': '[Syntax: line:%F (%t)]',
\ 'style_error_symbol': 'S>',
\ 'style_warning_symbol': 'S>',
\ 'warning_symbol': '>>',
\ 'warning_symbol': '>>'
\ }
for s:key in keys(g:syntastic_defaults)
@ -280,7 +280,7 @@ function! s:ClearCache() " {{{2
endfunction " }}}2
"detect and cache all syntax errors in this buffer
function! s:CacheErrors(checkers) " {{{2
function! s:CacheErrors(checker_names) " {{{2
call s:ClearCache()
let newLoclist = g:SyntasticLoclist.New([])
@ -297,21 +297,23 @@ function! s:CacheErrors(checkers) " {{{2
let decorate_errors = (aggregate_errors || len(filetypes) > 1) && syntastic#util#var('id_checkers')
let clist = []
for ft in filetypes
call extend(clist, s:registry.getCheckers(ft, a:checkers))
for type in filetypes
call extend(clist, s:registry.getCheckers(type, a:checker_names))
endfor
let names = []
for checker in clist
call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Invoking checker: ' . checker.getName())
let type = checker.getFiletype()
let name = checker.getName()
call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Invoking checker: ' . type . '/' . name)
let loclist = checker.getLocList()
if !loclist.isEmpty()
if decorate_errors
call loclist.decorate(checker.getFiletype(), checker.getName())
call loclist.decorate(type, name)
endif
call add(names, [checker.getFiletype(), checker.getName()])
call add(names, [type, name])
let newLoclist = newLoclist.extend(loclist)
@ -323,7 +325,7 @@ function! s:CacheErrors(checkers) " {{{2
" set names {{{3
if !empty(names)
if len(syntastic#util#unique(map(copy(names), 'v:val[0]'))) == 1
if len(syntastic#util#unique(map( copy(names), 'v:val[0]' ))) == 1
let type = names[0][0]
let name = join(map(names, 'v:val[1]'), ', ')
call newLoclist.setName( name . ' ('. type . ')' )
@ -336,14 +338,14 @@ function! s:CacheErrors(checkers) " {{{2
" issue warning about no active checkers {{{3
if empty(clist)
if !empty(a:checkers)
if len(a:checkers) == 1
call syntastic#log#warn('checker ' . a:checkers[0] . ' is not active for filetype ' . &filetype)
if !empty(a:checker_names)
if len(a:checker_names) == 1
call syntastic#log#warn('checker ' . a:checker_names[0] . ' is not available')
else
call syntastic#log#warn('checkers ' . join(a:checkers, ', ') . ' are not active for filetype ' . &filetype)
call syntastic#log#warn('checkers ' . join(a:checker_names, ', ') . ' are not available')
endif
else
call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: no active checkers for filetype ' . &filetype)
call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: no checkers available for ' . &filetype)
endif
endif
" }}}3

12
plugin/syntastic/registry.vim
View File

@ -171,17 +171,17 @@ endfunction " }}}2
function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
echomsg "Syntastic info for filetype: " . join(a:ftalias_list, '.')
if len(a:ftalias_list) != 1
let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:normaliseFiletype(v:val)' ))
if len(ft_list) != 1
let available = []
let active = []
for ftalias in a:ftalias_list
let ft = s:normaliseFiletype(ftalias)
call extend(available, map( keys(self.getCheckersMap(ftalias)), 'ft . "/" . v:val' ))
call extend(active, map( self.getCheckers(ftalias, []), 'ft . "/" . v:val.getName()' ))
for ft in ft_list
call extend(available, map( keys(self.getCheckersMap(ft)), 'ft . "/" . v:val' ))
call extend(active, map( self.getCheckers(ft, []), 'ft . "/" . v:val.getName()' ))
endfor
else
let ft = a:ftalias_list[0]
let ft = ft_list[0]
let available = keys(self.getCheckersMap(ft))
let active = map(self.getCheckers(ft, []), 'v:val.getName()')
endif