Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
edc5dee226
@ -268,6 +268,12 @@ function! ale#engine#SetResults(buffer, loclist) abort
|
|||||||
if g:ale_set_highlights
|
if g:ale_set_highlights
|
||||||
call ale#highlight#SetHighlights(a:buffer, a:loclist)
|
call ale#highlight#SetHighlights(a:buffer, a:loclist)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if g:ale_echo_cursor
|
||||||
|
" Try and echo the warning now.
|
||||||
|
" This will only do something meaningful if we're in normal mode.
|
||||||
|
call ale#cursor#EchoCursorWarning()
|
||||||
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! s:SetExitCode(job, exit_code) abort
|
function! s:SetExitCode(job, exit_code) abort
|
||||||
|
@ -35,7 +35,9 @@ function! ale#sign#ParseSigns(line_list) abort
|
|||||||
" строка=1 id=1000001 имя=ALEErrorSign
|
" строка=1 id=1000001 имя=ALEErrorSign
|
||||||
" 行=1 識別子=1000001 名前=ALEWarningSign
|
" 行=1 識別子=1000001 名前=ALEWarningSign
|
||||||
" línea=12 id=1000001 nombre=ALEWarningSign
|
" línea=12 id=1000001 nombre=ALEWarningSign
|
||||||
let l:pattern = '^.*=\d*\s\+.*=\(\d\+\)\s\+.*=ALE\(Warning\|Error\|Dummy\)Sign'
|
" riga=1 id=1000001, nome=ALEWarningSign
|
||||||
|
let l:pattern = '^.*=\d*\s\+.*=\(\d\+\)\,\?\s\+.*=ALE\(Warning\|Error\|Dummy\)Sign'
|
||||||
|
|
||||||
|
|
||||||
let l:id_list = []
|
let l:id_list = []
|
||||||
|
|
||||||
|
@ -166,6 +166,10 @@ function! s:ALEInitAuGroups() abort
|
|||||||
autocmd!
|
autocmd!
|
||||||
if g:ale_enabled && g:ale_echo_cursor
|
if g:ale_enabled && g:ale_echo_cursor
|
||||||
autocmd CursorMoved,CursorHold * call ale#cursor#EchoCursorWarningWithDelay()
|
autocmd CursorMoved,CursorHold * call ale#cursor#EchoCursorWarningWithDelay()
|
||||||
|
" Look for a warning to echo as soon as we leave Insert mode.
|
||||||
|
" The script's position variable used when moving the cursor will
|
||||||
|
" not be changed here.
|
||||||
|
autocmd InsertLeave * call ale#cursor#EchoCursorWarning()
|
||||||
endif
|
endif
|
||||||
augroup END
|
augroup END
|
||||||
|
|
||||||
|
@ -37,7 +37,16 @@ Before:
|
|||||||
\ },
|
\ },
|
||||||
\}
|
\}
|
||||||
|
|
||||||
|
" Turn off other features, we only care about this one feature in this test.
|
||||||
|
let g:ale_set_loclist = 0
|
||||||
|
let g:ale_set_signs = 0
|
||||||
|
let g:ale_set_highlights = 0
|
||||||
|
|
||||||
After:
|
After:
|
||||||
|
let g:ale_set_loclist = 1
|
||||||
|
let g:ale_set_signs = 1
|
||||||
|
let g:ale_set_highlights = 1
|
||||||
|
|
||||||
unlet! g:output
|
unlet! g:output
|
||||||
unlet! g:lines
|
unlet! g:lines
|
||||||
let g:ale_buffer_info = {}
|
let g:ale_buffer_info = {}
|
||||||
@ -52,7 +61,7 @@ Execute(Evaluate the cursor function at line 1):
|
|||||||
|
|
||||||
Then(Check the cursor output):
|
Then(Check the cursor output):
|
||||||
redir => g:output
|
redir => g:output
|
||||||
:mess
|
silent mess
|
||||||
redir END
|
redir END
|
||||||
|
|
||||||
let g:lines = split(g:output, "\n")
|
let g:lines = split(g:output, "\n")
|
||||||
@ -65,7 +74,7 @@ Execute(Evaluate the cursor function at line 2):
|
|||||||
|
|
||||||
Then(Check the cursor output):
|
Then(Check the cursor output):
|
||||||
redir => g:output
|
redir => g:output
|
||||||
:mess
|
silent mess
|
||||||
redir END
|
redir END
|
||||||
|
|
||||||
let g:lines = split(g:output, "\n")
|
let g:lines = split(g:output, "\n")
|
||||||
@ -79,13 +88,43 @@ Execute(Evaluate the cursor function later in line 2):
|
|||||||
|
|
||||||
Then(Check the cursor output):
|
Then(Check the cursor output):
|
||||||
redir => g:output
|
redir => g:output
|
||||||
:mess
|
silent mess
|
||||||
redir END
|
redir END
|
||||||
|
|
||||||
let g:lines = split(g:output, "\n")
|
let g:lines = split(g:output, "\n")
|
||||||
|
|
||||||
AssertEqual 'Missing radix parameter (radix)', g:lines[-1]
|
AssertEqual 'Missing radix parameter (radix)', g:lines[-1]
|
||||||
|
|
||||||
|
Execute(Set results for a lint cycle, with the cursor on line 1):
|
||||||
|
:1
|
||||||
|
call ale#engine#SetResults(
|
||||||
|
\ bufnr('%'),
|
||||||
|
\ g:ale_buffer_info[bufnr('%')].loclist,
|
||||||
|
\)
|
||||||
|
|
||||||
|
Then(Check the cursor output):
|
||||||
|
redir => g:output
|
||||||
|
silent mess
|
||||||
|
redir END
|
||||||
|
|
||||||
|
let g:lines = split(g:output, "\n")
|
||||||
|
|
||||||
|
AssertEqual 'Missing semicolon. (semi)', g:lines[-1]
|
||||||
|
|
||||||
|
Execute(Simulate leaving insert mode on line 2):
|
||||||
|
:2
|
||||||
|
normal 16h
|
||||||
|
doautocmd InsertLeave
|
||||||
|
|
||||||
|
Then(Check the cursor output):
|
||||||
|
redir => g:output
|
||||||
|
silent mess
|
||||||
|
redir END
|
||||||
|
|
||||||
|
let g:lines = split(g:output, "\n")
|
||||||
|
|
||||||
|
AssertEqual 'Infix operators must be spaced. (space-infix-ops)', g:lines[-1]
|
||||||
|
|
||||||
Execute(Evaluate the cursor detail function at line 1):
|
Execute(Evaluate the cursor detail function at line 1):
|
||||||
:1
|
:1
|
||||||
call ale#cursor#ShowCursorDetail()
|
call ale#cursor#ShowCursorDetail()
|
||||||
@ -95,8 +134,6 @@ Then(Check the cursor output):
|
|||||||
:mess
|
:mess
|
||||||
redir END
|
redir END
|
||||||
|
|
||||||
let g:lines = split(g:output, "\n")
|
|
||||||
|
|
||||||
AssertEqual "Every statement should end with a semicolon", g:lines[-1]
|
AssertEqual "Every statement should end with a semicolon", g:lines[-1]
|
||||||
|
|
||||||
Execute(Evaluate the cursor detail function at line 2):
|
Execute(Evaluate the cursor detail function at line 2):
|
||||||
@ -108,6 +145,4 @@ Then(Check the cursor output):
|
|||||||
:mess
|
:mess
|
||||||
redir END
|
redir END
|
||||||
|
|
||||||
let g:lines = split(g:output, "\n")
|
|
||||||
|
|
||||||
AssertEqual "Infix operators must be spaced. (space-infix-ops)", g:lines[-1]
|
AssertEqual "Infix operators must be spaced. (space-infix-ops)", g:lines[-1]
|
||||||
|
Loading…
Reference in New Issue
Block a user