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

Minor cleanup.

Browse Source
This commit is contained in:
LCD 47 2014-03-10 15:50:58 +02:00
parent da6520c69f
commit 2850d4145a
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugin/syntastic.vim
View File

@ -18,7 +18,7 @@ if has('reltime')
let g:syntastic_start = reltime() let g:syntastic_start = reltime()
endif endif
let g:syntastic_version = '3.3.0-121' let g:syntastic_version = '3.3.0-122'
" Sanity checks {{{1 " Sanity checks {{{1
@ -305,17 +305,16 @@ function! s:CacheErrors(checker_names) " {{{2
let names = [] let names = []
for checker in clist for checker in clist
let type = checker.getFiletype() let cname = checker.getFiletype() . '/' . checker.getName()
let name = checker.getName() call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Invoking checker: ' . cname)
call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Invoking checker: ' . type . '/' . name)
let loclist = checker.getLocList() let loclist = checker.getLocList()
if !loclist.isEmpty() if !loclist.isEmpty()
if decorate_errors if decorate_errors
call loclist.decorate(type, name) call loclist.decorate(cname)
endif endif
call add(names, [type, name]) call add(names, cname)
let newLoclist = newLoclist.extend(loclist) let newLoclist = newLoclist.extend(loclist)
@ -327,13 +326,13 @@ function! s:CacheErrors(checker_names) " {{{2
" set names {{{3 " set names {{{3
if !empty(names) if !empty(names)
if len(syntastic#util#unique(map( copy(names), 'v:val[0]' ))) == 1 if len(syntastic#util#unique(map( copy(names), 'substitute(v:val, "\\m/.*", "", "")' ))) == 1
let type = names[0][0] let type = substitute(names[0], '\m/.*', '', '')
let name = join(map(names, 'v:val[1]'), ', ') let name = join(map( names, 'substitute(v:val, "\\m.\\{-}/", "", "")' ), ', ')
call newLoclist.setName( name . ' ('. type . ')' ) call newLoclist.setName( name . ' ('. type . ')' )
else else
" checkers from mixed types " checkers from mixed types
call newLoclist.setName(join(map(names, 'v:val[0] . "/" . v:val[1]'), ', ')) call newLoclist.setName(join(names, ', '))
endif endif
endif endif
" }}}3 " }}}3
@ -427,7 +426,7 @@ function! SyntasticMake(options) " {{{2
endif endif
lgetexpr err_lines lgetexpr err_lines
let errors = copy(getloclist(0)) let errors = deepcopy(getloclist(0))
if has_key(a:options, 'cwd') if has_key(a:options, 'cwd')
execute 'lcd ' . fnameescape(old_cwd) execute 'lcd ' . fnameescape(old_cwd)

4
plugin/syntastic/loclist.vim
View File

@ -114,9 +114,9 @@ function! g:SyntasticLoclist.setName(name) " {{{2
let self._name = a:name let self._name = a:name
endfunction " }}}2 endfunction " }}}2
function! g:SyntasticLoclist.decorate(filetype, name) " {{{2 function! g:SyntasticLoclist.decorate(tag) " {{{2
for e in self._rawLoclist for e in self._rawLoclist
let e['text'] .= ' [' . a:filetype . '/' . a:name . ']' let e['text'] .= ' [' . a:tag . ']'
endfor endfor
endfunction " }}}2 endfunction " }}}2