VimPlug/indentLine
1
0
Fork 0
mirror of https://github.com/Yggdroot/indentLine.git synced 2026-03-01 04:52:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix issue #289

Browse Source
This commit is contained in:
Yggdroot
2020-03-02 15:12:32 +08:00
parent f9ebc9a811
commit 0fd5b08b3c
1 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
after/plugin/indentLine.vim
View File

@@ -106,6 +106,7 @@ function! s:SetConcealOption()
endif endif
endfunction endfunction
"{{{1 function! s:ResetConcealOption()
function! s:ResetConcealOption() function! s:ResetConcealOption()
if exists("b:indentLine_ConcealOptionSet") && b:indentLine_ConcealOptionSet if exists("b:indentLine_ConcealOptionSet") && b:indentLine_ConcealOptionSet
if exists("b:indentLine_original_concealcursor") if exists("b:indentLine_original_concealcursor")
@@ -118,13 +119,24 @@ function! s:ResetConcealOption()
endif endif
endfunction endfunction
function! s:CheckDiff() "{{{1 function! s:DisableOnDiff()
function! s:DisableOnDiff()
if &diff if &diff
call s:IndentLinesDisable() call s:IndentLinesDisable()
call s:LeadingSpaceDisable() call s:LeadingSpaceDisable()
endif endif
endfunction endfunction
"{{{1 function! s:ToggleOnDiff()
function! s:ToggleOnDiff()
if &diff
call s:IndentLinesDisable()
call s:LeadingSpaceDisable()
else
call s:Setup()
endif
endfunction
"{{{1 function! s:IndentLinesEnable() "{{{1 function! s:IndentLinesEnable()
function! s:IndentLinesEnable() function! s:IndentLinesEnable()
if g:indentLine_newVersion if g:indentLine_newVersion
@@ -373,42 +385,42 @@ endfunction
augroup indentLine augroup indentLine
autocmd! autocmd!
if g:indentLine_newVersion if g:indentLine_newVersion
autocmd BufRead,BufNewFile,ColorScheme,Syntax * call <SID>InitColor() autocmd BufRead,BufNewFile,ColorScheme,Syntax * call s:InitColor()
if exists("##WinNew") if exists("##WinNew")
autocmd WinNew * call <SID>Setup() autocmd WinNew * call s:Setup()
endif endif
autocmd BufWinEnter * call <SID>IndentLinesDisable() | call <SID>LeadingSpaceDisable() | call <SID>Setup() autocmd BufWinEnter * call s:IndentLinesDisable() | call s:LeadingSpaceDisable() | call s:Setup()
autocmd FileType * call <SID>Disable() autocmd FileType * call s:Disable()
autocmd OptionSet diff call <SID>IndentLinesDisable() | call s:LeadingSpaceDisable() autocmd OptionSet diff call s:ToggleOnDiff()
autocmd VimEnter * noautocmd windo call s:CheckDiff() autocmd VimEnter * noautocmd windo call s:DisableOnDiff()
else else
autocmd BufWinEnter * call <SID>Setup() autocmd BufWinEnter * call s:Setup()
autocmd User * if exists("b:indentLine_enabled") || exists("b:indentLine_leadingSpaceEnabled") | autocmd User * if exists("b:indentLine_enabled") || exists("b:indentLine_leadingSpaceEnabled") |
\ call <SID>Setup() | endif \ call s:Setup() | endif
autocmd BufRead,BufNewFile,ColorScheme,Syntax * call <SID>InitColor() autocmd BufRead,BufNewFile,ColorScheme,Syntax * call s:InitColor()
autocmd BufUnload * let b:indentLine_enabled = 0 | let b:indentLine_leadingSpaceEnabled = 0 autocmd BufUnload * let b:indentLine_enabled = 0 | let b:indentLine_leadingSpaceEnabled = 0
autocmd SourcePre $VIMRUNTIME/syntax/nosyntax.vim doautocmd indentLine BufUnload autocmd SourcePre $VIMRUNTIME/syntax/nosyntax.vim doautocmd indentLine BufUnload
autocmd FileChangedShellPost * doautocmd indentLine BufUnload | call <SID>Setup() autocmd FileChangedShellPost * doautocmd indentLine BufUnload | call s:Setup()
autocmd OptionSet diff call <SID>IndentLinesDisable() | call s:LeadingSpaceDisable() autocmd OptionSet diff call s:ToggleOnDiff()
autocmd VimEnter * noautocmd windo call s:CheckDiff() autocmd VimEnter * noautocmd windo call s:DisableOnDiff()
endif endif
augroup END augroup END
"{{{1 commands "{{{1 commands
command! -nargs=? IndentLinesReset call <SID>ResetWidth(<f-args>) command! -nargs=? IndentLinesReset call s:ResetWidth(<f-args>)
command! IndentLinesToggle call <SID>IndentLinesToggle() command! IndentLinesToggle call s:IndentLinesToggle()
if g:indentLine_newVersion if g:indentLine_newVersion
command! IndentLinesEnable let b:indentLine_enabled = 1 | call <SID>IndentLinesEnable() command! IndentLinesEnable let b:indentLine_enabled = 1 | call s:IndentLinesEnable()
command! IndentLinesDisable let b:indentLine_enabled = 0 | call <SID>IndentLinesDisable() command! IndentLinesDisable let b:indentLine_enabled = 0 | call s:IndentLinesDisable()
command! LeadingSpaceEnable let b:indentLine_leadingSpaceEnabled = 1 | call <SID>LeadingSpaceEnable() command! LeadingSpaceEnable let b:indentLine_leadingSpaceEnabled = 1 | call s:LeadingSpaceEnable()
command! LeadingSpaceDisable let b:indentLine_leadingSpaceEnabled = 0 | call <SID>LeadingSpaceDisable() command! LeadingSpaceDisable let b:indentLine_leadingSpaceEnabled = 0 | call s:LeadingSpaceDisable()
else else
command! IndentLinesEnable call <SID>IndentLinesEnable() command! IndentLinesEnable call s:IndentLinesEnable()
command! IndentLinesDisable call <SID>IndentLinesDisable() command! IndentLinesDisable call s:IndentLinesDisable()
command! LeadingSpaceEnable call <SID>LeadingSpaceEnable() command! LeadingSpaceEnable call s:LeadingSpaceEnable()
command! LeadingSpaceDisable call <SID>LeadingSpaceDisable() command! LeadingSpaceDisable call s:LeadingSpaceDisable()
endif endif
command! LeadingSpaceToggle call <SID>LeadingSpaceToggle() command! LeadingSpaceToggle call s:LeadingSpaceToggle()
" vim:et:ts=4:sw=4:fdm=marker:fmr={{{,}}} " vim:et:ts=4:sw=4:fdm=marker:fmr={{{,}}}