Better support with nerdtree-git-plugin flags (enhancement fixes ryanoasis#62)

Author: ryanoasis

nerdtree_plugin/webdevicons.vim

@@ -25,6 +25,16 @@ if g:webdevicons_enable_nerdtree == 1
      echohl WarningMsg |
         \ echomsg "vim-webdevicons requires a newer version of NERDTree to show glyphs in NERDTree - consider updating NERDTree."
   endif
+
+  " @todo I don't even want this to execute UNLESS the user has the
+  " 'nerdtree-git-plugin' INSTALLED (not LOADED)
+  " As it currently functions this warning will display even if the user does
+  " not have nerdtree-git-plugin not just if it isn't loaded yet 
+  " (not what we want)
+  "if !exists('g:loaded_nerdtree_git_status')
+  "   echohl WarningMsg |
+  "     \ echomsg "vim-webdevicons works better when 'nerdtree-git-plugin' is loaded before vim-webdevicons (small refresh issues otherwise)."
+  "endif
 endif
 
 if !exists('g:webdevicons_enable_airline_tabline')

plugin/webdevicons.vim

@@ -280,18 +280,24 @@ endif
 function! NERDTreeWebDevIconsRefreshListener(event)
   let path = a:event.subject
   let padding = g:WebDevIconsNerdTreeAfterGlyphPadding
+  let prePadding = ''
+  let hasGitFlags = (len(path.flagSet._flagsForScope("git")) > 0)
 
   if g:WebDevIconsUnicodeGlyphDoubleWidth == 0
     let padding = ''
   endif
 
+  if hasGitFlags && g:WebDevIconsUnicodeGlyphDoubleWidth == 1
+    let prePadding = ' '
+  endif
+
   if !path.isDirectory
-    let flag = WebDevIconsGetFileTypeSymbol(path.str()) . padding
+    let flag = prePadding . WebDevIconsGetFileTypeSymbol(path.str()) . padding
   elseif path.isDirectory && g:WebDevIconsUnicodeDecorateFolderNodes == 1
     if g:WebDevIconsUnicodeDecorateFolderNodesExactMatches == 1
-      let flag = WebDevIconsGetFileTypeSymbol(path.str(), path.isDirectory) . padding
+      let flag = prePadding . WebDevIconsGetFileTypeSymbol(path.str(), path.isDirectory) . padding
     else
-      let flag = g:WebDevIconsUnicodeDecorateFolderNodesDefaultSymbol
+      let flag = prePadding . g:WebDevIconsUnicodeDecorateFolderNodesDefaultSymbol
     endif
   else
     let flag = ''

readme.md

@@ -290,7 +290,7 @@ endfunction
 ## Todo
 
 * [ ] more filetypes to support
-* [ ] make sure it works properly and does not conflict with [nerdtree-git-plugin](https://github.com/Xuyuanp/nerdtree-git-plugin)
+* [x] make sure it works properly and does not conflict with [nerdtree-git-plugin](https://github.com/Xuyuanp/nerdtree-git-plugin)
 * [ ] customize filetype icon colors
 * [ ] more customization options in general