Skip to content

Commit 4e5f6e6

Browse files
committed
Remove support for findstr
findstr is a broken program; I can't get it to work outside of EasyGrep. I'd rather spend my time on better search tools than it.
1 parent b4e32b8 commit 4e5f6e6

9 files changed

+23
-27
lines changed

plugin/EasyGrep.vim

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,6 +2050,7 @@ function! s:ValidateGrepCommand()
20502050
let commandParams = s:GetGrepCommandParameters()
20512051
if empty(commandParams)
20522052
call s:Error("Cannot proceed; the configured 'grepprg' setting is not a known program")
2053+
call s:Error("Select a supported program with :GrepProgram")
20532054
return 0
20542055
endif
20552056

@@ -2685,28 +2686,28 @@ function! s:ConfigureGrepCommandParameters()
26852686
\ 'opt_bool_isselffiltering': '1',
26862687
\ })
26872688

2688-
call s:RegisterGrepProgram("findstr", {
2689-
\ 'req_str_programargs': '/n',
2690-
\ 'req_bool_supportsexclusions': '0',
2691-
\ 'req_str_recurse': '/S',
2692-
\ 'req_str_caseignore': '/I',
2693-
\ 'req_str_casematch': '',
2694-
\ 'opt_str_warnonuse': 'The findstr program is buggy and not-recommended for use',
2695-
\ 'opt_str_patternprefix': '',
2696-
\ 'opt_str_patternpostfix': '',
2697-
\ 'opt_str_wholewordprefix': '"\<',
2698-
\ 'opt_str_wholewordpostfix': '\>"',
2699-
\ 'opt_str_wholewordoption': '',
2700-
\ 'req_str_escapespecialcharacters': "\^$#.*",
2701-
\ 'opt_str_escapespecialcharacterstwice': "",
2702-
\ 'opt_str_mapexclusionsexpression': '',
2703-
\ 'opt_bool_filtertargetswithnofiles': '1',
2704-
\ 'opt_bool_bufferdirsearchallowed': '1',
2705-
\ 'opt_str_suppresserrormessages': '',
2706-
\ 'opt_bool_directoryneedsbackslash': '1',
2707-
\ 'opt_bool_isinherentlyrecursive': '0',
2708-
\ 'opt_bool_isselffiltering': '0',
2709-
\ })
2689+
"call s:RegisterGrepProgram("findstr", {
2690+
"\ 'req_str_programargs': '/n',
2691+
"\ 'req_bool_supportsexclusions': '0',
2692+
"\ 'req_str_recurse': '/S',
2693+
"\ 'req_str_caseignore': '/I',
2694+
"\ 'req_str_casematch': '',
2695+
"\ 'opt_str_warnonuse': 'The findstr program is buggy and not-recommended for use',
2696+
"\ 'opt_str_patternprefix': '',
2697+
"\ 'opt_str_patternpostfix': '',
2698+
"\ 'opt_str_wholewordprefix': '"\<',
2699+
"\ 'opt_str_wholewordpostfix': '\>"',
2700+
"\ 'opt_str_wholewordoption': '',
2701+
"\ 'req_str_escapespecialcharacters': "\^$#.*",
2702+
"\ 'opt_str_escapespecialcharacterstwice': "",
2703+
"\ 'opt_str_mapexclusionsexpression': '',
2704+
"\ 'opt_bool_filtertargetswithnofiles': '1',
2705+
"\ 'opt_bool_bufferdirsearchallowed': '1',
2706+
"\ 'opt_str_suppresserrormessages': '',
2707+
"\ 'opt_bool_directoryneedsbackslash': '1',
2708+
"\ 'opt_bool_isinherentlyrecursive': '0',
2709+
"\ 'opt_bool_isselffiltering': '0',
2710+
"\ })
27102711
endfunction
27112712
" }}}
27122713
" GetGrepCommandParameters {{{
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/vimgrep.suite

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,34 @@
22
# casesensitivity
33
casesensitivity_ack.vim
44
casesensitivity_ag.vim
5-
casesensitivity_findstr.vim
65
casesensitivity_grep.vim
76
casesensitivity_pt.vim
87
casesensitivity_vimgrep.vim
98

109
# wholeword
1110
wholeword_ack.vim
1211
wholeword_ag.vim
13-
wholeword_findstr.vim
1412
wholeword_grep.vim
1513
wholeword_pt.vim
1614
wholeword_vimgrep.vim
1715

1816
# exclusions
1917
exclusions_ack.vim
2018
exclusions_ag.vim
21-
# exclusions_findstr.vim # not yet supported
2219
exclusions_grep.vim
2320
# exclusions_pt.vim # not yet supported
2421
exclusions_vimgrep.vim
2522

2623
# recursion
2724
recursion_ack.vim
2825
recursion_ag.vim
29-
recursion_findstr.vim
3026
recursion_grep.vim
3127
# recursion_pt.vim # disabled; output is non-deterministic
3228
recursion_vimgrep.vim
3329

3430
# simpleregex
3531
simpleregex_ack.vim
3632
simpleregex_ag.vim
37-
# simpleregex_findstr.vim # findstr is broken; it does not search character classes correctly
3833
simpleregex_grep.vim
3934
simpleregex_pt.vim
4035
simpleregex_vimgrep.vim

0 commit comments

Comments
 (0)