1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-03-14 02:35:41 +08:00

Fix AppVeyor lint (#3801)

This commit is contained in:
Wang Shidong 2020-09-12 07:35:25 +08:00 committed by GitHub
parent 17deeab4b6
commit 94145bd3aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 30 deletions

View File

@ -233,14 +233,14 @@ endfunction
" "
function! s:self._array(input) abort function! s:self._array(input) abort
let ary = [] let ary = []
let _ = self._consume(a:input, '\[') call self._consume(a:input, '\[')
call self._skip(a:input) call self._skip(a:input)
while !self._eof(a:input) && !self._match(a:input, '\]') while !self._eof(a:input) && !self._match(a:input, '\]')
let ary += [self._value(a:input)] let ary += [self._value(a:input)]
call self._consume(a:input, ',\?') call self._consume(a:input, ',\?')
call self._skip(a:input) call self._skip(a:input)
endwhile endwhile
let _ = self._consume(a:input, '\]') call self._consume(a:input, '\]')
return ary return ary
endfunction endfunction

View File

@ -131,11 +131,22 @@ function! s:self.setbufvar(buf, dict) abort
endfor endfor
endfunction endfunction
" https://vi.stackexchange.com/questions/16585/how-to-differentiate-quickfix-window-buffers-and-location-list-buffers
if has('patch-7.4-2215') " && exists('*getwininfo')
function! s:self.get_qf_winnr() abort function! s:self.get_qf_winnr() abort
let wins = filter(getwininfo(), 'v:val.quickfix && !v:val.loclist') let wins = filter(getwininfo(), 'v:val.quickfix && !v:val.loclist')
" assert(len(wins) <= 1) " assert(len(wins) <= 1)
return empty(wins) ? 0 : wins[0].winnr return empty(wins) ? 0 : wins[0].winnr
endfunction endfunction
else
function! s:self.get_qf_winnr() abort
let buffers = split(self.__cmp.execute('ls!'), "\n")
call filter(buffers, 'v:val =~# "\\V[Quickfix List]"')
" :cclose removes the buffer from the list (in my config only??)
" assert(len(buffers) <= 1)
return empty(buffers) ? 0 : eval(matchstr(buffers[0], '\v^\s*\zs\d+'))
endfunction
endif
function! s:self.is_qf_win(winnr) abort function! s:self.is_qf_win(winnr) abort
return a:winnr ==# self.get_qf_winnr() return a:winnr ==# self.get_qf_winnr()
@ -188,7 +199,6 @@ endfunction
if has('nvim') if has('nvim')
function! s:self.getchar(...) abort function! s:self.getchar(...) abort
if !empty(get(g:, '_spacevim_input_list', [])) if !empty(get(g:, '_spacevim_input_list', []))
sleep 1000m
return remove(g:_spacevim_input_list, 0) return remove(g:_spacevim_input_list, 0)
endif endif
let ret = call('getchar', a:000) let ret = call('getchar', a:000)
@ -197,7 +207,6 @@ if has('nvim')
else else
function! s:self.getchar(...) abort function! s:self.getchar(...) abort
if !empty(get(g:, '_spacevim_input_list', [])) if !empty(get(g:, '_spacevim_input_list', []))
sleep 1000m
return remove(g:_spacevim_input_list, 0) return remove(g:_spacevim_input_list, 0)
endif endif
let ret = call('getchar', a:000) let ret = call('getchar', a:000)

View File

@ -79,6 +79,11 @@ if has('nvim')
endfunction endfunction
else else
function! s:self.is_float(winnr) abort function! s:self.is_float(winnr) abort
" vim without win_getid() is old, which do not support floating window.
" so if_float always return 0
if !exists('*win_getid')
return 0
endif
let id = win_getid(a:winnr) let id = win_getid(a:winnr)
if id > 0 && exists('*popup_getoptions') if id > 0 && exists('*popup_getoptions')
try try

View File

@ -9,6 +9,7 @@
let s:SYS = SpaceVim#api#import('system') let s:SYS = SpaceVim#api#import('system')
let s:JOB = SpaceVim#api#import('job') let s:JOB = SpaceVim#api#import('job')
let s:VIM = SpaceVim#api#import('vim')
let s:CMP = SpaceVim#api#import('vim#compatible') let s:CMP = SpaceVim#api#import('vim#compatible')
@ -198,30 +199,11 @@ function! s:disable_welcome() abort
endfunction endfunction
function! s:close_quickfix() abort function! s:close_quickfix() abort
if winnr() == s:get_qf_winnr() if winnr() == s:VIM.get_qf_winnr()
cclose cclose
else else
lclose lclose
endif endif
endfunction endfunction
" https://vi.stackexchange.com/questions/16585/how-to-differentiate-quickfix-window-buffers-and-location-list-buffers
if has('patch-7.4-2215') " && exists('*getwininfo')
function! s:get_qf_winnr() abort
let wins = filter(getwininfo(), 'v:val.quickfix && !v:val.loclist')
" assert(len(wins) <= 1)
return empty(wins) ? 0 : wins[0].winnr
endfunction
else
let s:k_msg_qflist = '[Quickfix List]'
function! s:get_qf_winnr() abort
let buffers = s:CMP.execute('ls!')
call filter(buffers, 'v:val =~ "\\V".s:k_msg_qflist')
" :cclose removes the buffer from the list (in my config only??)
" assert(len(buffers) <= 1)
return empty(buffers) ? 0 : eval(matchstr(buffers[0], '\v^\s*\zs\d+'))
endfunction
endif
" vim:set et sw=2: " vim:set et sw=2:

View File

@ -1,5 +1,4 @@
Execute ( SpaceVim plugin: tabmanager.vim ): Execute ( SpaceVim plugin: tabmanager.vim ):
call SpaceVim#plugins#tabmanager#open() call SpaceVim#plugins#tabmanager#open()
LeaderGuide " "
AssertEqual &ft, 'SpaceVimTabsManager' AssertEqual &ft, 'SpaceVimTabsManager'

0
vimfiler Normal file
View File