Merge pull request #1079 from preservim/1078

Prevent overwriting existing files/dirs on node move. (m-m)
Update version number in change log.
2025-11-08 11:23:48 -05:00 · 2020-01-15 19:55:31 -05:00 · 2020-01-15 19:54:06 -05:00 · 2020-01-15 19:51:39 -05:00 · 2020-01-06 09:21:11 -05:00 · 2020-01-06 09:19:25 -05:00
3 changed files with 8 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
        - **.PATCH**: Pull Request Title (PR Author) [PR Number](Link to PR)
 -->
 #### 6.4
+- **.4**: Prevent overwriting existing files/dirs on node move. (PhilRunninger) [#1079](https://github.com/preservim/nerdtree/pull/1079)
+- **.3**: Fix regex that finds keyword for minimal menu. (PhilRunninger) [#1075](https://github.com/preservim/nerdtree/pull/1075)
 - **.2**: Lint vimscript, fix errors and warnings, add CI job to review PRs (Caleb Maclennan) [#1071](https://github.com/preservim/nerdtree/pull/1071)
 - **.1**: Ensure backward compatibility. v:t_func is not available before Vim 8.0 (Phil Runninger)
 - **.0**: Allow use of function references as callbacks (HiPhish) [#1067](https://github.com/preservim/nerdtree/pull/1067)
--- a/lib/nerdtree/menu_controller.vim
+++ b/lib/nerdtree/menu_controller.vim
@@ -62,7 +62,7 @@ function! s:MenuController._echoPrompt()

    if self.isMinimal()
        let selection = self.menuItems[self.selection].text
-        let keyword = matchstr(selection, '\([^ ]*')
+        let keyword = matchstr(selection, '[^ ]*([^ ]*')

        let shortcuts = map(copy(self.menuItems), "v:val['shortcut']")
        let shortcuts[self.selection] = ' ' . keyword . ' '
--- a/nerdtree_plugin/fs_menu.vim
+++ b/nerdtree_plugin/fs_menu.vim
@@ -196,6 +196,11 @@ function! NERDTreeMoveNode()
    let curNode = g:NERDTreeFileNode.GetSelected()
    let prompt = s:inputPrompt('move')
    let newNodePath = input(prompt, curNode.path.str(), 'file')
+    while filereadable(newNodePath)
+        call nerdtree#echoWarning('This destination already exists. Try again.')
+        let newNodePath = input(prompt, curNode.path.str(), 'file')
+    endwhile
+

    if newNodePath ==# ''
        call nerdtree#echo('Node Renaming Aborted.')
Author	SHA1	Message	Date
Phil Runninger	901aba632b	Merge pull request #1079 from preservim/1078 Prevent overwriting existing files/dirs on node move. (m-m)	2020-01-15 19:55:31 -05:00
Phil Runninger	a046ba5c5b	Update version number in change log.	2020-01-15 19:54:06 -05:00
Phil Runninger	97e4b47aa3	Prevent overwriting existing files/dirs on node move. (m-m)	2020-01-15 19:51:39 -05:00
Phil Runninger	ee79ecfb67	Merge pull request #1075 from preservim/1073 Fix regex that finds keyword for minimal menu.	2020-01-06 09:21:11 -05:00
Phil Runninger	b579c7751d	Fix regex that finds keyword for minimal menu.	2020-01-06 09:19:25 -05:00