VimPlug/indentLine
1
0
Fork 0
mirror of https://github.com/Yggdroot/indentLine.git synced 2025-12-12 23:16:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix issue #114 #124 #129 #144

Browse Source
This commit is contained in:
Yggdroot
2016-03-17 23:26:27 +08:00
parent 73948324f5
commit 2a2617310b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
after/plugin/indentLine.vim
View File

@@ -24,6 +24,7 @@ let g:indentLine_setColors = get(g:,'indentLine_setColors',1)
let g:indentLine_faster = get(g:,'indentLine_faster',0) let g:indentLine_faster = get(g:,'indentLine_faster',0)
let g:indentLine_leadingSpaceChar = get(g:,'indentLine_leadingSpaceChar',(&encoding ==# "utf-8" && &term isnot# "linux" ? '˰' : '.')) let g:indentLine_leadingSpaceChar = get(g:,'indentLine_leadingSpaceChar',(&encoding ==# "utf-8" && &term isnot# "linux" ? '˰' : '.'))
let g:indentLine_leadingSpaceEnabled = get(g:,'indentLine_leadingSpaceEnabled',0) let g:indentLine_leadingSpaceEnabled = get(g:,'indentLine_leadingSpaceEnabled',0)
let g:indentLine_mysyntaxfile = fnamemodify(expand("<sfile>"), ":p:h:h")."/syntax/indentLine.vim"
"{{{1 function! s:InitColor() "{{{1 function! s:InitColor()
function! s:InitColor() function! s:InitColor()
@@ -82,6 +83,8 @@ function! s:IndentLinesEnable()
endif endif
call s:SetConcealOption() call s:SetConcealOption()
let g:mysyntaxfile = g:indentLine_mysyntaxfile
let space = &l:shiftwidth is 0 ? &l:tabstop : &l:shiftwidth let space = &l:shiftwidth is 0 ? &l:tabstop : &l:shiftwidth
if g:indentLine_showFirstIndentLevel if g:indentLine_showFirstIndentLevel
@@ -164,6 +167,7 @@ function! s:LeadingSpaceEnable()
echoerr 'LeadingSpace can not be shown when g:indentLine_faster == 1' echoerr 'LeadingSpace can not be shown when g:indentLine_faster == 1'
return return
endif endif
let g:mysyntaxfile = g:indentLine_mysyntaxfile
let b:indentLine_leadingSpaceEnabled = 1 let b:indentLine_leadingSpaceEnabled = 1
call s:SetConcealOption() call s:SetConcealOption()
execute 'syntax match IndentLineLeadingSpace /\%(^\s*\)\@<= / containedin=ALLBUT,IndentLine conceal cchar=' . g:indentLine_leadingSpaceChar execute 'syntax match IndentLineLeadingSpace /\%(^\s*\)\@<= / containedin=ALLBUT,IndentLine conceal cchar=' . g:indentLine_leadingSpaceChar
@@ -191,10 +195,11 @@ endfunction
augroup indentLine augroup indentLine
autocmd! autocmd!
autocmd BufWinEnter * call <SID>Setup() autocmd BufWinEnter * call <SID>Setup()
autocmd User * if exists("b:indentLine_enabled") || exists("b:indentLine_leadingSpaceEnabled") |
\ call <SID>Setup() | endif
autocmd BufRead,BufNewFile,ColorScheme,Syntax * call <SID>InitColor() autocmd BufRead,BufNewFile,ColorScheme,Syntax * call <SID>InitColor()
autocmd BufUnload * unlet! b:indentLine_enabled | unlet! b:indentLine_leadingSpaceEnabled autocmd BufUnload * let b:indentLine_enabled = 0 | let b:indentLine_leadingSpaceEnabled = 0
autocmd SourcePre $VIMRUNTIME/syntax/nosyntax.vim unlet! b:indentLine_enabled autocmd SourcePre $VIMRUNTIME/syntax/nosyntax.vim doautoall indentLine BufUnload
autocmd SourcePre $VIMRUNTIME/syntax/nosyntax.vim unlet! b:indentLine_leadingSpaceEnabled
augroup END augroup END
"{{{1 commands "{{{1 commands

2
after/syntax/indentLine.vim Normal file
View File

@@ -0,0 +1,2 @@
"this is the `mysyntaxfile`, will be sourced after sourcing synload.vim
autocmd Syntax * doautocmd indentLine User