Skip to content

Use shellslash to make Cygwin more UNIX-like #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use shellslash to make Cygwin more UNIX-like #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
963f2ee
Use shellslash to make Cygwin more UNIX-like
Jan 8, 2017
d31be3c
support for tcgrep included
yeti01 May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 70 additions & 21 deletions plugin/grep.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,26 +69,36 @@
" :Ragrep - Run recursive agrep
" :RagrepAdd - Same as ":Ragrep" but adds the results to the current
" results
" :Tcgrep - Run tcgrep
" :TcgrepAdd - Same as ":Tcgrep" but adds the results to the current
" results
" :Rtcgrep - Run recursive tcgrep
" :RtcgrepAdd - Same as ":Rtcgrep" but adds the results to the current
" results
"
" The above commands can be invoked like this:
"
" :Grep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Rgrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Fgrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Rfgrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Egrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Regrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Agrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Ragrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
"
" :GrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :RgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :FgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :RfgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :EgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :RegrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :AgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :RagrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Grep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Rgrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Fgrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Rfgrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Egrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Regrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Agrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Ragrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Tcgrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :Rtcgrep [<grep_options>] [<search_pattern> [<file_name(s)>]]
"
" :GrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :RgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :FgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :RfgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :EgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :RegrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :AgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :RagrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :TcgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
" :RtcgrepAdd [<grep_options>] [<search_pattern> [<file_name(s)>]]
"
" :GrepBuffer [<grep_options>] [<search_pattern>]
" :Bgrep [<grep_options>] [<search_pattern>]
Expand Down Expand Up @@ -196,6 +206,11 @@
"
" :let Agrep_Path = 'd:\tools\agrep.exe'
"
" The 'Tcgrep_Path' variable is used to locate the tcgrep utility. By default,
" this is set to tcgrep. You can change this using the let command:
"
" :let Tcgrep_Path = 'd:\tools\tcgrep.pl'
"
" The 'Grep_Find_Path' variable is used to locate the find utility. By
" default, this is set to 'find'. Note that on MS-Windows, there is a find.exe
" that is part of the base OS. This find utility is different from the the
Expand Down Expand Up @@ -321,6 +336,13 @@ if !exists("Agrep_Path")
let Agrep_Path = 'agrep'
endif

" Location of the tcgrep utility
if !exists("Tcgrep_Path")
let Tcgrep_Path = '$VIM/vimfiles/tools/tcgrep.pl'
endif

let Tcgrep_Path = 'perl "' . expand(Tcgrep_Path, ":p"). '"'

" Location of the find utility
if !exists("Grep_Find_Path")
let Grep_Find_Path = 'find'
Expand Down Expand Up @@ -518,7 +540,11 @@ function! s:RunGrepRecursive(cmd_name, grep_cmd, action, ...)
if a:grep_cmd != 'agrep'
" Don't display messages about non-existent files
" Agrep doesn't support the -s option
let grep_opt = grep_opt . " -s"
if a:grep_cmd != 'tcgrep'
let grep_opt = grep_opt . " -s"
else
let grep_opt = grep_opt . " -q"
endif
endif

if a:grep_cmd == 'grep'
Expand All @@ -533,6 +559,9 @@ function! s:RunGrepRecursive(cmd_name, grep_cmd, action, ...)
elseif a:grep_cmd == 'agrep'
let grep_path = g:Agrep_Path
let grep_expr_option = ''
elseif a:grep_cmd == 'tcgrep'
let grep_path = g:Tcgrep_Path
let grep_expr_option = ''
else
return
endif
Expand All @@ -548,10 +577,11 @@ function! s:RunGrepRecursive(cmd_name, grep_cmd, action, ...)
echo "\r"
endif

let cwd = getcwd()
let shellslash_save = &shellslash
if g:Grep_Cygwin_Find == 1
let cwd = substitute(cwd, "\\", "/", "g")
set shellslash
endif
let cwd = getcwd()
if v:version >= 700
let startdir = input("Start searching from directory: ", cwd, "dir")
else
Expand All @@ -560,6 +590,10 @@ function! s:RunGrepRecursive(cmd_name, grep_cmd, action, ...)
if startdir == ""
return
endif
if has("unix") || &shellslash
let startdir = substitute(startdir, "\\", "", "g")
endif
let &shellslash = shellslash_save
echo "\r"

if filepattern == ""
Expand Down Expand Up @@ -782,7 +816,11 @@ function! s:RunGrep(cmd_name, grep_cmd, action, ...)
if a:grep_cmd != 'agrep'
" Don't display messages about non-existent files
" Agrep doesn't support the -s option
let grep_opt = grep_opt . " -s"
if a:grep_cmd != 'tcgrep'
let grep_opt = grep_opt . " -s"
else
let grep_opt = grep_opt . " -q"
endif
endif

if a:grep_cmd == 'grep'
Expand All @@ -797,6 +835,9 @@ function! s:RunGrep(cmd_name, grep_cmd, action, ...)
elseif a:grep_cmd == 'agrep'
let grep_path = g:Agrep_Path
let grep_expr_option = ''
elseif a:grep_cmd == 'tcgrep'
let grep_path = g:Tcgrep_Path
let grep_expr_option = ''
else
return
endif
Expand Down Expand Up @@ -859,6 +900,10 @@ command! -nargs=* -complete=file Agrep
\ call s:RunGrep('Agrep', 'agrep', 'set', <f-args>)
command! -nargs=* -complete=file Ragrep
\ call s:RunGrepRecursive('Ragrep', 'agrep', 'set', <f-args>)
command! -nargs=* -complete=file Tcgrep
\ call s:RunGrep('Tcgrep', 'tcgrep', 'set', <f-args>)
command! -nargs=* -complete=file Rtcgrep
\ call s:RunGrepRecursive('Rtcgrep', 'tcgrep', 'set', <f-args>)

if v:version >= 700
command! -nargs=* -complete=file GrepAdd
Expand All @@ -884,6 +929,10 @@ command! -nargs=* -complete=file AgrepAdd
\ call s:RunGrep('AgrepAdd', 'agrep', 'add', <f-args>)
command! -nargs=* -complete=file RagrepAdd
\ call s:RunGrepRecursive('RagrepAdd', 'agrep', 'add', <f-args>)
command! -nargs=* -complete=file TcgrepAdd
\ call s:RunGrep('TcgrepAdd', 'tcgrep', 'add', <f-args>)
command! -nargs=* -complete=file RtcgrepAdd
\ call s:RunGrepRecursive('RtcgrepAdd', 'tcgrep', 'add', <f-args>)
endif

" Add the Tools->Search Files menu
Expand Down
Loading