vim/nerdtree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor code to find tree indent level

Browse Source
This commit is contained in:
Martin Grenfell 2008-10-19 23:06:09 +13:00
parent ae0d744357
commit 38442b06d4
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugin/NERD_tree.vim
View File

@ -133,7 +133,6 @@ let s:NERDTreeWinName = '_NERD_tree_'
let s:tree_wid = 2 let s:tree_wid = 2
let s:tree_markup_reg = '[ \-+~`|]' let s:tree_markup_reg = '[ \-+~`|]'
let s:tree_markup_reg_neg = '[^ \-+~`|]'
let s:tree_up_dir_line = '.. (up a dir)' let s:tree_up_dir_line = '.. (up a dir)'
let s:os_slash = '/' let s:os_slash = '/'
@ -2063,7 +2062,7 @@ function! s:findNodeLineNumber(treenode)
let curLine = getline(lnum) let curLine = getline(lnum)
let indent = match(curLine,s:tree_markup_reg_neg) / s:tree_wid let indent = s:indentLevelFor(curLine)
if indent == curPathComponent if indent == curPathComponent
let curLine = s:stripMarkupFromLine(curLine, 1) let curLine = s:stripMarkupFromLine(curLine, 1)
@ -2121,9 +2120,7 @@ function! s:getPath(ln)
return t:NERDTreeRoot.path.getParent() return t:NERDTreeRoot.path.getParent()
endif endif
"get the indent level for the file (i.e. how deep in the tree it is) let indent = s:indentLevelFor(line)
let indent = match(line, s:tree_markup_reg_neg) / s:tree_wid
"remove the tree parts and the leading space "remove the tree parts and the leading space
let curFile = s:stripMarkupFromLine(line, 0) let curFile = s:stripMarkupFromLine(line, 0)
@ -2148,7 +2145,7 @@ function! s:getPath(ln)
break break
endif endif
if curLineStripped =~ '/$' if curLineStripped =~ '/$'
let lpindent = match(curLine,s:tree_markup_reg_neg) / s:tree_wid let lpindent = s:indentLevelFor(curLine)
if lpindent < indent if lpindent < indent
let indent = indent - 1 let indent = indent - 1
@ -2211,12 +2208,14 @@ function! s:getTreeWinNum()
return -1 return -1
endif endif
endfunction endfunction
"FUNCTION: s:indentLevelFor(line) {{{2
function! s:indentLevelFor(line)
return match(a:line, '[^ \-+~`|]') / s:tree_wid
endfunction
"FUNCTION: s:isTreeOpen() {{{2 "FUNCTION: s:isTreeOpen() {{{2
function! s:isTreeOpen() function! s:isTreeOpen()
return s:getTreeWinNum() != -1 return s:getTreeWinNum() != -1
endfunction endfunction
" FUNCTION: s:jumpToChild(direction) {{{2 " FUNCTION: s:jumpToChild(direction) {{{2
" Args: " Args:
" direction: 0 if going to first child, 1 if going to last " direction: 0 if going to first child, 1 if going to last