nerdtree

Index Commits Files Refs

commit c2c4a6564f993f5ae9849ae4f430a8fa31ce6f8a
parent 26740d1157dc1befe2a088052e10cf00436a5003
Author: Phil Runninger <PhilRunninger@users.noreply.github.com>
Date:   Mon, 27 Jan 2020 20:37:47 -0500

Merge pull request #1081 from andys8/bugfix/1059-fails-with-vim-startify

[BUGFIX] Shows error for empty filenames (vim-startify)
Diffstat:
M
CHANGELOG.md
 | 
1
+
M
autoload/nerdtree/ui_glue.vim
 | 
7
++++---

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
         - **.PATCH**: Pull Request Title (PR Author) [PR Number](Link to PR)
 -->
 #### 6.4
+- **.6:** NERDTreeFind shows expected message if file doesn't exist e.g. with vim-startify (andys8). [#1081](https://github.com/preservim/nerdtree/pull/1081)
 - **.5**: Ensure events are (or aren't) being ignored correctly. (PhilRunninger) [#1080](https://github.com/preservim/nerdtree/pull/1080)
 - **.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)
diff --git a/autoload/nerdtree/ui_glue.vim b/autoload/nerdtree/ui_glue.vim
@@ -284,15 +284,16 @@ endfunction
 " FUNCTION: s:findAndRevealPath(pathStr) {{{1
 function! s:findAndRevealPath(pathStr) abort
     let l:pathStr = !empty(a:pathStr) ? a:pathStr : expand('%:p')
-    if !filereadable(l:pathStr)
-        let l:pathStr = fnamemodify(l:pathStr, ':h')
-    endif
 
     if empty(l:pathStr)
         call nerdtree#echoWarning('no file for the current buffer')
         return
     endif
 
+    if !filereadable(l:pathStr)
+        let l:pathStr = fnamemodify(l:pathStr, ':h')
+    endif
+
     try
         let l:pathStr = g:NERDTreePath.Resolve(l:pathStr)
         let l:pathObj = g:NERDTreePath.New(l:pathStr)