lua error highlighting standardized
This commit is contained in:
parent
75afb52d7d
commit
9cc9851069
@ -20,6 +20,29 @@ if !executable('luac')
|
|||||||
finish
|
finish
|
||||||
endif
|
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 == '<eof>'
|
||||||
|
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()
|
function! SyntaxCheckers_lua_GetLocList()
|
||||||
let makeprg = 'luac -p ' . shellescape(expand('%'))
|
let makeprg = 'luac -p ' . shellescape(expand('%'))
|
||||||
let errorformat = 'luac: %#%f:%l: %m'
|
let errorformat = 'luac: %#%f:%l: %m'
|
||||||
@ -27,36 +50,13 @@ function! SyntaxCheckers_lua_GetLocList()
|
|||||||
let loclist = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
|
let loclist = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
|
||||||
|
|
||||||
let bufn = bufnr('')
|
let bufn = bufnr('')
|
||||||
call clearmatches()
|
|
||||||
for pos in loclist
|
for pos in loclist
|
||||||
let pos['bufnr'] = bufn
|
let pos['bufnr'] = bufn
|
||||||
let pos['type'] = 'E'
|
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 == '<eof>'
|
|
||||||
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
|
endfor
|
||||||
|
|
||||||
|
call syntastic#HighlightErrors(loclist, function("SyntaxCheckers_lua_Term"))
|
||||||
|
|
||||||
return loclist
|
return loclist
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user