1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-02-02 22:50:06 +08:00

Fix indentline (#1447)

This commit is contained in:
Wang Shidong 2018-03-03 16:28:16 +08:00 committed by GitHub
parent 47c12691a4
commit 845227edde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 30 deletions

View File

@ -109,7 +109,6 @@ function! s:neomake_cursor_move_delay() abort
endfunction endfunction
let s:last_echoed_error = '' let s:last_echoed_error = ''
let s:clv = &conceallevel
function! s:neomake_signatures_current_error(...) abort function! s:neomake_signatures_current_error(...) abort
call s:neomake_signatures_clear() call s:neomake_signatures_clear()
try try
@ -128,7 +127,6 @@ function! s:neomake_signatures_current_error(...) abort
return return
endif endif
let s:last_echoed_error = message let s:last_echoed_error = message
set conceallevel=2
if len(line('.') + 1) > len(message) if len(line('.') + 1) > len(message)
let message = s:STRING.fill(message, len(line('.') + 1)) let message = s:STRING.fill(message, len(line('.') + 1))
endif endif
@ -140,7 +138,6 @@ function! s:neomake_signatures_clear() abort
call timer_stop(s:neomake_cursormoved_timer) call timer_stop(s:neomake_cursormoved_timer)
endif endif
let s:last_echoed_error = '' let s:last_echoed_error = ''
let &conceallevel = s:clv
call s:SIG.clear() call s:SIG.clear()
endfunction endfunction

View File

@ -9,7 +9,7 @@
scriptencoding utf-8 scriptencoding utf-8
function! SpaceVim#layers#ui#plugins() abort function! SpaceVim#layers#ui#plugins() abort
let plugins = [ let plugins = [
\ ['Yggdroot/indentLine'], \ ['Yggdroot/indentLine', {'merged' : 0}],
\ ['majutsushi/tagbar', {'loadconf' : 1}], \ ['majutsushi/tagbar', {'loadconf' : 1}],
\ ['tenfyzhong/tagbar-makefile.vim', {'merged': 0}], \ ['tenfyzhong/tagbar-makefile.vim', {'merged': 0}],
\ ['tenfyzhong/tagbar-proto.vim', {'merged': 0}], \ ['tenfyzhong/tagbar-proto.vim', {'merged': 0}],
@ -29,11 +29,16 @@ function! SpaceVim#layers#ui#plugins() abort
endfunction endfunction
function! SpaceVim#layers#ui#config() abort function! SpaceVim#layers#ui#config() abort
let g:indentLine_color_term = get(g:, 'indentLine_color_term', 239) if g:spacevim_colorscheme_bg == 'dark'
let g:indentLine_color_gui = get(g:, 'indentLine_color_gui', '#09AA08') let g:indentLine_color_term = get(g:, 'indentLine_color_term', 239)
let g:indentLine_char = get(g:, 'indentLine_char', '¦') let g:indentLine_color_gui = get(g:, 'indentLine_color_gui', '#504945')
else
let g:indentLine_color_gui = get(g:, 'indentLine_color_gui', '#d5c4a1')
endif
let g:indentLine_char = get(g:, 'indentLine_char', '┊')
let g:indentLine_concealcursor = 'niv' let g:indentLine_concealcursor = 'niv'
let g:indentLine_conceallevel = 2 let g:indentLine_conceallevel = 2
let g:indentLine_fileType = ['*']
let g:indentLine_fileTypeExclude = ['help', 'man', 'startify', 'vimfiler'] let g:indentLine_fileTypeExclude = ['help', 'man', 'startify', 'vimfiler']
let g:signify_disable_by_default = 0 let g:signify_disable_by_default = 0
let g:signify_line_highlight = 0 let g:signify_line_highlight = 0

View File

@ -186,27 +186,6 @@ function! zvim#util#listDirs(dir) abort
return [] return []
endfunction endfunction
function! zvim#util#OpenVimfiler() abort
if bufnr('vimfiler') == -1
silent VimFiler
if exists(':AirlineRefresh')
AirlineRefresh
endif
wincmd p
if &filetype !=# 'startify'
IndentLinesToggle
IndentLinesToggle
endif
wincmd p
else
silent VimFiler
doautocmd WinEnter
if exists(':AirlineRefresh')
AirlineRefresh
endif
endif
endfunction
let s:plugins_argv = ['-update', '-openurl'] let s:plugins_argv = ['-update', '-openurl']
function! zvim#util#complete_plugs(ArgLead, CmdLine, CursorPos) abort function! zvim#util#complete_plugs(ArgLead, CmdLine, CursorPos) abort

View File

@ -1 +1,6 @@
noremap <silent> <F3> :call zvim#util#OpenVimfiler()<CR> function! s:open_vimfiler() abort
silent VimFiler
doautocmd WinEnter
endfunction
nnoremap <silent> <F3> :call <SID>open_vimfiler()<CR>

View File

@ -5,5 +5,4 @@
" URL: https://spacevim.org " URL: https://spacevim.org
" License: GPLv3 " License: GPLv3
"============================================================================= "=============================================================================
execute 'source' fnamemodify(expand('<sfile>'), ':h').'/config/main.vim' execute 'source' fnamemodify(expand('<sfile>'), ':h').'/config/main.vim'