Move the initialization of augroups to then events file
This commit is contained in:
parent
3a5887df2c
commit
fd261d7a17
@ -1,77 +0,0 @@
|
|||||||
function! ale#autocmd#InitAuGroups() abort
|
|
||||||
" This value used to be a Boolean as a Number, and is now a String.
|
|
||||||
let l:text_changed = '' . g:ale_lint_on_text_changed
|
|
||||||
|
|
||||||
augroup ALEPatternOptionsGroup
|
|
||||||
autocmd!
|
|
||||||
autocmd BufEnter,BufRead * call ale#pattern_options#SetOptions(str2nr(expand('<abuf>')))
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
augroup ALERunOnTextChangedGroup
|
|
||||||
autocmd!
|
|
||||||
if g:ale_enabled
|
|
||||||
if l:text_changed is? 'always' || l:text_changed is# '1'
|
|
||||||
autocmd TextChanged,TextChangedI * call ale#Queue(g:ale_lint_delay)
|
|
||||||
elseif l:text_changed is? 'normal'
|
|
||||||
autocmd TextChanged * call ale#Queue(g:ale_lint_delay)
|
|
||||||
elseif l:text_changed is? 'insert'
|
|
||||||
autocmd TextChangedI * call ale#Queue(g:ale_lint_delay)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
augroup ALERunOnEnterGroup
|
|
||||||
autocmd!
|
|
||||||
if g:ale_enabled
|
|
||||||
" Handle everything that needs to happen when buffers are entered.
|
|
||||||
autocmd BufEnter * call ale#events#EnterEvent(str2nr(expand('<abuf>')))
|
|
||||||
endif
|
|
||||||
if g:ale_enabled && g:ale_lint_on_enter
|
|
||||||
autocmd BufWinEnter,BufRead * call ale#Queue(0, 'lint_file', str2nr(expand('<abuf>')))
|
|
||||||
" Track when the file is changed outside of Vim.
|
|
||||||
autocmd FileChangedShellPost * call ale#events#FileChangedEvent(str2nr(expand('<abuf>')))
|
|
||||||
endif
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
augroup ALERunOnFiletypeChangeGroup
|
|
||||||
autocmd!
|
|
||||||
if g:ale_enabled && g:ale_lint_on_filetype_changed
|
|
||||||
" Only start linting if the FileType actually changes after
|
|
||||||
" opening a buffer. The FileType will fire when buffers are opened.
|
|
||||||
autocmd FileType * call ale#events#FileTypeEvent(
|
|
||||||
\ str2nr(expand('<abuf>')),
|
|
||||||
\ expand('<amatch>')
|
|
||||||
\)
|
|
||||||
endif
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
augroup ALERunOnSaveGroup
|
|
||||||
autocmd!
|
|
||||||
autocmd BufWritePost * call ale#events#SaveEvent(str2nr(expand('<abuf>')))
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
augroup ALERunOnInsertLeave
|
|
||||||
autocmd!
|
|
||||||
if g:ale_enabled && g:ale_lint_on_insert_leave
|
|
||||||
autocmd InsertLeave * call ale#Queue(0)
|
|
||||||
endif
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
augroup ALECursorGroup
|
|
||||||
autocmd!
|
|
||||||
if g:ale_enabled && g:ale_echo_cursor
|
|
||||||
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
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
if !g:ale_enabled
|
|
||||||
augroup! ALERunOnTextChangedGroup
|
|
||||||
augroup! ALERunOnEnterGroup
|
|
||||||
augroup! ALERunOnInsertLeave
|
|
||||||
augroup! ALECursorGroup
|
|
||||||
endif
|
|
||||||
endfunction
|
|
@ -1,4 +1,5 @@
|
|||||||
" Author: w0rp <devw0rp@gmail.com>
|
" Author: w0rp <devw0rp@gmail.com>
|
||||||
|
" Description: ALE functions for autocmd events.
|
||||||
|
|
||||||
function! ale#events#QuitEvent(buffer) abort
|
function! ale#events#QuitEvent(buffer) abort
|
||||||
" Remember when ALE is quitting for BufWrite, etc.
|
" Remember when ALE is quitting for BufWrite, etc.
|
||||||
@ -67,3 +68,81 @@ function! ale#events#FileChangedEvent(buffer) abort
|
|||||||
call s:LintOnEnter(a:buffer)
|
call s:LintOnEnter(a:buffer)
|
||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
function! ale#events#Init() abort
|
||||||
|
" This value used to be a Boolean as a Number, and is now a String.
|
||||||
|
let l:text_changed = '' . g:ale_lint_on_text_changed
|
||||||
|
|
||||||
|
augroup ALEPatternOptionsGroup
|
||||||
|
autocmd!
|
||||||
|
autocmd BufEnter,BufRead * call ale#pattern_options#SetOptions(str2nr(expand('<abuf>')))
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
augroup ALERunOnTextChangedGroup
|
||||||
|
autocmd!
|
||||||
|
if g:ale_enabled
|
||||||
|
if l:text_changed is? 'always' || l:text_changed is# '1'
|
||||||
|
autocmd TextChanged,TextChangedI * call ale#Queue(g:ale_lint_delay)
|
||||||
|
elseif l:text_changed is? 'normal'
|
||||||
|
autocmd TextChanged * call ale#Queue(g:ale_lint_delay)
|
||||||
|
elseif l:text_changed is? 'insert'
|
||||||
|
autocmd TextChangedI * call ale#Queue(g:ale_lint_delay)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
augroup ALERunOnEnterGroup
|
||||||
|
autocmd!
|
||||||
|
if g:ale_enabled
|
||||||
|
" Handle everything that needs to happen when buffers are entered.
|
||||||
|
autocmd BufEnter * call ale#events#EnterEvent(str2nr(expand('<abuf>')))
|
||||||
|
endif
|
||||||
|
if g:ale_enabled && g:ale_lint_on_enter
|
||||||
|
autocmd BufWinEnter,BufRead * call ale#Queue(0, 'lint_file', str2nr(expand('<abuf>')))
|
||||||
|
" Track when the file is changed outside of Vim.
|
||||||
|
autocmd FileChangedShellPost * call ale#events#FileChangedEvent(str2nr(expand('<abuf>')))
|
||||||
|
endif
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
augroup ALERunOnFiletypeChangeGroup
|
||||||
|
autocmd!
|
||||||
|
if g:ale_enabled && g:ale_lint_on_filetype_changed
|
||||||
|
" Only start linting if the FileType actually changes after
|
||||||
|
" opening a buffer. The FileType will fire when buffers are opened.
|
||||||
|
autocmd FileType * call ale#events#FileTypeEvent(
|
||||||
|
\ str2nr(expand('<abuf>')),
|
||||||
|
\ expand('<amatch>')
|
||||||
|
\)
|
||||||
|
endif
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
augroup ALERunOnSaveGroup
|
||||||
|
autocmd!
|
||||||
|
autocmd BufWritePost * call ale#events#SaveEvent(str2nr(expand('<abuf>')))
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
augroup ALERunOnInsertLeave
|
||||||
|
autocmd!
|
||||||
|
if g:ale_enabled && g:ale_lint_on_insert_leave
|
||||||
|
autocmd InsertLeave * call ale#Queue(0)
|
||||||
|
endif
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
augroup ALECursorGroup
|
||||||
|
autocmd!
|
||||||
|
if g:ale_enabled && g:ale_echo_cursor
|
||||||
|
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
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
if !g:ale_enabled
|
||||||
|
augroup! ALERunOnTextChangedGroup
|
||||||
|
augroup! ALERunOnEnterGroup
|
||||||
|
augroup! ALERunOnInsertLeave
|
||||||
|
augroup! ALECursorGroup
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
@ -48,7 +48,7 @@ function! ale#toggle#Toggle() abort
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
call ale#autocmd#InitAuGroups()
|
call ale#events#Init()
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! ale#toggle#Enable() abort
|
function! ale#toggle#Enable() abort
|
||||||
|
@ -221,7 +221,7 @@ nnoremap <silent> <Plug>(ale_find_references) :ALEFindReferences<Return>
|
|||||||
nnoremap <silent> <Plug>(ale_hover) :ALEHover<Return>
|
nnoremap <silent> <Plug>(ale_hover) :ALEHover<Return>
|
||||||
|
|
||||||
" Set up autocmd groups now.
|
" Set up autocmd groups now.
|
||||||
call ale#autocmd#InitAuGroups()
|
call ale#events#Init()
|
||||||
|
|
||||||
" Housekeeping
|
" Housekeeping
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Before:
|
Before:
|
||||||
function! CheckAutocmd(group)
|
function! CheckAutocmd(group)
|
||||||
call ale#autocmd#InitAuGroups()
|
call ale#events#Init()
|
||||||
|
|
||||||
redir => l:output
|
redir => l:output
|
||||||
execute 'silent! autocmd ' . a:group
|
execute 'silent! autocmd ' . a:group
|
||||||
@ -59,7 +59,7 @@ After:
|
|||||||
call ale#completion#Disable()
|
call ale#completion#Disable()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
call ale#autocmd#InitAuGroups()
|
call ale#events#Init()
|
||||||
|
|
||||||
Execute (g:ale_lint_on_text_changed = 0 should bind no events):
|
Execute (g:ale_lint_on_text_changed = 0 should bind no events):
|
||||||
let g:ale_lint_on_text_changed = 0
|
let g:ale_lint_on_text_changed = 0
|
||||||
|
Loading…
Reference in New Issue
Block a user