From dc29ec2db3e710cb4034acdcf94b0cc862446d03 Mon Sep 17 00:00:00 2001 From: Igor Tatarintsev Date: Fri, 11 Sep 2015 23:52:37 +0600 Subject: [PATCH] Added global variables for changing default arrows g:NERDTreeDirArrowExpandable g:NERDTreeDirArrowCollapsable --- README.markdown | 2 +- autoload/nerdtree/ui_glue.vim | 2 +- lib/nerdtree/tree_file_node.vim | 2 +- lib/nerdtree/ui.vim | 8 ++++---- plugin/NERD_tree.vim | 2 +- syntax/nerdtree.vim | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.markdown b/README.markdown index bc2741f..c11b135 100644 --- a/README.markdown +++ b/README.markdown @@ -112,4 +112,4 @@ Use these variables in your vimrc. Note that below are default arrow symbols let g:NERDTreeDirArrows = 1 let g:NERDTreeDirArrowExpandable = '▸' - let g:NERDTreeDirArrowCollapsable = '▾' + let g:NERDTreeDirArrowCollapsible = '▾' diff --git a/autoload/nerdtree/ui_glue.vim b/autoload/nerdtree/ui_glue.vim index e706ee5..dadb8f8 100644 --- a/autoload/nerdtree/ui_glue.vim +++ b/autoload/nerdtree/ui_glue.vim @@ -312,7 +312,7 @@ function! s:handleLeftClick() endfor if currentNode.path.isDirectory - if startToCur =~# g:NERDTreeUI.MarkupReg() && startToCur =~# '[+~'.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsable.'] \?$' + if startToCur =~# g:NERDTreeUI.MarkupReg() && startToCur =~# '[+~'.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \?$' call currentNode.activate() return endif diff --git a/lib/nerdtree/tree_file_node.vim b/lib/nerdtree/tree_file_node.vim index 5c38641..a3fe98f 100644 --- a/lib/nerdtree/tree_file_node.vim +++ b/lib/nerdtree/tree_file_node.vim @@ -383,7 +383,7 @@ function! s:TreeFileNode._renderToString(depth, drawText, vertMap, isLastChild) if self.path.isDirectory if self.isOpen if g:NERDTreeDirArrows - let treeParts = treeParts . g:NERDTreeDirArrowCollapsable . ' ' + let treeParts = treeParts . g:NERDTreeDirArrowCollapsible . ' ' else let treeParts = treeParts . '~' endif diff --git a/lib/nerdtree/ui.vim b/lib/nerdtree/ui.vim index 5632ab0..74cee9c 100644 --- a/lib/nerdtree/ui.vim +++ b/lib/nerdtree/ui.vim @@ -154,7 +154,7 @@ function! s:UI.getPath(ln) if !g:NERDTreeDirArrows " in case called from outside the tree - if line !~# '^ *[|`'.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsable.' ]' || line =~# '^$' + if line !~# '^ *[|`'.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.' ]' || line =~# '^$' return {} endif endif @@ -261,9 +261,9 @@ endfunction "FUNCTION: s:UI._indentLevelFor(line) {{{1 function! s:UI._indentLevelFor(line) - let level = match(a:line, '[^ \-+~'.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsable.'`|]') / s:UI.IndentWid() + let level = match(a:line, '[^ \-+~'.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'`|]') / s:UI.IndentWid() " check if line includes arrows - if match(a:line, '['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsable.]') > -1 + if match(a:line, '['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.']') > -1 " decrement level as arrow uses 3 ascii chars let level = level - 1 endif @@ -278,7 +278,7 @@ endfunction "FUNCTION: s:UI.MarkupReg() {{{1 function! s:UI.MarkupReg() if g:NERDTreeDirArrows - return '^\(['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsable.'] \| \+['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsable.'] \| \+\)' + return '^\(['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \| \+['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \| \+\)' endif return '^[ `|]*[\-+~]' diff --git a/plugin/NERD_tree.vim b/plugin/NERD_tree.vim index 7b3dff0..6fff0c3 100644 --- a/plugin/NERD_tree.vim +++ b/plugin/NERD_tree.vim @@ -69,7 +69,7 @@ call s:initVariable("g:NERDTreeShowLineNumbers", 0) call s:initVariable("g:NERDTreeSortDirs", 1) call s:initVariable("g:NERDTreeDirArrows", !nerdtree#runningWindows()) call s:initVariable("g:NERDTreeDirArrowExpandable", "▸") -call s:initVariable("g:NERDTreeDirArrowCollapsable", "▾") +call s:initVariable("g:NERDTreeDirArrowCollapsible", "▾") call s:initVariable("g:NERDTreeCascadeOpenSingleChildDir", 1) if !exists("g:NERDTreeSortOrder") diff --git a/syntax/nerdtree.vim b/syntax/nerdtree.vim index 1d09788..fd548cf 100644 --- a/syntax/nerdtree.vim +++ b/syntax/nerdtree.vim @@ -23,10 +23,10 @@ syn match NERDTreeLinkDir #.*/ ->#me=e-3 containedin=NERDTreeDir syn match NERDTreeDirSlash #/# containedin=NERDTreeDir if g:NERDTreeDirArrows - exec 'syn match NERDTreeClosable #'.g:NERDTreeDirArrowCollapsable.'# containedin=NERDTreeDir,NERDTreeFile' + exec 'syn match NERDTreeClosable #'.g:NERDTreeDirArrowCollapsible.'# containedin=NERDTreeDir,NERDTreeFile' exec 'syn match NERDTreeOpenable #'.g:NERDTreeDirArrowExpandable.'# containedin=NERDTreeDir,NERDTreeFile' - let s:dirArrows = g:NERDTreeDirArrowCollapsable.g:NERDTreeDirArrowExpandable + let s:dirArrows = g:NERDTreeDirArrowCollapsible.g:NERDTreeDirArrowExpandable exec 'syn match NERDTreeDir #[^'.s:dirArrows.' ].*/#' syn match NERDTreeExecFile #^ .*\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark exec 'syn match NERDTreeFile #^[^"\.'.s:dirArrows.'] *[^'.s:dirArrows.']*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile'