diff --git a/syntax_checkers/lua.vim b/syntax_checkers/lua.vim index fa6c82a0..426db88c 100644 --- a/syntax_checkers/lua.vim +++ b/syntax_checkers/lua.vim @@ -20,6 +20,29 @@ if !executable('luac') finish endif +function! SyntaxCheckers_lua_Term(pos) + let near = matchstr(a:pos['text'], "near '[^']\\+'") + let result = '' + if len(near) > 0 + let near = split(near, "'")[1] + if near == '' + let p = getpos('$') + let a:pos['lnum'] = p[1] + let a:pos['col'] = p[2] + let result = '\%'.p[2].'c' + else + let result = '\V'.near + endif + let open = matchstr(a:pos['text'], "(to close '[^']\\+' at line [0-9]\\+)") + if len(open) > 0 + let oline = split(open, "'")[1:2] + let line = 0+strpart(oline[1], 9) + call matchadd('SpellCap', '\%'.line.'l\V'.oline[0]) + endif + endif + return result +endfunction + function! SyntaxCheckers_lua_GetLocList() let makeprg = 'luac -p ' . shellescape(expand('%')) let errorformat = 'luac: %#%f:%l: %m' @@ -27,36 +50,13 @@ function! SyntaxCheckers_lua_GetLocList() let loclist = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) let bufn = bufnr('') - call clearmatches() for pos in loclist let pos['bufnr'] = bufn let pos['type'] = 'E' - if pos['col'] - let lastcol = col([pos['lnum'], '$']) - let lcol = min([lastcol, pos['col']]) - call matchadd('SpellBad', '\%'.pos['lnum'].'l\%'.lcol.'c') - else - let near = matchstr(pos['text'], "near '[^']\\+'") - if len(near) > 0 - let near = split(near, "'")[1] - if near == '' - let p = getpos('$') - let pos['lnum'] = p[1] - let pos['col'] = p[2] - call matchadd('SpellBad', '\%'.p[1].'l\%'.p[2].'c') - else - call matchadd('SpellBad', '\%'.pos['lnum'].'l\V'.near) - endif - let open = matchstr(pos['text'], "(to close '[^']\\+' at line [0-9]\\+)") - if len(open) > 0 - let oline = split(open, "'")[1:2] - let line = 0+strpart(oline[1], 9) - call matchadd('SpellCap', '\%'.line.'l\V'.oline[0]) - endif - endif - endif endfor + call syntastic#HighlightErrors(loclist, function("SyntaxCheckers_lua_Term")) + return loclist endfunction