latest nerd tree hacks

Author: Martin Grenfell

ftplugin/nerdtree_fs_menu.vim

@@ -15,11 +15,11 @@ if exists("g:loaded_nerdtree_fs_menu")
 endif
 let g:loaded_nerdtree_fs_menu = 1
 
-call NERDTreeAddMenuItem('(a)dd a childnode', 'a', 'NERDTreeAddNode')
-call NERDTreeAddMenuItem('(m)ove the curent node', 'm', 'NERDTreeMoveNode')
-call NERDTreeAddMenuItem('(d)elete the curent node', 'd', 'NERDTreeDeleteNode')
+call NERDTreeAddMenuItem({'text': '(a)dd a childnode', 'shortcut': 'a', 'callback': 'NERDTreeAddNode'})
+call NERDTreeAddMenuItem({'text': '(m)ove the curent node', 'shortcut': 'm', 'callback': 'NERDTreeMoveNode'})
+call NERDTreeAddMenuItem({'text': '(d)elete the curent node', 'shortcut': 'd', 'callback': 'NERDTreeDeleteNode'})
 if g:NERDTreePath.CopyingSupported()
-    call NERDTreeAddMenuItem('(c)copy the current node', 'c', 'NERDTreeCopyNode')
+    call NERDTreeAddMenuItem({'text': '(c)copy the current node', 'shortcut': 'c', 'callback': 'NERDTreeCopyNode'})
 endif
 
 "FUNCTION: s:echo(msg){{{1

ftplugin/nerdtree_git_menu.vim

@@ -10,12 +10,30 @@
 "              See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 " ============================================================================
+"
+" Adds a "g" submenu to the NERD tree menu.
+"
+" Note: this plugin assumes that the current tree root has a .git dir under
+" it, and that the working tree and the .git repo are in the same place
+"
 if exists("g:loaded_nerdtree_git_menu")
     finish
 endif
 let g:loaded_nerdtree_git_menu = 1
 
-call NERDTreeAddMenuItem('(g)it menu', 'g', 'NERDTreeGitMenu')
+call NERDTreeAddMenuItem({
+            \ 'text': '(g)it menu',
+            \ 'shortcut': 'g',
+            \ 'check_to_enable_callback': 'NERDTreeGitMenuEnabled',
+            \ 'callback': 'NERDTreeGitMenu' })
+
+function! NERDTreeGitMenuEnabled()
+    return isdirectory(s:GitRepoPath())
+endfunction
+
+function! s:GitRepoPath()
+    return b:NERDTreeRoot.path.str(0) . ".git"
+endfunction
 
 function! NERDTreeGitMenu()
     let node = g:NERDTreeFileNode.GetSelected()
@@ -36,26 +54,34 @@ function! NERDTreeGitMenu()
     let choice = nr2char(getchar())
 
     if choice ==# "a"
-        call s:promptCommand('git add ', path.strForOS(1), 'file')
+        call s:promptCommand('add ', path.strForOS(1), 'file')
     elseif choice ==# "c"
-        call s:promptCommand('git checkout ', path.strForOS(1), 'file')
+        call s:promptCommand('checkout ', path.strForOS(1), 'file')
     elseif choice ==# "m"
-        call s:promptCommand('git mv ', path.strForOS(1), 'file')
+        let p = path.strForOS(1)
+        call s:promptCommand('mv ', p . ' ' . p, 'file')
     elseif choice ==# "r"
-        call s:promptCommand('git rm ', path.strForOS(1), 'file')
+        call s:promptCommand('rm ', path.strForOS(1), 'file')
     endif
 
     call node.parent.refresh()
     call NERDTreeRender()
 endfunction
 
-function! s:promptCommand(cmd_base, cmd_tail_default, complete)
-    let cmd_tail = input(":!" . a:cmd_base,  a:cmd_tail_default, a:complete)
+function! s:promptCommand(sub_command, cmd_tail_default, complete)
+    let extra_options  = ' --git-dir=' . s:GitRepoPath()
+    let extra_options .= ' --work-tree=' . b:NERDTreeRoot.path.str(0) . ' '
+    let base = "git" . extra_options . a:sub_command
+
+    let cmd_tail = input(":!" . base,  a:cmd_tail_default, a:complete)
     if cmd_tail != ''
-        let output = system(a:cmd_base . cmd_tail)
+        let output = system(base . cmd_tail)
         redraw!
         if v:shell_error != 0
-            echom output
+            echo output
         endif
+    else
+        redraw
+        echo "Aborted"
     endif
 endfunction

plugin/NERD_tree.vim

@@ -429,7 +429,6 @@ endfunction
 "CLASS: MenuCallback {{{2
 "============================================================
 let s:MenuCallback = {}
-
 "FUNCTION: MenuCallback.All() {{{3
 function! s:MenuCallback.All()
     if !exists("s:menuCallbacks")
@@ -438,16 +437,58 @@ function! s:MenuCallback.All()
     return s:menuCallbacks
 endfunction
 
-"FUNCTION: MenuCallback.Create(text, shortcut, callback) {{{3
-function! s:MenuCallback.Create(text, shortcut, callback)
+"FUNCTION: MenuCallback.AllEnabledCallbacks() {{{3
+function! s:MenuCallback.AllEnabledCallbacks()
+    let toReturn = []
+    for i in s:MenuCallback.All()
+        if i.enabled()
+            call add(toReturn, i)
+        endif
+    endfor
+    return toReturn
+endfunction
+
+"FUNCTION: MenuCallback.FindByShortcut(shortcut) {{{3
+function! s:MenuCallback.FindByShortcut(shortcut)
+    for i in s:MenuCallback.All()
+        if i.shortcut ==# a:shortcut
+            return i
+        endif
+    endfor
+    return {}
+endfunction
+
+"FUNCTION: MenuCallback.Create(options) {{{3
+function! s:MenuCallback.Create(options)
     let newCallback = {}
     let newCallback = copy(self)
-    let newCallback.text = a:text
-    let newCallback.shortcut = a:shortcut
-    let newCallback.callback = a:callback
+
+    let shortcut = a:options['shortcut']
+    let callback = a:options['callback']
+
+
+    let newCallback.text = a:options['text']
+    let newCallback.shortcut = a:options['shortcut']
+    let newCallback.callback = a:options['callback']
+    if has_key(a:options, 'check_to_enable_callback')
+        let newCallback.check_to_enable_callback = a:options['check_to_enable_callback']
+    endif
     call add(s:MenuCallback.All(), newCallback)
 endfunction
 
+"FUNCTION: MenuCallback.enabled() {{{3
+function! s:MenuCallback.enabled()
+    if has_key(self, "check_to_enable_callback")
+        return {self.check_to_enable_callback}()
+    endif
+    return 1
+endfunction
+
+"FUNCTION: MenuCallback.execute() {{{3
+function! s:MenuCallback.execute()
+    call {self.callback}()
+endfunction
+
 "FUNCTION: MenuCallback.ShowMenu() {{{3
 function! s:MenuCallback.ShowMenu()
     let curNode = s:TreeFileNode.GetSelected()
@@ -459,23 +500,20 @@ function! s:MenuCallback.ShowMenu()
     let prompt = "NERDTree Menu\n" .
        \ "==========================================================\n"
 
-    for i in s:MenuCallback.All()
+    for i in s:MenuCallback.AllEnabledCallbacks()
         let prompt .= i.text . "\n"
     endfor
 
     echo prompt
 
-    let choice = nr2char(getchar())
+    let callback = s:MenuCallback.FindByShortcut(nr2char(getchar()))
+    if !empty(callback) && callback.enabled()
+        redraw
+        call callback.execute()
+    endif
 
-    for i in s:MenuCallback.All()
-        if choice ==# i.shortcut
-            exec "call " . i.callback . "()"
-            return
-        endif
-    endfor
 endfunction
 
-
 "CLASS: TreeFileNode {{{2
 "This class is the parent of the TreeDirNode class and constitures the
 "'Component' part of the composite design pattern between the treenode
@@ -2388,8 +2426,8 @@ function! NERDTreeGetCurrentPath()
     endif
 endfunction
 
-function! NERDTreeAddMenuItem(text, shortcut, callback)
-    call s:MenuCallback.Create(a:text, a:shortcut, a:callback)
+function! NERDTreeAddMenuItem(options)
+    call s:MenuCallback.Create(a:options)
 endfunction
 
 function! NERDTreeRender()