handle backslash in pathname #190

fixes #189

Author: lxhillwind

autoload/dirvish.vim

@@ -53,7 +53,7 @@ endif
 
 function! s:list_dir(dir) abort
   " Escape for glob().
-  let dir_esc = escape(substitute(a:dir,'\[','[[]','g'),'{}^$')
+  let dir_esc = escape(substitute(a:dir,'\[','[[]','g'),'{}^$\')
   let paths = s:globlist(dir_esc.'*')
   "Append dot-prefixed files. glob() cannot do both in 1 pass.
   let paths = paths + s:globlist(dir_esc.'.[^.]*')

ftplugin/dirvish.vim

@@ -4,6 +4,7 @@ endif
 let b:did_ftplugin = 1
 
 let s:nowait = (v:version > 703 ? '<nowait>' : '')
+let s:sep = exists('+shellslash') && !&shellslash ? '\' : '/'
 
 if !hasmapto('<Plug>(dirvish_quit)', 'n')
   execute 'nmap '.s:nowait.'<buffer> q :echohl WarningMsg<Bar>echo "q is deprecated, use gq instead"<Bar>echohl NONE<cr>'
@@ -48,8 +49,13 @@ execute 'nnoremap <expr>'.s:nowait.'<buffer> . ":<C-u>".(v:count ? "Shdo".(v:cou
 execute 'xnoremap <expr>'.s:nowait.'<buffer> . ":Shdo".(v:count?"!":" ")." {}<Left><Left><Left>"'
 
 " Buffer-local / and ? mappings to skip the concealed path fragment.
-nnoremap <buffer> / /\ze[^\/]*[\/]\=$<Home>
-nnoremap <buffer> ? ?\ze[^\/]*[\/]\=$<Home>
+if s:sep == '\'
+  nnoremap <buffer> / /\ze[^\/]*[\/]\=$<Home>
+  nnoremap <buffer> ? ?\ze[^\/]*[\/]\=$<Home>
+else
+  nnoremap <buffer> / /\ze[^/]*[/]\=$<Home>
+  nnoremap <buffer> ? ?\ze[^/]*[/]\=$<Home>
+endif
 
 " Force autoload if `ft=dirvish`
 if !exists('*dirvish#open')|try|call dirvish#open()|catch|endtry|endif

syntax/dirvish.vim

@@ -3,13 +3,14 @@ if 'dirvish' !=# get(b:, 'current_syntax', 'dirvish')
 endif
 
 let s:sep = exists('+shellslash') && !&shellslash ? '\' : '/'
+let s:sep_esc = s:sep == '\' ? '\\' : '/'
 let s:escape = 'substitute(escape(v:val, ".$~"), "*", ".*", "g")'
 
 " Define once (per buffer).
 if !exists('b:current_syntax')
-  exe 'syntax match DirvishPathHead =.*\'.s:sep.'\ze[^\'.s:sep.']\+\'.s:sep.'\?$= conceal'
-  exe 'syntax match DirvishPathTail =[^\'.s:sep.']\+\'.s:sep.'$='
-  exe 'syntax match DirvishSuffix   =[^\'.s:sep.']*\%('.join(map(split(&suffixes, ','), s:escape), '\|') . '\)$='
+  exe 'syntax match DirvishPathHead =.*'.s:sep_esc.'\ze[^'.s:sep.']\+'.s:sep_esc.'\?$= conceal'
+  exe 'syntax match DirvishPathTail =[^'.s:sep.']\+'.s:sep_esc.'$='
+  exe 'syntax match DirvishSuffix   =[^'.s:sep.']*\%('.join(map(split(&suffixes, ','), s:escape), '\|') . '\)$='
 endif
 
 " Define (again). Other windows (different arglists) need the old definitions.