mirror of
https://github.com/preservim/nerdtree.git
synced 2024-11-25 17:57:24 +08:00
Allow multi-character DirArrows (#985)
* Add debugging messages to diagnose issue #931. * Echo the CWD and NERDTree root too. * Ensure DirArrows are trimmed to a single character. Actually, it's up to the user to make sure it's a single character after leading and trailing spaces are removed. Spaces need to be removed so that an accurate level of indentation can be calculated. * Remove debugging statements * Simplify the algorithm for calculating indentation level. 1. Replace the DirArrows with a single space. 2. Count the leading spaces. 3. Divide by 2. This allows users to specify multi-character arrows, where a spaces prevent characters printing on top of each other.
This commit is contained in:
parent
e126b8745d
commit
9226eab2a8
|
@ -280,11 +280,10 @@ endfunction
|
|||
|
||||
" FUNCTION: s:UI._indentLevelFor(line) {{{1
|
||||
function! s:UI._indentLevelFor(line)
|
||||
" have to do this work around because match() returns bytes, not chars
|
||||
let numLeadBytes = match(a:line, '\M\[^ '.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.']')
|
||||
" The next line is a backward-compatible workaround for strchars(a:line(0:numLeadBytes-1]). strchars() is in 7.3+
|
||||
let leadChars = len(split(a:line[0:numLeadBytes-1], '\zs'))
|
||||
|
||||
" Replace multi-character DirArrows with a single space so the
|
||||
" indentation calculation doesn't get messed up.
|
||||
let l:line = substitute(substitute(a:line, g:NERDTreeDirArrowExpandable, ' ', ''), g:NERDTreeDirArrowCollapsible, ' ', '')
|
||||
let leadChars = match(l:line, '\M\[^ ]')
|
||||
return leadChars / s:UI.IndentWid()
|
||||
endfunction
|
||||
|
||||
|
|
|
@ -77,6 +77,7 @@ else
|
|||
call s:initVariable("g:NERDTreeDirArrowExpandable", "+")
|
||||
call s:initVariable("g:NERDTreeDirArrowCollapsible", "~")
|
||||
endif
|
||||
|
||||
call s:initVariable("g:NERDTreeCascadeOpenSingleChildDir", 1)
|
||||
call s:initVariable("g:NERDTreeCascadeSingleChildDir", 1)
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user