diff --git a/autoload/nerdtree.vim b/autoload/nerdtree.vim index d0f984f..e6054e0 100644 --- a/autoload/nerdtree.vim +++ b/autoload/nerdtree.vim @@ -42,7 +42,7 @@ endfunction "inits a secondary nerd tree in the current buffer if appropriate function! nerdtree#checkForBrowse(dir) if a:dir != '' && isdirectory(a:dir) - call g:NERDTreeCreator.New().createSecondary(a:dir) + call g:NERDTreeCreator.CreateSecondary(a:dir) endif endfunction @@ -193,14 +193,14 @@ function! nerdtree#findAndRevealPath() endtry if p.isUnder(cwd) - call g:NERDTreeCreator.New().createPrimary(cwd.str()) + call g:NERDTreeCreator.CreatePrimary(cwd.str()) else - call g:NERDTreeCreator.New().createPrimary(p.getParent().str()) + call g:NERDTreeCreator.CreatePrimary(p.getParent().str()) endif else if !p.isUnder(g:NERDTreeFileNode.GetRootForTab().path) if !nerdtree#isTreeOpen() - call g:NERDTreeCreator.New().togglePrimary('') + call g:NERDTreeCreator.TogglePrimary('') else call nerdtree#putCursorInTreeWin() endif @@ -208,7 +208,7 @@ function! nerdtree#findAndRevealPath() call nerdtree#chRoot(g:NERDTreeDirNode.New(p.getParent())) else if !nerdtree#isTreeOpen() - call g:NERDTreeCreator.New().togglePrimary("") + call g:NERDTreeCreator.TogglePrimary("") endif endif endif diff --git a/plugin/NERD_tree.vim b/plugin/NERD_tree.vim index 667c20b..8b853d4 100644 --- a/plugin/NERD_tree.vim +++ b/plugin/NERD_tree.vim @@ -149,11 +149,11 @@ runtime plugin/nerdtree/creator.vim " SECTION: Commands {{{1 "============================================================ "init the command that users start the nerd tree with -command! -n=? -complete=dir -bar NERDTree :call g:NERDTreeCreator.New().createPrimary('') -command! -n=? -complete=dir -bar NERDTreeToggle :call g:NERDTreeCreator.New().togglePrimary('') +command! -n=? -complete=dir -bar NERDTree :call g:NERDTreeCreator.CreatePrimary('') +command! -n=? -complete=dir -bar NERDTreeToggle :call g:NERDTreeCreator.TogglePrimary('') command! -n=0 -bar NERDTreeClose :call nerdtree#closeTreeIfOpen() -command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.New().createPrimary('') -command! -n=0 -bar NERDTreeMirror call g:NERDTreeCreator.New().createMirror() +command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreatePrimary('') +command! -n=0 -bar NERDTreeMirror call g:NERDTreeCreator.CreateMirror() command! -n=0 -bar NERDTreeFind call nerdtree#findAndRevealPath() command! -n=0 -bar NERDTreeFocus call NERDTreeFocus() command! -n=0 -bar NERDTreeCWD call NERDTreeCWD() @@ -201,7 +201,7 @@ function! NERDTreeFocus() if nerdtree#isTreeOpen() call nerdtree#putCursorInTreeWin() else - call g:NERDTreeCreator.New().togglePrimary("") + call g:NERDTreeCreator.TogglePrimary("") endif endfunction diff --git a/plugin/nerdtree/creator.vim b/plugin/nerdtree/creator.vim index b167286..5adc960 100644 --- a/plugin/nerdtree/creator.vim +++ b/plugin/nerdtree/creator.vim @@ -27,6 +27,12 @@ function! s:Creator._broadcastInitEvent() silent doautocmd User NERDTreeInit endfunction +"FUNCTION: s:Creator.CreatePrimary(a:name) {{{1 +function! s:Creator.CreatePrimary(name) + let creator = s:Creator.New() + call creator.createPrimary(a:name) +endfunction + "FUNCTION: s:Creator.createPrimary(a:name) {{{1 "name: the name of a bookmark or a directory function! s:Creator.createPrimary(name) @@ -63,6 +69,12 @@ function! s:Creator.createPrimary(name) call self._broadcastInitEvent() endfunction +"FUNCTION: s:Creator.CreateSecondary(dir) {{{1 +function! s:Creator.CreateSecondary(dir) + let creator = s:Creator.New() + call creator.createSecondary(a:dir) +endfunction + "FUNCTION: s:Creator.createSecondary(dir) {{{1 function! s:Creator.createSecondary(dir) try @@ -94,6 +106,12 @@ function! s:Creator.createSecondary(dir) call self._broadcastInitEvent() endfunction +" FUNCTION: s:Creator.CreateMirror() {{{1 +function! s:Creator.CreateMirror() + let creator = s:Creator.New() + call creator.createMirror() +endfunction + " FUNCTION: s:Creator.createMirror() {{{1 function! s:Creator.createMirror() "get the names off all the nerd tree buffers @@ -248,6 +266,12 @@ function! s:Creator._setupStatusline() endif endfunction +"FUNCTION: s:Creator.TogglePrimary(dir) {{{1 +function! s:Creator.TogglePrimary(dir) + let creator = s:Creator.New() + call creator.togglePrimary(a:dir) +endfunction + "FUNCTION: s:Creator.togglePrimary(dir) {{{1 "Toggles the NERD tree. I.e the NERD tree is open, it is closed, if it is "closed it is restored or initialized (if it doesnt exist) diff --git a/plugin/nerdtree/opener.vim b/plugin/nerdtree/opener.vim index df25099..bcc0d4f 100644 --- a/plugin/nerdtree/opener.vim +++ b/plugin/nerdtree/opener.vim @@ -185,7 +185,7 @@ endfunction function! s:Opener._openDirectory(node) if self._treetype ==# "secondary" call self._gotoTargetWin() - call g:NERDTreeCreator.New().createSecondary(a:node.path.str()) + call g:NERDTreeCreator.CreateSecondary(a:node.path.str()) else call self._gotoTargetWin() if empty(self._where) @@ -193,9 +193,9 @@ function! s:Opener._openDirectory(node) call nerdtree#renderView() call a:node.putCursorHere(0, 0) elseif self._where == 't' - call g:NERDTreeCreator.New().createPrimary(a:node.path.str()) + call g:NERDTreeCreator.CreatePrimary(a:node.path.str()) else - call g:NERDTreeCreator.New().createSecondary(a:node.path.str()) + call g:NERDTreeCreator.CreateSecondary(a:node.path.str()) endif endif diff --git a/plugin/nerdtree/tree_dir_node.vim b/plugin/nerdtree/tree_dir_node.vim index 63becf5..1b1a231 100644 --- a/plugin/nerdtree/tree_dir_node.vim +++ b/plugin/nerdtree/tree_dir_node.vim @@ -351,7 +351,7 @@ endfunction "FUNCTION: TreeDirNode._openInNewTab() {{{1 function! s:TreeDirNode._openInNewTab() tabnew - call g:NERDTreeCreator.New().createPrimary(self.path.str()) + call g:NERDTreeCreator.CreatePrimary(self.path.str()) endfunction "FUNCTION: TreeDirNode.openRecursively() {{{1