support rename

Author: ZSaberLv0

README.md

@@ -168,6 +168,7 @@ for experienced user, here's some configs you may interest
 * `let g:ZFDirDiffKeymap_syncToThere = ['dp', 'DL']` : sync nodes from here to there
 * `let g:ZFDirDiffKeymap_add = ['a']` : add new node, end with `/` to add dir
 * `let g:ZFDirDiffKeymap_delete = ['dd']` : delete selected nodes
+* `let g:ZFDirDiffKeymap_rename = ['cc']` : rename selected node
 * `let g:ZFDirDiffKeymap_getPath = ['p']` : get relative path of node under cursor
 * `let g:ZFDirDiffKeymap_getFullPath = ['P']` : get absolute path of node under cursor
 

doc/zfdirdiff.txt

@@ -156,6 +156,7 @@ For experienced user, here's some configs you may want:
 * `let g:ZFDirDiffKeymap_syncToThere = ['dp', 'DL']` : sync nodes from here to there
 * `let g:ZFDirDiffKeymap_add = ['a']` : add new node, end with `/` to add dir
 * `let g:ZFDirDiffKeymap_delete = ['dd']` : delete selected nodes
+* `let g:ZFDirDiffKeymap_rename = ['cc']` : rename selected node
 * `let g:ZFDirDiffKeymap_getPath = ['p']` : get relative path of node under cursor
 * `let g:ZFDirDiffKeymap_getFullPath = ['P']` : get absolute path of node under cursor
 

plugin/api.vim

@@ -698,9 +698,9 @@ if !exists('*ZFDirDiffAPI_mkdir')
             if exists("*mkdir")
                 call mkdir(a:path, 'p')
             elseif (has('win32') || has('win64')) && !has('unix')
-                silent execute '!mkdir "' . substitute(a:path, '/', '\', 'g') . '"'
+                silent execute printf('!mkdir "%s"', substitute(a:path, '/', '\', 'g'))
             else
-                silent execute '!mkdir -p "' . a:path . '"'
+                silent execute printf('!mkdir -p "%s"', a:path)
             endif
         endif
     endfunction
@@ -710,29 +710,49 @@ if !exists('*ZFDirDiffAPI_cpfile')
     function! ZFDirDiffAPI_cpfile(from, to)
         call ZFDirDiffAPI_mkdir(fnamemodify(a:to, ":h"))
         if (has('win32') || has('win64')) && !has('unix')
-            silent execute '!copy "' . substitute(a:from, '/', '\', 'g') . '" "' . substitute(a:to, '/', '\', 'g') . '"'
+            silent execute printf('!copy "%s" "%s"', substitute(a:from, '/', '\', 'g'), substitute(a:to, '/', '\', 'g'))
         else
-            silent execute '!cp -rf "' . a:from . '" "' . a:to . '"'
+            silent execute printf('!cp -rf "%s" "%s"', a:from, a:to)
         endif
     endfunction
 endif
 
 if !exists('*ZFDirDiffAPI_rmdir')
     function! ZFDirDiffAPI_rmdir(path)
         if (has('win32') || has('win64')) && !has('unix')
-            silent execute '!rmdir /s/q "' . substitute(a:path, '/', '\', 'g') . '"'
+            silent execute printf('!rmdir /s/q "%s"', substitute(a:path, '/', '\', 'g'))
         else
-            silent execute '!rm -rf "' . a:path . '"'
+            silent execute printf('!rm -rf "%s"', a:path)
         endif
     endfunction
 endif
 
 if !exists('*ZFDirDiffAPI_rmfile')
     function! ZFDirDiffAPI_rmfile(path)
         if (has('win32') || has('win64')) && !has('unix')
-            silent execute '!del /f/q "' . substitute(a:path, '/', '\', 'g') . '"'
+            silent execute printf('!del /f/q "%s"', substitute(a:path, '/', '\', 'g'))
         else
-            silent execute '!rm -f "' . a:path . '"'
+            silent execute printf('!rm -f "%s"', a:path)
+        endif
+    endfunction
+endif
+
+if !exists('*ZFDirDiffAPI_mvdir')
+    function! ZFDirDiffAPI_mvdir(from, to)
+        if (has('win32') || has('win64')) && !has('unix')
+            silent execute printf('!move "%s" "%s"', a:from, a:to)
+        else
+            silent execute printf('!mv "%s" "%s"', a:from, a:to)
+        endif
+    endfunction
+endif
+
+if !exists('*ZFDirDiffAPI_mvfile')
+    function! ZFDirDiffAPI_mvfile(from, to)
+        if (has('win32') || has('win64')) && !has('unix')
+            silent execute printf('!move "%s" "%s"', a:from, a:to)
+        else
+            silent execute printf('!mv "%s" "%s"', a:from, a:to)
         endif
     endfunction
 endif

plugin/ui.vim

@@ -716,6 +716,7 @@ function! s:diffUI_makeKeymap()
     call s:makeKeymap('ZFDirDiffUIAction_syncToThere', 'ZFDirDiffKeymap_syncToThere', ['dp', 'DL'], 1)
     call s:makeKeymap('ZFDirDiffUIAction_add', 'ZFDirDiffKeymap_add', ['a'])
     call s:makeKeymap('ZFDirDiffUIAction_delete', 'ZFDirDiffKeymap_delete', ['dd'], 1)
+    call s:makeKeymap('ZFDirDiffUIAction_rename', 'ZFDirDiffKeymap_rename', ['cc'])
     call s:makeKeymap('ZFDirDiffUIAction_getPath', 'ZFDirDiffKeymap_getPath', ['p'])
     call s:makeKeymap('ZFDirDiffUIAction_getFullPath', 'ZFDirDiffKeymap_getFullPath', ['P'])
 endfunction
@@ -1256,6 +1257,70 @@ function! ZFDirDiffUIAction_delete() range
     call s:diffUI_op(t:ZFDirDiff_taskData, diffNodes, op)
 endfunction
 
+function! ZFDirDiffUIAction_rename()
+    if !exists('t:ZFDirDiff_taskData')
+        echomsg '[ZFDirDiff] no previous diff task'
+        return
+    endif
+    silent let path = s:ZFDirDiffUIAction_getPathOrFullPath(1)
+    let diffNode = ZFDirDiffUI_diffNodeUnderCursor()
+    if empty(path) || empty(diffNode)
+        echo '[ZFDirDiff] no file or dir under cursor'
+        return
+    endif
+
+    let nameNew = input(isdirectory(path) ? 'rename dir: ' : 'rename file: ', fnamemodify(path, ':t'), 'file')
+    " ^[ \t]+|[ \t]+$
+    let nameNew = substitute(nameNew, '^[ \t]\+\|[ \t]\+$', '', '')
+    if empty(nameNew)
+        return
+    endif
+
+    let pathNew = fnamemodify(path, ':h') . '/' . nameNew
+    if isdirectory(pathNew) || filereadable(pathNew)
+        let hint = "target already exists:"
+        let relPath = fnamemodify(pathNew, ':.')
+        let hint .= "\n    " . pathNew
+        if relPath != pathNew
+            let hint .= "\n    (" . pathNew . ")"
+        endif
+        let hint .= "\nconfirm override?"
+        let hint .= "\n"
+        let hint .= "\n(y)es / (n)o: "
+        redraw
+        echo hint
+        let confirm = nr2char(getchar())
+        redraw
+        if confirm != 'y'
+            echo 'canceled'
+            return
+        endif
+
+        if isdirectory(pathNew)
+            call ZFDirDiffAPI_rmdir(pathNew)
+        elseif filereadable(pathNew)
+            call ZFDirDiffAPI_rmfile(pathNew)
+        endif
+    endif
+
+    call ZFDirDiffAPI_mkdir(fnamemodify(pathNew, ':h'))
+
+    if isdirectory(path)
+        call ZFDirDiffAPI_mvdir(path, pathNew)
+        let hint = printf('dir renamed: %s => %s', fnamemodify(path, ':.'), fnamemodify(pathNew, ':.'))
+    elseif filereadable(path)
+        call ZFDirDiffAPI_mvfile(path, pathNew)
+        let hint = printf('file renamed: %s => %s', fnamemodify(path, ':.'), fnamemodify(pathNew, ':.'))
+    else
+        echo 'failed to move: ' . path
+        return
+    endif
+
+    call ZFDirDiffAPI_update(t:ZFDirDiff_taskData, diffNode['parent'])
+    redraw
+    echo hint
+endfunction
+
 function! s:ZFDirDiffUIAction_getPathOrFullPath(isFullPath)
     let diffNode = ZFDirDiffUI_diffNodeUnderCursor()
     if empty(diffNode)