From 6fb56458b6f6692730d91cd7f003a0136a07c80b Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 6 Apr 2016 13:49:33 +0200
Subject: [PATCH] Handle directories (via BufEnter)

This kicks in when using `vim autoload/gutentags` and there's both a
directory and `autoload/gutentags.vim` file.

When using an explicit slash at the end (`vim autoload/gutentags/`) the
directory will be used (and forwarded to netrw/vimfiler etc).
---
 plugin/DidYouMean.vim | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/plugin/DidYouMean.vim b/plugin/DidYouMean.vim
index cff91b4..a18f7dd 100644
--- a/plugin/DidYouMean.vim
+++ b/plugin/DidYouMean.vim
@@ -13,21 +13,41 @@ function! s:filter_out_swapfile(matched_files)
 endfunction
 
 
+function! s:didyoumean_bufenter()
+    " Specialized function to get notified when opening directories.
+    if get(b:, 'didyoumean_done', 0)
+        return
+    endif
+    let b:didyoumean_done = 1
+    if !len(expand("%"))
+        " Skip handling buffers without name in BufEnter.
+        return
+    endif
+    return s:didyoumean()
+endfunction
+
+
 function! s:didyoumean()
-    if filereadable(expand("%"))
+    let fname = expand("%")
+    if filereadable(fname)
         " Another BufNewFile event might have handled this already.
         return
     endif
+    if isdirectory(fname) && fname[-1:] == '/'
+        " A directory is given with an explicit trailing slash - use it.
+        return
+    endif
 
     try
         " As of Vim 7.4, glob() has an optional parameter to split, but not
         " everybody is using 7.4 yet
-        let matching_files = split(glob(expand("%")."*", 0), '\n')
+        let matching_files = split(glob(fname."*", 0), '\n')
         if !len(matching_files)
-            let matching_files = split(glob(expand("%")."*", 1), '\n')
+            let matching_files = split(glob(fname."*", 1), '\n')
         endif
         let matching_files = s:filter_out_swapfile(matching_files)
-        if empty(matching_files)
+        if len(matching_files) <= 1
+            " It might be 1 for directories.
             return
         endif
     catch
@@ -40,6 +60,9 @@ function! s:didyoumean()
     endfor
     let selected_number = inputlist(shown_items)
     if selected_number >= 1 && selected_number <= len(matching_files)
+                \ && matching_files[selected_number-1] != fname
+        " Load the selected file, but only if it differs from the requested
+        " one.  This handles opening directories with netrw/vimfiler etc.
         let empty_buffer_nr = bufnr("%")
         execute ":edit " . fnameescape(matching_files[selected_number-1])
         execute ":silent bdelete " . empty_buffer_nr
@@ -51,7 +74,9 @@ function! s:didyoumean()
         silent doautocmd BufReadPost
         silent doautocmd TextChanged
     endif
+    let b:didyoumean_done = 1
 endfunction
 
 
 autocmd BufNewFile * call s:didyoumean()
+autocmd BufEnter * call s:didyoumean_bufenter()