m-vim_plugins/vim-indent-guides
1
0
Fork 0
mirror of https://github.com/preservim/vim-indent-guides.git synced 2025-11-09 10:23:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'amerlyq-feature_showtab_switch'

Browse Source 
* amerlyq-feature_showtab_switch:
  Update help file
  Formatting
  Added symmetrical option to disable indents for tab
This commit is contained in:
Nate Kane
2016-04-17 21:34:10 +10:00
parent 705c5fdf0d 930eba1560
commit 018298ead9
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/indent_guides.vim
View File

@@ -47,14 +47,16 @@ function! indent_guides#enable()
for l:level in range(s:start_level, s:indent_levels) for l:level in range(s:start_level, s:indent_levels)
let l:group = 'IndentGuides' . ((l:level % 2 == 0) ? 'Even' : 'Odd') let l:group = 'IndentGuides' . ((l:level % 2 == 0) ? 'Even' : 'Odd')
let l:column_start = (l:level - 1) * s:indent_size + 1 let l:column_start = (l:level - 1) * s:indent_size + 1
let l:soft_pattern = indent_guides#indent_highlight_pattern(g:indent_guides_soft_pattern, l:column_start, s:guide_size)
let l:hard_pattern = indent_guides#indent_highlight_pattern('\t', l:column_start, s:indent_size)
" define the higlight patterns and add to matches list " define the higlight patterns and add to matches list
if g:indent_guides_space_guides if g:indent_guides_space_guides
let l:soft_pattern = indent_guides#indent_highlight_pattern(g:indent_guides_soft_pattern, l:column_start, s:guide_size)
call add(w:indent_guides_matches, matchadd(l:group, l:soft_pattern)) call add(w:indent_guides_matches, matchadd(l:group, l:soft_pattern))
end end
call add(w:indent_guides_matches, matchadd(l:group, l:hard_pattern)) if g:indent_guides_tab_guides
let l:hard_pattern = indent_guides#indent_highlight_pattern('\t', l:column_start, s:indent_size)
call add(w:indent_guides_matches, matchadd(l:group, l:hard_pattern))
end
endfor endfor
endfunction endfunction

11
doc/indent_guides.txt
View File

@@ -142,6 +142,15 @@ Default: 1. Values: 0 or 1.
let g:indent_guides_space_guides = 0 let g:indent_guides_space_guides = 0
< <
------------------------------------------------------------------------------
*'indent_guides_tab_guides'*
Use this option to control whether the plugin considers tabs as indention.
Default: 1. Values: 0 or 1.
>
let g:indent_guides_tab_guides = 0
<
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
*'indent_guides_soft_pattern'* *'indent_guides_soft_pattern'*
Use this option to explicitly specify a pattern for soft indentation. For Use this option to explicitly specify a pattern for soft indentation. For
@@ -263,6 +272,8 @@ Bug reports, feedback, suggestions etc are welcomed.
* Set size of indent guide to `tabstop` value when `shiftwidth=0` or * Set size of indent guide to `tabstop` value when `shiftwidth=0` or
`noexpandtab` is used (thanks @darkfeline and @wilywampa). `noexpandtab` is used (thanks @darkfeline and @wilywampa).
* Don't load plugin in unsupported versions of Vim (thanks @dersaidin). * Don't load plugin in unsupported versions of Vim (thanks @dersaidin).
* Added option g:|indent_guides_tab_guides| to control whether tabs are
considered as indention (thanks @amerlyq).
1.7~ 1.7~
* Added way to override the default mapping (thanks @xuhdev). * Added way to override the default mapping (thanks @xuhdev).

1
plugin/indent_guides.vim
View File

@@ -58,6 +58,7 @@ call s:InitVariable('g:indent_guides_start_level', 1)
call s:InitVariable('g:indent_guides_enable_on_vim_startup', 0) call s:InitVariable('g:indent_guides_enable_on_vim_startup', 0)
call s:InitVariable('g:indent_guides_debug', 0) call s:InitVariable('g:indent_guides_debug', 0)
call s:InitVariable('g:indent_guides_space_guides', 1) call s:InitVariable('g:indent_guides_space_guides', 1)
call s:InitVariable('g:indent_guides_tab_guides', 1)
call s:InitVariable('g:indent_guides_soft_pattern', '\s') call s:InitVariable('g:indent_guides_soft_pattern', '\s')
call s:InitVariable('g:indent_guides_default_mapping', 1) call s:InitVariable('g:indent_guides_default_mapping', 1)