opensourcemirror
/
neovim
mirror of https://github.com/neovim/neovim.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge #11556 from janlazo/vim-8.2.0002 

vim-patch:8.2.{2,8,10,12,13}
This commit is contained in:
Justin M. Keyes 2019-12-16 22:16:30 -08:00 committed by GitHub
parent 3de1bc4bf9 9e6ebed6f4
commit 1bfccf0286
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 1030 additions and 1862 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval.c
View File

@ -23652,7 +23652,7 @@ void ex_return(exarg_T *eap)
int do_return(exarg_T *eap, int reanimate, int is_cmd, void *rettv)
{
int idx;
struct condstack *cstack = eap->cstack;
cstack_T *const cstack = eap->cstack;
if (reanimate)
/* Undo the return. */

91
src/nvim/ex_cmds_defs.h
View File

@ -12,31 +12,29 @@
# include "ex_cmds_enum.generated.h"
#endif
/*
* When adding an Ex command:
* 1. Add an entry to the table in src/nvim/ex_cmds.lua. Keep it sorted on the
* shortest version of the command name that works. If it doesn't start with
* a lower case letter, add it at the end.
*
* Each table entry is a table with the following keys:
*
* Key | Description
* ------- | -------------------------------------------------------------
* command | Name of the command. Required.
* enum | Name of the enum entry. If not set defaults to CMD_{command}.
* flags | A set of the flags from below list joined by bitwise or.
* func | Name of the function containing the implementation.
*
* Referenced function should be either non-static one or defined in
* ex_docmd.c and be coercible to ex_func_T type from below.
*
* All keys not described in the above table are reserved for future use.
*
* 2. Add a "case: CMD_xxx" in the big switch in ex_docmd.c.
* 3. Add an entry in the index for Ex commands at ":help ex-cmd-index".
* 4. Add documentation in ../doc/xxx.txt. Add a tag for both the short and
* long name of the command.
*/
// When adding an Ex command:
// 1. Add an entry to the table in src/nvim/ex_cmds.lua. Keep it sorted on the
// shortest version of the command name that works. If it doesn't start with
// a lower case letter, add it at the end.
//
// Each table entry is a table with the following keys:
//
// Key | Description
// ------- | -------------------------------------------------------------
// command | Name of the command. Required.
// enum | Name of the enum entry. If not set defaults to CMD_{command}.
// flags | A set of the flags from below list joined by bitwise or.
// func | Name of the function containing the implementation.
//
// Referenced function should be either non-static one or defined in
// ex_docmd.c and be coercible to ex_func_T type from below.
//
// All keys not described in the above table are reserved for future use.
//
// 2. Add a "case: CMD_xxx" in the big switch in ex_docmd.c.
// 3. Add an entry in the index for Ex commands at ":help ex-cmd-index".
// 4. Add documentation in ../doc/xxx.txt. Add a tag for both the short and
// long name of the command.
#define RANGE 0x001 /* allow a linespecs */
#define BANG 0x002 /* allow a ! after the command name */
@ -98,6 +96,47 @@ typedef struct cmdname {
int cmd_addr_type; ///< Flag for address type
} CommandDefinition;
// A list used for saving values of "emsg_silent". Used by ex_try() to save the
// value of "emsg_silent" if it was non-zero. When this is done, the CSF_SILENT
// flag below is set.
typedef struct eslist_elem eslist_T;
struct eslist_elem {
int saved_emsg_silent; // saved value of "emsg_silent"
eslist_T *next; // next element on the list
};
// For conditional commands a stack is kept of nested conditionals.
// When cs_idx < 0, there is no conditional command.
enum {
CSTACK_LEN = 50,
};
typedef struct {
int cs_flags[CSTACK_LEN]; // CSF_ flags
char cs_pending[CSTACK_LEN]; // CSTP_: what's pending in ":finally"
union {
void *csp_rv[CSTACK_LEN]; // return typeval for pending return
void *csp_ex[CSTACK_LEN]; // exception for pending throw
} cs_pend;
void *cs_forinfo[CSTACK_LEN]; // info used by ":for"
int cs_line[CSTACK_LEN]; // line nr of ":while"/":for" line
int cs_idx; // current entry, or -1 if none
int cs_looplevel; // nr of nested ":while"s and ":for"s
int cs_trylevel; // nr of nested ":try"s
eslist_T *cs_emsg_silent_list; // saved values of "emsg_silent"
int cs_lflags; // loop flags: CSL_ flags
} cstack_T;
# define cs_rettv cs_pend.csp_rv
# define cs_exception cs_pend.csp_ex
// Flags for the cs_lflags item in cstack_T.
enum {
CSL_HAD_LOOP = 1, // just found ":while" or ":for"
CSL_HAD_ENDLOOP = 2, // just found ":endwhile" or ":endfor"
CSL_HAD_CONT = 4, // just found ":continue"
CSL_HAD_FINA = 8, // just found ":finally"
};
/// Arguments used for Ex commands.
struct exarg {
char_u *arg; ///< argument of the command
@ -128,7 +167,7 @@ struct exarg {
char_u *errmsg; ///< returned error message
LineGetter getline; ///< Function used to get the next line
void *cookie; ///< argument for getline()
struct condstack *cstack; ///< condition stack for ":if" etc.
cstack_T *cstack; ///< condition stack for ":if" etc.
};
#define FORCE_BIN 1 // ":edit ++bin file"

18
src/nvim/ex_docmd.c
View File

@ -325,13 +325,13 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline,
int count = 0; /* line number count */
int did_inc = FALSE; /* incremented RedrawingDisabled */
int retval = OK;
struct condstack cstack; /* conditional stack */
garray_T lines_ga; /* keep lines for ":while"/":for" */
int current_line = 0; /* active line in lines_ga */
char_u *fname = NULL; /* function or script name */
linenr_T *breakpoint = NULL; /* ptr to breakpoint field in cookie */
int *dbg_tick = NULL; /* ptr to dbg_tick field in cookie */
struct dbg_stuff debug_saved; /* saved things for debug mode */
cstack_T cstack; // conditional stack
garray_T lines_ga; // keep lines for ":while"/":for"
int current_line = 0; // active line in lines_ga
char_u *fname = NULL; // function or script name
linenr_T *breakpoint = NULL; // ptr to breakpoint field in cookie
int *dbg_tick = NULL; // ptr to dbg_tick field in cookie
struct dbg_stuff debug_saved; // saved things for debug mode
int initial_trylevel;
struct msglist **saved_msg_list = NULL;
struct msglist *private_msg_list;
@ -361,7 +361,7 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline,
EMSG(_("E169: Command too recursive"));
// When converting to an exception, we do not include the command name
// since this is not an error of the specific command.
do_errthrow((struct condstack *)NULL, (char_u *)NULL);
do_errthrow((cstack_T *)NULL, (char_u *)NULL);
msg_list = saved_msg_list;
return FAIL;
}
@ -1545,7 +1545,7 @@ static bool parse_one_cmd(
*/
static char_u * do_one_cmd(char_u **cmdlinep,
int flags,
struct condstack *cstack,
cstack_T *cstack,
LineGetter fgetline,
void *cookie /* argument for fgetline() */
)

35
src/nvim/ex_eval.c
View File

@ -307,7 +307,7 @@ void free_global_msglist(void)
* error exception. If cstack is NULL, postpone the throw until do_cmdline()
* has returned (see do_one_cmd()).
*/
void do_errthrow(struct condstack *cstack, char_u *cmdname)
void do_errthrow(cstack_T *cstack, char_u *cmdname)
{
/*
* Ensure that all commands in nested function calls and sourced files
@ -339,7 +339,7 @@ void do_errthrow(struct condstack *cstack, char_u *cmdname)
* exception if appropriate. Return TRUE if the current exception is discarded,
* FALSE otherwise.
*/
int do_intthrow(struct condstack *cstack)
int do_intthrow(cstack_T *cstack)
{
// If no interrupt occurred or no try conditional is active and no exception
// is being thrown, do nothing (for compatibility of non-EH scripts).
@ -795,7 +795,7 @@ void ex_if(exarg_T *eap)
{
int skip;
int result;
struct condstack *cstack = eap->cstack;
cstack_T *const cstack = eap->cstack;
if (cstack->cs_idx == CSTACK_LEN - 1)
eap->errmsg = (char_u *)N_("E579: :if nesting too deep");
@ -852,7 +852,7 @@ void ex_else(exarg_T *eap)
{
int skip;
int result;
struct condstack *cstack = eap->cstack;
cstack_T *const cstack = eap->cstack;
skip = CHECK_SKIP;
@ -926,7 +926,7 @@ void ex_while(exarg_T *eap)
bool error;
int skip;
int result;
struct condstack *cstack = eap->cstack;
cstack_T *const cstack = eap->cstack;
if (cstack->cs_idx == CSTACK_LEN - 1)
eap->errmsg = (char_u *)N_("E585: :while/:for nesting too deep");
@ -1005,7 +1005,7 @@ void ex_while(exarg_T *eap)
void ex_continue(exarg_T *eap)
{
int idx;
struct condstack *cstack = eap->cstack;
cstack_T *const cstack = eap->cstack;
if (cstack->cs_looplevel <= 0 || cstack->cs_idx < 0)
eap->errmsg = (char_u *)N_("E586: :continue without :while or :for");
@ -1039,7 +1039,7 @@ void ex_continue(exarg_T *eap)
void ex_break(exarg_T *eap)
{
int idx;
struct condstack *cstack = eap->cstack;
cstack_T *const cstack = eap->cstack;
if (cstack->cs_looplevel <= 0 || cstack->cs_idx < 0)
eap->errmsg = (char_u *)N_("E587: :break without :while or :for");
@ -1061,7 +1061,7 @@ void ex_break(exarg_T *eap)
*/
void ex_endwhile(exarg_T *eap)
{
struct condstack *cstack = eap->cstack;
cstack_T *const cstack = eap->cstack;
int idx;
char_u *err;
int csf;
@ -1164,7 +1164,7 @@ void ex_throw(exarg_T *eap)
* for ":throw" (user exception) and error and interrupt exceptions. Also
* used for rethrowing an uncaught exception.
*/
void do_throw(struct condstack *cstack)
void do_throw(cstack_T *cstack)
{
int idx;
int inactivate_try = FALSE;
@ -1225,7 +1225,7 @@ void do_throw(struct condstack *cstack)
void ex_try(exarg_T *eap)
{
int skip;
struct condstack *cstack = eap->cstack;
cstack_T *const cstack = eap->cstack;
if (cstack->cs_idx == CSTACK_LEN - 1)
eap->errmsg = (char_u *)N_("E601: :try nesting too deep");
@ -1260,7 +1260,7 @@ void ex_try(exarg_T *eap)
* to save the value.
*/
if (emsg_silent) {
eslist_T *elem = xmalloc(sizeof(struct eslist_elem));
eslist_T *elem = xmalloc(sizeof(*elem));
elem->saved_emsg_silent = emsg_silent;
elem->next = cstack->cs_emsg_silent_list;
cstack->cs_emsg_silent_list = elem;
@ -1286,7 +1286,7 @@ void ex_catch(exarg_T *eap)
char_u *save_cpo;
regmatch_T regmatch;
int prev_got_int;
struct condstack *cstack = eap->cstack;
cstack_T *const cstack = eap->cstack;
char_u *pat;
if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0) {
@ -1432,7 +1432,7 @@ void ex_finally(exarg_T *eap)
int idx;
int skip = FALSE;
int pending = CSTP_NONE;
struct condstack *cstack = eap->cstack;
cstack_T *const cstack = eap->cstack;
if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0)
eap->errmsg = (char_u *)N_("E606: :finally without :try");
@ -1555,7 +1555,7 @@ void ex_endtry(exarg_T *eap)
int rethrow = FALSE;
int pending = CSTP_NONE;
void *rettv = NULL;
struct condstack *cstack = eap->cstack;
cstack_T *const cstack = eap->cstack;
if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0) {
eap->errmsg = (char_u *)N_("E602: :endtry without :try");
@ -1882,7 +1882,7 @@ void leave_cleanup(cleanup_T *csp)
* entered, is restored (used by ex_endtry()). This is normally done only
* when such a try conditional is left.
*/
int cleanup_conditionals(struct condstack *cstack, int searched_cond, int inclusive)
int cleanup_conditionals(cstack_T *cstack, int searched_cond, int inclusive)
{
int idx;
int stop = FALSE;
@ -1990,7 +1990,7 @@ int cleanup_conditionals(struct condstack *cstack, int searched_cond, int inclus
/*
* Return an appropriate error message for a missing endwhile/endfor/endif.
*/
static char_u *get_end_emsg(struct condstack *cstack)
static char_u *get_end_emsg(cstack_T *cstack)
{
if (cstack->cs_flags[cstack->cs_idx] & CSF_WHILE)
return e_endwhile;
@ -2007,7 +2007,8 @@ static char_u *get_end_emsg(struct condstack *cstack)
* type.
* Also free "for info" structures where needed.
*/
void rewind_conditionals(struct condstack *cstack, int idx, int cond_type, int *cond_level)
void rewind_conditionals(cstack_T *cstack, int idx, int cond_type,
int *cond_level)
{
while (cstack->cs_idx > idx) {
if (cstack->cs_flags[cstack->cs_idx] & cond_type)

44
src/nvim/ex_eval.h
View File

@ -4,42 +4,6 @@
#include "nvim/pos.h" // for linenr_T
#include "nvim/ex_cmds_defs.h" // for exarg_T
/*
* A list used for saving values of "emsg_silent". Used by ex_try() to save the
* value of "emsg_silent" if it was non-zero. When this is done, the CSF_SILENT
* flag below is set.
*/
typedef struct eslist_elem eslist_T;
struct eslist_elem {
int saved_emsg_silent; /* saved value of "emsg_silent" */
eslist_T *next; /* next element on the list */
};
/*
* For conditional commands a stack is kept of nested conditionals.
* When cs_idx < 0, there is no conditional command.
*/
#define CSTACK_LEN 50
struct condstack {
int cs_flags[CSTACK_LEN]; // CSF_ flags
char cs_pending[CSTACK_LEN]; // CSTP_: what's pending in ":finally"
union {
void *csp_rv[CSTACK_LEN]; // return typeval for pending return
void *csp_ex[CSTACK_LEN]; // exception for pending throw
} cs_pend;
void *cs_forinfo[CSTACK_LEN]; // info used by ":for"
int cs_line[CSTACK_LEN]; // line nr of ":while"/":for" line
int cs_idx; // current entry, or -1 if none
int cs_looplevel; // nr of nested ":while"s and ":for"s
int cs_trylevel; // nr of nested ":try"s
eslist_T *cs_emsg_silent_list; // saved values of "emsg_silent"
int cs_lflags; // loop flags: CSL_ flags
};
# define cs_rettv cs_pend.csp_rv
# define cs_exception cs_pend.csp_ex
/* There is no CSF_IF, the lack of CSF_WHILE, CSF_FOR and CSF_TRY means ":if"
* was used. */
# define CSF_TRUE 0x0001 /* condition was TRUE */
@ -69,14 +33,6 @@ struct condstack {
# define CSTP_RETURN 24 /* ":return" is pending */
# define CSTP_FINISH 32 /* ":finish" is pending */
/*
* Flags for the cs_lflags item in struct condstack.
*/
# define CSL_HAD_LOOP 1 /* just found ":while" or ":for" */
# define CSL_HAD_ENDLOOP 2 /* just found ":endwhile" or ":endfor" */
# define CSL_HAD_CONT 4 /* just found ":continue" */
# define CSL_HAD_FINA 8 /* just found ":finally" */
/*
* A list of error messages that can be converted to an exception. "throw_msg"
* is only set in the first element of the list. Usually, it points to the

4
src/nvim/normal.c
View File

@ -1553,7 +1553,9 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
if (!VIsual_active) {
if (hasFolding(oap->start.lnum, &oap->start.lnum, NULL))
oap->start.col = 0;
if ((curwin->w_cursor.col > 0 || oap->inclusive)
if ((curwin->w_cursor.col > 0
|| oap->inclusive
|| oap->motion_type == kMTLineWise)
&& hasFolding(curwin->w_cursor.lnum, NULL,
&curwin->w_cursor.lnum)) {
curwin->w_cursor.col = (colnr_T)STRLEN(get_cursor_line_ptr());

1
src/nvim/testdir/Makefile
View File

@ -15,7 +15,6 @@ export TMPDIR := $(abspath Xtest-tmpdir)
SCRIPTS_DEFAULT = \
test42.out \
test64.out \
ifneq ($(OS),Windows_NT)
SCRIPTS_DEFAULTS := $(SCRIPTS_DEFAULT) \

654
src/nvim/testdir/test64.in
View File

@ -1,654 +0,0 @@
Test for regexp patterns without multi-byte support.
See test95 for multi-byte tests.
A pattern that gives the expected result produces OK, so that we know it was
actually tried.
STARTTEST
:" tl is a List of Lists with:
:" regexp engine
:" regexp pattern
:" text to test the pattern on
:" expected match (optional)
:" expected submatch 1 (optional)
:" expected submatch 2 (optional)
:" etc.
:" When there is no match use only the first two items.
:let tl = []
:"
:""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
:"""" Previously written tests """"""""""""""""""""""""""""""""
:""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
:"
:set noautoindent
:call add(tl, [2, 'ab', 'aab', 'ab'])
:call add(tl, [2, 'b', 'abcdef', 'b'])
:call add(tl, [2, 'bc*', 'abccccdef', 'bcccc'])
:call add(tl, [2, 'bc\{-}', 'abccccdef', 'b'])
:call add(tl, [2, 'bc\{-}\(d\)', 'abccccdef', 'bccccd', 'd'])
:call add(tl, [2, 'bc*', 'abbdef', 'b'])
:call add(tl, [2, 'c*', 'ccc', 'ccc'])
:call add(tl, [2, 'bc*', 'abdef', 'b'])
:call add(tl, [2, 'c*', 'abdef', ''])
:call add(tl, [2, 'bc\+', 'abccccdef', 'bcccc'])
:call add(tl, [2, 'bc\+', 'abdef']) "no match
:"
:"operator \|
:call add(tl, [2, 'a\|ab', 'cabd', 'a']) "alternation is ordered
:"
:call add(tl, [2, 'c\?', 'ccb', 'c'])
:call add(tl, [2, 'bc\?', 'abd', 'b'])
:call add(tl, [2, 'bc\?', 'abccd', 'bc'])
:"
:call add(tl, [2, '\va{1}', 'ab', 'a'])
:"
:call add(tl, [2, '\va{2}', 'aa', 'aa'])
:call add(tl, [2, '\va{2}', 'caad', 'aa'])
:call add(tl, [2, '\va{2}', 'aba'])
:call add(tl, [2, '\va{2}', 'ab'])
:call add(tl, [2, '\va{2}', 'abaa', 'aa'])
:call add(tl, [2, '\va{2}', 'aaa', 'aa'])
:"
:call add(tl, [2, '\vb{1}', 'abca', 'b'])
:call add(tl, [2, '\vba{2}', 'abaa', 'baa'])
:call add(tl, [2, '\vba{3}', 'aabaac'])
:"
:call add(tl, [2, '\v(ab){1}', 'ab', 'ab', 'ab'])
:call add(tl, [2, '\v(ab){1}', 'dabc', 'ab', 'ab'])
:call add(tl, [2, '\v(ab){1}', 'acb'])
:"
:call add(tl, [2, '\v(ab){0,2}', 'acb', "", ""])
:call add(tl, [2, '\v(ab){0,2}', 'ab', 'ab', 'ab'])
:call add(tl, [2, '\v(ab){1,2}', 'ab', 'ab', 'ab'])
:call add(tl, [2, '\v(ab){1,2}', 'ababc', 'abab', 'ab'])
:call add(tl, [2, '\v(ab){2,4}', 'ababcab', 'abab', 'ab'])
:call add(tl, [2, '\v(ab){2,4}', 'abcababa', 'abab', 'ab'])
:"
:call add(tl, [2, '\v(ab){2}', 'abab', 'abab', 'ab'])
:call add(tl, [2, '\v(ab){2}', 'cdababe', 'abab', 'ab'])
:call add(tl, [2, '\v(ab){2}', 'abac'])
:call add(tl, [2, '\v(ab){2}', 'abacabab', 'abab', 'ab'])
:call add(tl, [2, '\v((ab){2}){2}', 'abababab', 'abababab', 'abab', 'ab'])
:call add(tl, [2, '\v((ab){2}){2}', 'abacabababab', 'abababab', 'abab', 'ab'])
:"
:call add(tl, [2, '\v(a{1}){1}', 'a', 'a', 'a'])
:call add(tl, [2, '\v(a{2}){1}', 'aa', 'aa', 'aa'])
:call add(tl, [2, '\v(a{2}){1}', 'aaac', 'aa', 'aa'])
:call add(tl, [2, '\v(a{2}){1}', 'daaac', 'aa', 'aa'])
:call add(tl, [2, '\v(a{1}){2}', 'daaac', 'aa', 'a'])
:call add(tl, [2, '\v(a{1}){2}', 'aaa', 'aa', 'a'])
:call add(tl, [2, '\v(a{2})+', 'adaac', 'aa', 'aa'])
:call add(tl, [2, '\v(a{2})+', 'aa', 'aa', 'aa'])
:call add(tl, [2, '\v(a{2}){1}', 'aa', 'aa', 'aa'])
:call add(tl, [2, '\v(a{1}){2}', 'aa', 'aa', 'a'])
:call add(tl, [2, '\v(a{1}){1}', 'a', 'a', 'a'])
:call add(tl, [2, '\v(a{2}){2}', 'aaaa', 'aaaa', 'aa'])
:call add(tl, [2, '\v(a{2}){2}', 'aaabaaaa', 'aaaa', 'aa'])
:"
:call add(tl, [2, '\v(a+){2}', 'dadaac', 'aa', 'a'])
:call add(tl, [2, '\v(a{3}){2}', 'aaaaaaa', 'aaaaaa', 'aaa'])
:"
:call add(tl, [2, '\v(a{1,2}){2}', 'daaac', 'aaa', 'a'])
:call add(tl, [2, '\v(a{1,3}){2}', 'daaaac', 'aaaa', 'a'])
:call add(tl, [2, '\v(a{1,3}){2}', 'daaaaac', 'aaaaa', 'aa'])
:call add(tl, [2, '\v(a{1,3}){3}', 'daac'])
:call add(tl, [2, '\v(a{1,2}){2}', 'dac'])
:call add(tl, [2, '\v(a+)+', 'daac', 'aa', 'aa'])
:call add(tl, [2, '\v(a+)+', 'aaa', 'aaa', 'aaa'])
:call add(tl, [2, '\v(a+){1,2}', 'aaa', 'aaa', 'aaa'])
:call add(tl, [2, '\v(a+)(a+)', 'aaa', 'aaa', 'aa', 'a'])
:call add(tl, [2, '\v(a{3})+', 'daaaac', 'aaa', 'aaa'])
:call add(tl, [2, '\v(a|b|c)+', 'aacb', 'aacb', 'b'])
:call add(tl, [2, '\v(a|b|c){2}', 'abcb', 'ab', 'b'])
:call add(tl, [2, '\v(abc){2}', 'abcabd', ])
:call add(tl, [2, '\v(abc){2}', 'abdabcabc','abcabc', 'abc'])
:"
:call add(tl, [2, 'a*', 'cc', ''])
:call add(tl, [2, '\v(a*)+', 'cc', ''])
:call add(tl, [2, '\v((ab)+)+', 'ab', 'ab', 'ab', 'ab'])
:call add(tl, [2, '\v(((ab)+)+)+', 'ab', 'ab', 'ab', 'ab', 'ab'])
:call add(tl, [2, '\v(((ab)+)+)+', 'dababc', 'abab', 'abab', 'abab', 'ab'])
:call add(tl, [2, '\v(a{0,2})+', 'cc', ''])
:call add(tl, [2, '\v(a*)+', '', ''])
:call add(tl, [2, '\v((a*)+)+', '', ''])
:call add(tl, [2, '\v((ab)*)+', '', ''])
:call add(tl, [2, '\va{1,3}', 'aab', 'aa'])
:call add(tl, [2, '\va{2,3}', 'abaa', 'aa'])
:"
:call add(tl, [2, '\v((ab)+|c*)+', 'abcccaba', 'abcccab', '', 'ab'])
:call add(tl, [2, '\v(a{2})|(b{3})', 'bbabbbb', 'bbb', '', 'bbb'])
:call add(tl, [2, '\va{2}|b{2}', 'abab'])
:call add(tl, [2, '\v(a)+|(c)+', 'bbacbaacbbb', 'a', 'a'])
:call add(tl, [2, '\vab{2,3}c', 'aabbccccccccccccc', 'abbc'])
:call add(tl, [2, '\vab{2,3}c', 'aabbbccccccccccccc', 'abbbc'])
:call add(tl, [2, '\vab{2,3}cd{2,3}e', 'aabbbcddee', 'abbbcdde'])
:call add(tl, [2, '\va(bc){2}d', 'aabcbfbc' ])
:call add(tl, [2, '\va*a{2}', 'a', ])
:call add(tl, [2, '\va*a{2}', 'aa', 'aa' ])
:call add(tl, [2, '\va*a{2}', 'aaa', 'aaa' ])
:call add(tl, [2, '\va*a{2}', 'bbbabcc', ])
:call add(tl, [2, '\va*b*|a*c*', 'a', 'a'])
:call add(tl, [2, '\va{1}b{1}|a{1}b{1}', ''])
:"
:"submatches
:call add(tl, [2, '\v(a)', 'ab', 'a', 'a'])
:call add(tl, [2, '\v(a)(b)', 'ab', 'ab', 'a', 'b'])
:call add(tl, [2, '\v(ab)(b)(c)', 'abbc', 'abbc', 'ab', 'b', 'c'])
:call add(tl, [2, '\v((a)(b))', 'ab', 'ab', 'ab', 'a', 'b'])
:call add(tl, [2, '\v(a)|(b)', 'ab', 'a', 'a'])
:"
:call add(tl, [2, '\v(a*)+', 'aaaa', 'aaaa', ''])
:call add(tl, [2, 'x', 'abcdef'])
:"
:""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
:""""" Simple tests """""""""""""""""""""""""""""""""""""""""""
:""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
:"
:" Search single groups
:call add(tl, [2, 'ab', 'aab', 'ab'])
:call add(tl, [2, 'ab', 'baced'])
:call add(tl, [2, 'ab', ' ab ', 'ab'])
:"
:" Search multi-modifiers
:call add(tl, [2, 'x*', 'xcd', 'x'])
:call add(tl, [2, 'x*', 'xxxxxxxxxxxxxxxxsofijiojgf', 'xxxxxxxxxxxxxxxx'])
:" empty match is good
:call add(tl, [2, 'x*', 'abcdoij', ''])
:" no match here
:call add(tl, [2, 'x\+', 'abcdoin'])
:call add(tl, [2, 'x\+', 'abcdeoijdfxxiuhfij', 'xx'])
:call add(tl, [2, 'x\+', 'xxxxx', 'xxxxx'])
:call add(tl, [2, 'x\+', 'abc x siufhiush xxxxxxxxx', 'x'])
:call add(tl, [2, 'x\=', 'x sdfoij', 'x'])
:call add(tl, [2, 'x\=', 'abc sfoij', '']) " empty match is good
:call add(tl, [2, 'x\=', 'xxxxxxxxx c', 'x'])
:call add(tl, [2, 'x\?', 'x sdfoij', 'x'])
:" empty match is good
:call add(tl, [2, 'x\?', 'abc sfoij', ''])
:call add(tl, [2, 'x\?', 'xxxxxxxxxx c', 'x'])
:"
:call add(tl, [2, 'a\{0,0}', 'abcdfdoij', ''])
:" same thing as 'a?'
:call add(tl, [2, 'a\{0,1}', 'asiubid axxxaaa', 'a'])
:" same thing as 'a\{0,1}'
:call add(tl, [2, 'a\{1,0}', 'asiubid axxxaaa', 'a'])
:call add(tl, [2, 'a\{3,6}', 'aa siofuh'])
:call add(tl, [2, 'a\{3,6}', 'aaaaa asfoij afaa', 'aaaaa'])
:call add(tl, [2, 'a\{3,6}', 'aaaaaaaa', 'aaaaaa'])
:call add(tl, [2, 'a\{0}', 'asoiuj', ''])
:call add(tl, [2, 'a\{2}', 'aaaa', 'aa'])
:call add(tl, [2, 'a\{2}', 'iuash fiusahfliusah fiushfilushfi uhsaifuh askfj nasfvius afg aaaa sfiuhuhiushf', 'aa'])
:call add(tl, [2, 'a\{2}', 'abcdefghijklmnopqrestuvwxyz1234567890'])
:" same thing as 'a*'
:call add(tl, [2, 'a\{0,}', 'oij sdigfusnf', ''])
:call add(tl, [2, 'a\{0,}', 'aaaaa aa', 'aaaaa'])
:call add(tl, [2, 'a\{2,}', 'sdfiougjdsafg'])
:call add(tl, [2, 'a\{2,}', 'aaaaasfoij ', 'aaaaa'])
:call add(tl, [2, 'a\{5,}', 'xxaaaaxxx '])
:call add(tl, [2, 'a\{5,}', 'xxaaaaaxxx ', 'aaaaa'])
:call add(tl, [2, 'a\{,0}', 'oidfguih iuhi hiu aaaa', ''])
:call add(tl, [2, 'a\{,5}', 'abcd', 'a'])
:call add(tl, [2, 'a\{,5}', 'aaaaaaaaaa', 'aaaaa'])
:" leading star as normal char when \{} follows
:call add(tl, [2, '^*\{4,}$', '***'])
:call add(tl, [2, '^*\{4,}$', '****', '****'])
:call add(tl, [2, '^*\{4,}$', '*****', '*****'])
:" same thing as 'a*'
:call add(tl, [2, 'a\{}', 'bbbcddiuhfcd', ''])
:call add(tl, [2, 'a\{}', 'aaaaioudfh coisf jda', 'aaaa'])
:"
:call add(tl, [2, 'a\{-0,0}', 'abcdfdoij', ''])
:" anti-greedy version of 'a?'
:call add(tl, [2, 'a\{-0,1}', 'asiubid axxxaaa', ''])
:call add(tl, [2, 'a\{-3,6}', 'aa siofuh'])
:call add(tl, [2, 'a\{-3,6}', 'aaaaa asfoij afaa', 'aaa'])
:call add(tl, [2, 'a\{-3,6}', 'aaaaaaaa', 'aaa'])
:call add(tl, [2, 'a\{-0}', 'asoiuj', ''])
:call add(tl, [2, 'a\{-2}', 'aaaa', 'aa'])
:call add(tl, [2, 'a\{-2}', 'abcdefghijklmnopqrestuvwxyz1234567890'])
:call add(tl, [2, 'a\{-0,}', 'oij sdigfusnf', ''])
:call add(tl, [2, 'a\{-0,}', 'aaaaa aa', ''])
:call add(tl, [2, 'a\{-2,}', 'sdfiougjdsafg'])
:call add(tl, [2, 'a\{-2,}', 'aaaaasfoij ', 'aa'])
:call add(tl, [2, 'a\{-,0}', 'oidfguih iuhi hiu aaaa', ''])
:call add(tl, [2, 'a\{-,5}', 'abcd', ''])
:call add(tl, [2, 'a\{-,5}', 'aaaaaaaaaa', ''])
:" anti-greedy version of 'a*'
:call add(tl, [2, 'a\{-}', 'bbbcddiuhfcd', ''])
:call add(tl, [2, 'a\{-}', 'aaaaioudfh coisf jda', ''])
:"
:" Test groups of characters and submatches
:call add(tl, [2, '\(abc\)*', 'abcabcabc', 'abcabcabc', 'abc'])
:call add(tl, [2, '\(ab\)\+', 'abababaaaaa', 'ababab', 'ab'])
:call add(tl, [2, '\(abaaaaa\)*cd', 'cd', 'cd', ''])
:call add(tl, [2, '\(test1\)\? \(test2\)\?', 'test1 test3', 'test1 ', 'test1', ''])
:call add(tl, [2, '\(test1\)\= \(test2\) \(test4443\)\=', ' test2 test4443 yupiiiiiiiiiii', ' test2 test4443', '', 'test2', 'test4443'])
:call add(tl, [2, '\(\(sub1\) hello \(sub 2\)\)', 'asterix sub1 hello sub 2 obelix', 'sub1 hello sub 2', 'sub1 hello sub 2', 'sub1', 'sub 2'])
:call add(tl, [2, '\(\(\(yyxxzz\)\)\)', 'abcdddsfiusfyyzzxxyyxxzz', 'yyxxzz', 'yyxxzz', 'yyxxzz', 'yyxxzz'])
:call add(tl, [2, '\v((ab)+|c+)+', 'abcccaba', 'abcccab', 'ab', 'ab'])
:call add(tl, [2, '\v((ab)|c*)+', 'abcccaba', 'abcccab', '', 'ab'])
:call add(tl, [2, '\v(a(c*)+b)+', 'acbababaaa', 'acbabab', 'ab', ''])
:call add(tl, [2, '\v(a|b*)+', 'aaaa', 'aaaa', ''])
:call add(tl, [2, '\p*', 'aá ', 'aá '])
:"
:" Test greedy-ness and lazy-ness
:call add(tl, [2, 'a\{-2,7}','aaaaaaaaaaaaa', 'aa'])
:call add(tl, [2, 'a\{-2,7}x','aaaaaaaaax', 'aaaaaaax'])
:call add(tl, [2, 'a\{2,7}','aaaaaaaaaaaaaaaaaaaa', 'aaaaaaa'])
:call add(tl, [2, 'a\{2,7}x','aaaaaaaaax', 'aaaaaaax'])
:call add(tl, [2, '\vx(.{-,8})yz(.*)','xayxayzxayzxayz','xayxayzxayzxayz','ayxa','xayzxayz'])
:call add(tl, [2, '\vx(.*)yz(.*)','xayxayzxayzxayz','xayxayzxayzxayz', 'ayxayzxayzxa',''])
:call add(tl, [2, '\v(a{1,2}){-2,3}','aaaaaaa','aaaa','aa'])
:call add(tl, [2, '\v(a{-1,3})+', 'aa', 'aa', 'a'])
:call add(tl, [2, '^\s\{-}\zs\( x\|x$\)', ' x', ' x', ' x'])
:call add(tl, [2, '^\s\{-}\zs\(x\| x$\)', ' x', ' x', ' x'])
:call add(tl, [2, '^\s\{-}\ze\(x\| x$\)', ' x', '', ' x'])
:call add(tl, [2, '^\(\s\{-}\)\(x\| x$\)', ' x', ' x', '', ' x'])
:"
:" Test Character classes
:call add(tl, [2, '\d\+e\d\d','test 10e23 fd','10e23'])
:"
:" Test collections and character range []
:call add(tl, [2, '\v[a]', 'abcd', 'a'])
:call add(tl, [2, 'a[bcd]', 'abcd', 'ab'])
:call add(tl, [2, 'a[b-d]', 'acbd', 'ac'])
:call add(tl, [2, '[a-d][e-f][x-x]d', 'cexdxx', 'cexd'])
:call add(tl, [2, '\v[[:alpha:]]+', 'abcdefghijklmnopqrstuvwxyz6','abcdefghijklmnopqrstuvwxyz'])
:call add(tl, [2, '[[:alpha:]\+]', '6x8','x'])
:call add(tl, [2, '[^abc]\+','abcabcabc'])
:call add(tl, [2, '[^abc]','defghiasijvoinasoiunbvb','d'])
:call add(tl, [2, '[^abc]\+','ddddddda','ddddddd'])
:call add(tl, [2, '[^a-d]\+','aaaAAAZIHFNCddd','AAAZIHFNC'])
:call add(tl, [2, '[a-f]*','iiiiiiii',''])
:call add(tl, [2, '[a-f]*','abcdefgh','abcdef'])
:call add(tl, [2, '[^a-f]\+','abcdefgh','gh'])
:call add(tl, [2, '[a-c]\{-3,6}','abcabc','abc'])
:call add(tl, [2, '[^[:alpha:]]\+','abcccadfoij7787ysf287yrnccdu','7787'])
:call add(tl, [2, '[-a]', '-', '-'])
:call add(tl, [2, '[a-]', '-', '-'])
:call add(tl, [2, '[a-f]*\c','ABCDEFGH','ABCDEF'])
:call add(tl, [2, '[abc][xyz]\c','-af-AF-BY--','BY'])
:" filename regexp
:call add(tl, [2, '[-./[:alnum:]_~]\+', 'log13.file', 'log13.file'])
:" special chars
:call add(tl, [2, '[\]\^\-\\]\+', '\^\\\-\---^', '\^\\\-\---^'])
:" collation elem
:call add(tl, [2, '[[.a.]]\+', 'aa', 'aa'])
:" middle of regexp
:call add(tl, [2, 'abc[0-9]*ddd', 'siuhabc ii'])
:call add(tl, [2, 'abc[0-9]*ddd', 'adf abc44482ddd oijs', 'abc44482ddd'])
:call add(tl, [2, '\_[0-9]\+', 'asfi9888u', '9888'])
:call add(tl, [2, '[0-9\n]\+', 'asfi9888u', '9888'])
:call add(tl, [2, '\_[0-9]\+', "asfi\n9888u", "\n9888"])
:call add(tl, [2, '\_f', " \na ", "\n"])
:call add(tl, [2, '\_f\+', " \na ", "\na"])
:call add(tl, [2, '[0-9A-Za-z-_.]\+', " @0_a.A-{ ", "0_a.A-"])
:"
:"""" Test start/end of line, start/end of file
:call add(tl, [2, '^a.', "a_\nb ", "a_"])
:call add(tl, [2, '^a.', "b a \na_"])
:call add(tl, [2, '.a$', " a\n "])
:call add(tl, [2, '.a$', " a b\n_a", "_a"])
:call add(tl, [2, '\%^a.', "a a\na", "a "])
:call add(tl, [2, '\%^a', " a \na "])
:call add(tl, [2, '.a\%$', " a\n "])
:call add(tl, [2, '.a\%$', " a\n_a", "_a"])
:"
:"""" Test recognition of character classes
:call add(tl, [2, '[0-7]\+', 'x0123456789x', '01234567'])
:call add(tl, [2, '[^0-7]\+', '0a;X+% 897', 'a;X+% 89'])
:call add(tl, [2, '[0-9]\+', 'x0123456789x', '0123456789'])
:call add(tl, [2, '[^0-9]\+', '0a;X+% 9', 'a;X+% '])
:call add(tl, [2, '[0-9a-fA-F]\+', 'x0189abcdefg', '0189abcdef'])
:call add(tl, [2, '[^0-9A-Fa-f]\+', '0189g;X+% ab', 'g;X+% '])
:call add(tl, [2, '[a-z_A-Z0-9]\+', ';+aso_SfOij ', 'aso_SfOij'])
:call add(tl, [2, '[^a-z_A-Z0-9]\+', 'aSo_;+% sfOij', ';+% '])
:call add(tl, [2, '[a-z_A-Z]\+', '0abyz_ABYZ;', 'abyz_ABYZ'])
:call add(tl, [2, '[^a-z_A-Z]\+', 'abAB_09;+% yzYZ', '09;+% '])
:call add(tl, [2, '[a-z]\+', '0abcxyz1', 'abcxyz'])
:call add(tl, [2, '[a-z]\+', 'AabxyzZ', 'abxyz'])
:call add(tl, [2, '[^a-z]\+', 'a;X09+% x', ';X09+% '])
:call add(tl, [2, '[^a-z]\+', 'abX0;%yz', 'X0;%'])
:call add(tl, [2, '[a-zA-Z]\+', '0abABxzXZ9', 'abABxzXZ'])
:call add(tl, [2, '[^a-zA-Z]\+', 'ab09_;+ XZ', '09_;+ '])
:call add(tl, [2, '[A-Z]\+', 'aABXYZz', 'ABXYZ'])
:call add(tl, [2, '[^A-Z]\+', 'ABx0;%YZ', 'x0;%'])
:call add(tl, [2, '[a-z]\+\c', '0abxyzABXYZ;', 'abxyzABXYZ'])
:call add(tl, [2, '[A-Z]\+\c', '0abABxzXZ9', 'abABxzXZ'])
:call add(tl, [2, '\c[^a-z]\+', 'ab09_;+ XZ', '09_;+ '])
:call add(tl, [2, '\c[^A-Z]\+', 'ab09_;+ XZ', '09_;+ '])
:call add(tl, [2, '\C[^A-Z]\+', 'ABCOIJDEOIFNSD jsfoij sa', ' jsfoij sa'])
:"
:"""" Tests for \z features
:" match ends at \ze
:call add(tl, [2, 'xx \ze test', 'xx '])
:call add(tl, [2, 'abc\zeend', 'oij abcend', 'abc'])
:call add(tl, [2, 'aa\zebb\|aaxx', ' aabb ', 'aa'])
:call add(tl, [2, 'aa\zebb\|aaxx', ' aaxx ', 'aaxx'])
:call add(tl, [2, 'aabb\|aa\zebb', ' aabb ', 'aabb'])
:call add(tl, [2, 'aa\zebb\|aaebb', ' aabb ', 'aa'])
:" match starts at \zs
:call add(tl, [2, 'abc\zsdd', 'ddabcddxyzt', 'dd'])
:call add(tl, [2, 'aa \zsax', ' ax'])
:call add(tl, [2, 'abc \zsmatch\ze abc', 'abc abc abc match abc abc', 'match'])
:call add(tl, [2, '\v(a \zsif .*){2}', 'a if then a if last', 'if last', 'a if last'])
:call add(tl, [2, '\>\zs.', 'aword. ', '.'])
:call add(tl, [2, '\s\+\ze\[/\|\s\zs\s\+', 'is [a t', ' '])
:"
:"""" Tests for \@= and \& features
:call add(tl, [2, 'abc\@=', 'abc', 'ab'])
:call add(tl, [2, 'abc\@=cd', 'abcd', 'abcd'])
:call add(tl, [2, 'abc\@=', 'ababc', 'ab'])
:" will never match, no matter the input text
:call add(tl, [2, 'abcd\@=e', 'abcd'])
:" will never match
:call add(tl, [2, 'abcd\@=e', 'any text in here ... '])
:call add(tl, [2, '\v(abc)@=..', 'xabcd', 'ab', 'abc'])
:call add(tl, [2, '\(.*John\)\@=.*Bob', 'here is John, and here is B'])
:call add(tl, [2, '\(John.*\)\@=.*Bob', 'John is Bobs friend', 'John is Bob', 'John is Bobs friend'])
:call add(tl, [2, '\<\S\+\())\)\@=', '$((i=i+1))', 'i=i+1', '))'])
:call add(tl, [2, '.*John\&.*Bob', 'here is John, and here is B'])
:call add(tl, [2, '.*John\&.*Bob', 'John is Bobs friend', 'John is Bob'])
:call add(tl, [2, '\v(test1)@=.*yep', 'this is a test1, yep it is', 'test1, yep', 'test1'])
:call add(tl, [2, 'foo\(bar\)\@!', 'foobar'])
:call add(tl, [2, 'foo\(bar\)\@!', 'foo bar', 'foo'])
:call add(tl, [2, 'if \(\(then\)\@!.\)*$', ' if then else'])
:call add(tl, [2, 'if \(\(then\)\@!.\)*$', ' if else ', 'if else ', ' '])
:call add(tl, [2, '\(foo\)\@!bar', 'foobar', 'bar'])
:call add(tl, [2, '\(foo\)\@!...bar', 'foobar'])
:call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' bar foo '])
:call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' foo bar '])
:call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' foo xxx ', 'foo'])
:call add(tl, [2, '[ ]\@!\p\%([ ]\@!\p\)*:', 'implicit mappings:', 'mappings:'])
:call add(tl, [2, '[ ]\@!\p\([ ]\@!\p\)*:', 'implicit mappings:', 'mappings:', 's'])
:call add(tl, [2, 'm\k\+_\@=\%(_\@!\k\)\@<=\k\+e', 'mx__xe', 'mx__xe'])
:call add(tl, [2, '\%(\U\@<=S\k*\|S\l\)R', 'SuR', 'SuR'])
:"
:"""" Combining different tests and features
:call add(tl, [2, '[[:alpha:]]\{-2,6}', '787abcdiuhsasiuhb4', 'ab'])
:call add(tl, [2, '', 'abcd', ''])
:call add(tl, [2, '\v(())', 'any possible text', ''])
:call add(tl, [2, '\v%(ab(xyz)c)', ' abxyzc ', 'abxyzc', 'xyz'])
:call add(tl, [2, '\v(test|)empty', 'tesempty', 'empty', ''])
:call add(tl, [2, '\v(a|aa)(a|aa)', 'aaa', 'aa', 'a', 'a'])
:"
:"""" \%u and friends
:call add(tl, [2, '\%d32', 'yes no', ' '])
:call add(tl, [2, '\%o40', 'yes no', ' '])
:call add(tl, [2, '\%x20', 'yes no', ' '])
:call add(tl, [2, '\%u0020', 'yes no', ' '])
:call add(tl, [2, '\%U00000020', 'yes no', ' '])
:call add(tl, [2, '\%d0', "yes\x0ano", "\x0a"])
:"
:""""" \%[abc]
:call add(tl, [2, 'foo\%[bar]', 'fobar'])
:call add(tl, [2, 'foo\%[bar]', 'foobar', 'foobar'])
:call add(tl, [2, 'foo\%[bar]', 'fooxx', 'foo'])
:call add(tl, [2, 'foo\%[bar]', 'foobxx', 'foob'])
:call add(tl, [2, 'foo\%[bar]', 'foobaxx', 'fooba'])
:call add(tl, [2, 'foo\%[bar]', 'foobarxx', 'foobar'])
:call add(tl, [2, 'foo\%[bar]x', 'foobxx', 'foobx'])
:call add(tl, [2, 'foo\%[bar]x', 'foobarxx', 'foobarx'])
:call add(tl, [2, '\%[bar]x', 'barxx', 'barx'])
:call add(tl, [2, '\%[bar]x', 'bxx', 'bx'])
:call add(tl, [2, '\%[bar]x', 'xxx', 'x'])
:call add(tl, [2, 'b\%[[ao]r]', 'bar bor', 'bar'])
:call add(tl, [2, 'b\%[[]]r]', 'b]r bor', 'b]r'])
:call add(tl, [2, '@\%[\w\-]*', '<http://john.net/pandoc/>[@pandoc]', '@pandoc'])
:"
:"""" Alternatives, must use first longest match
:call add(tl, [2, 'goo\|go', 'google', 'goo'])
:call add(tl, [2, '\<goo\|\<go', 'google', 'goo'])
:call add(tl, [2, '\<goo\|go', 'google', 'goo'])
:"
:"""" Back references
:call add(tl, [2, '\(\i\+\) \1', ' abc abc', 'abc abc', 'abc'])
:call add(tl, [2, '\(\i\+\) \1', 'xgoo goox', 'goo goo', 'goo'])
:call add(tl, [2, '\(a\)\(b\)\(c\)\(dd\)\(e\)\(f\)\(g\)\(h\)\(i\)\1\2\3\4\5\6\7\8\9', 'xabcddefghiabcddefghix', 'abcddefghiabcddefghi', 'a', 'b', 'c', 'dd', 'e', 'f', 'g', 'h', 'i'])
:call add(tl, [2, '\(\d*\)a \1b', ' a b ', 'a b', ''])
:call add(tl, [2, '^.\(.\).\_..\1.', "aaa\naaa\nb", "aaa\naaa", 'a'])
:call add(tl, [2, '^.*\.\(.*\)/.\+\(\1\)\@<!$', 'foo.bat/foo.com', 'foo.bat/foo.com', 'bat'])
:call add(tl, [2, '^.*\.\(.*\)/.\+\(\1\)\@<!$', 'foo.bat/foo.bat'])
:call add(tl, [2, '^.*\.\(.*\)/.\+\(\1\)\@<=$', 'foo.bat/foo.bat', 'foo.bat/foo.bat', 'bat', 'bat'])
:call add(tl, [2, '\\\@<!\${\(\d\+\%(:.\{-}\)\?\\\@<!\)}', '2013-06-27${0}', '${0}', '0'])
:call add(tl, [2, '^\(a*\)\1$', 'aaaaaaaa', 'aaaaaaaa', 'aaaa'])
:call add(tl, [2, '^\(a\{-2,}\)\1\+$', 'aaaaaaaaa', 'aaaaaaaaa', 'aaa'])
:"
:"""" Look-behind with limit
:call add(tl, [2, '<\@<=span.', 'xxspanxx<spanyyy', 'spany'])
:call add(tl, [2, '<\@1<=span.', 'xxspanxx<spanyyy', 'spany'])
:call add(tl, [2, '<\@2<=span.', 'xxspanxx<spanyyy', 'spany'])
:call add(tl, [2, '\(<<\)\@<=span.', 'xxspanxxxx<spanxx<<spanyyy', 'spany', '<<'])
:call add(tl, [2, '\(<<\)\@1<=span.', 'xxspanxxxx<spanxx<<spanyyy'])
:call add(tl, [2, '\(<<\)\@2<=span.', 'xxspanxxxx<spanxx<<spanyyy', 'spany', '<<'])
:call add(tl, [2, '\(foo\)\@<!bar.', 'xx foobar1 xbar2 xx', 'bar2'])
:"
:" look-behind match in front of a zero-width item
:call add(tl, [2, '\v\C%(<Last Changed:\s+)@<=.*$', '" test header'])
:call add(tl, [2, '\v\C%(<Last Changed:\s+)@<=.*$', '" Last Changed: 1970', '1970'])
:call add(tl, [2, '\(foo\)\@<=\>', 'foobar'])
:call add(tl, [2, '\(foo\)\@<=\>', 'barfoo', '', 'foo'])
:call add(tl, [2, '\(foo\)\@<=.*', 'foobar', 'bar', 'foo'])
:"
:" complicated look-behind match
:call add(tl, [2, '\(r\@<=\|\w\@<!\)\/', 'x = /word/;', '/'])
:call add(tl, [2, '^[a-z]\+\ze \&\(asdf\)\@<!', 'foo bar', 'foo'])
:"
:""""" \@>
:call add(tl, [2, '\(a*\)\@>a', 'aaaa'])
:call add(tl, [2, '\(a*\)\@>b', 'aaab', 'aaab', 'aaa'])
:call add(tl, [2, '^\(.\{-}b\)\@>.', ' abcbd', ' abc', ' ab'])
:call add(tl, [2, '\(.\{-}\)\(\)\@>$', 'abc', 'abc', 'abc', ''])
:" TODO: BT engine does not restore submatch after failure
:call add(tl, [1, '\(a*\)\@>a\|a\+', 'aaaa', 'aaaa'])
:"
:"""" "\_" prepended negated collection matches EOL
:call add(tl, [2, '\_[^8-9]\+', "asfi\n9888", "asfi\n"])
:call add(tl, [2, '\_[^a]\+', "asfi\n9888", "sfi\n9888"])
:"
:"""" Requiring lots of states.
:call add(tl, [2, '[0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12}', " 12345678-1234-1234-1234-123456789012 ", "12345678-1234-1234-1234-123456789012", "1234-"])
:"
:"""" Skip adding state twice
:call add(tl, [2, '^\%(\%(^\s*#\s*if\>\|#\s*if\)\)\(\%>1c.*$\)\@=', "#if FOO", "#if", ' FOO'])
:"
:""" Test \%V atom
:call add(tl, [2, '\%>70vGesamt', 'Jean-Michel Charlier & Victor Hubinon\Gesamtausgabe [Salleck] Buck Danny {Jean-Michel Charlier & Victor Hubinon}\Gesamtausgabe', 'Gesamt'])
:"
:"""" Run the tests
:"
:for t in tl
: let re = t[0]
: let pat = t[1]
: let text = t[2]
: let matchidx = 3
: for engine in [0, 1, 2]
: if engine == 2 && re == 0 || engine == 1 && re == 1
: continue
: endif
: let &regexpengine = engine
: try
: let l = matchlist(text, pat)
: catch
: $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", caused an exception: \"' . v:exception . '\"'
: endtry
:" check the match itself
: if len(l) == 0 && len(t) > matchidx
: $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", did not match, expected: \"' . t[matchidx] . '\"'
: elseif len(l) > 0 && len(t) == matchidx
: $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected no match'
: elseif len(t) > matchidx && l[0] != t[matchidx]
: $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected: \"' . t[matchidx] . '\"'
: else
: $put ='OK ' . engine . ' - ' . pat
: endif
: if len(l) > 0
:" check all the nine submatches
: for i in range(1, 9)
: if len(t) <= matchidx + i
: let e = ''
: else
: let e = t[matchidx + i]
: endif
: if l[i] != e
: $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"'
: endif
: endfor
: unlet i
: endif
: endfor
:endfor
:unlet t tl e l
:"
:"""""" multi-line tests """"""""""""""""""""
:let tl = []
:"
:"""" back references
:call add(tl, [2, '^.\(.\).\_..\1.', ['aaa', 'aaa', 'b'], ['XX', 'b']])
:call add(tl, [2, '\v.*\/(.*)\n.*\/\1$', ['./Dir1/Dir2/zyxwvuts.txt', './Dir1/Dir2/abcdefgh.bat', '', './Dir1/Dir2/file1.txt', './OtherDir1/OtherDir2/file1.txt'], ['./Dir1/Dir2/zyxwvuts.txt', './Dir1/Dir2/abcdefgh.bat', '', 'XX']])
:"
:"""" line breaks
:call add(tl, [2, '\S.*\nx', ['abc', 'def', 'ghi', 'xjk', 'lmn'], ['abc', 'def', 'XXjk', 'lmn']])
:"
:" Check that \_[0-9] matching EOL does not break a following \>
:call add(tl, [2, '\<\(\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\.\)\{3\}\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\>', ['', 'localnet/192.168.0.1', ''], ['', 'localnet/XX', '']])
:"
:" Check a pattern with a line break and ^ and $
:call add(tl, [2, 'a\n^b$\n^c', ['a', 'b', 'c'], ['XX']])
:"
:call add(tl, [2, '\(^.\+\n\)\1', [' dog', ' dog', 'asdf'], ['XXasdf']])
:"
:"""" Run the multi-line tests
:"
:$put ='multi-line tests'
:for t in tl
: let re = t[0]
: let pat = t[1]
: let before = t[2]
: let after = t[3]
: for engine in [0, 1, 2]
: if engine == 2 && re == 0 || engine == 1 && re ==1
: continue
: endif
: let &regexpengine = engine
: new
: call setline(1, before)
: exe '%s/' . pat . '/XX/'
: let result = getline(1, '$')
: q!
: if result != after
: $put ='ERROR: pat: \"' . pat . '\", text: \"' . string(before) . '\", expected: \"' . string(after) . '\", got: \"' . string(result) . '\"'
: else
: $put ='OK ' . engine . ' - ' . pat
: endif
: endfor
:endfor
:unlet t tl
:"
:" Check that using a pattern on two lines doesn't get messed up by using
:" matchstr() with \ze in between.
:set re=0
/^Substitute here
:.+1,.+2s/""/\='"'.matchstr(getline("."), '\d\+\ze<').'"'
/^Substitute here
:.+1,.+2yank
Gop:"
:"
:" Check a pattern with a look beind crossing a line boundary
/^Behind:
/\(<\_[xy]\+\)\@3<=start
:.yank
Gop:"
:"
:" Check matching Visual area
/^Visual:
jfxvfx:s/\%Ve/E/g
jV:s/\%Va/A/g
jfxfxj:s/\%Vo/O/g
:/^Visual/+1,/^Visual/+4yank
Gop:"
:"
:" Check matching marks
/^Marks:
jfSmsfEme:.-4,.+6s/.\%>'s.*\%<'e../here/
jfSmsj0fEme:.-4,.+6s/.\%>'s\_.*\%<'e../again/
:/^Marks:/+1,/^Marks:/+3yank
Gop:"
:"
:" Check patterns matching cursor position.
:func! Postest()
new
call setline(1, ['ffooooo', 'boboooo', 'zoooooo', 'koooooo', 'moooooo', "\t\t\tfoo", 'abababababababfoo', 'bababababababafoo', '********_', ' xxxxxxxxxxxx xxxx xxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxx xxxxx xxxxxxx xx xxxx xxxxxxxx xxxx xxxxxxxxxxx xxx xxxxxxx xxxxxxxxx xx xxxxxx xx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx xxx xxxxxxxx xxxxxxxxx xxxx xxx xxxx xxx xxx xxxxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxxxx xx xxxxx xxx xxxxxxxx xxxxxx xxx xxx xxxxxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxxx xxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxx xxxxxxxx xxxxxxx xxxx xxx xxxxxx xxxxx xxxxx xx xxxxxx xxxxxxx xxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxx xxxxxx xxxxx xxx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxxx xxxx xx xxxxxxxx xxx xxxxxxxxxxx xxxxx'])
call setpos('.', [0, 1, 0, 0])
s/\%>3c.//g
call setpos('.', [0, 2, 4, 0])
s/\%#.*$//g
call setpos('.', [0, 3, 0, 0])
s/\%<3c./_/g
%s/\%4l\%>5c./_/g
%s/\%6l\%>25v./_/g
%s/\%>6l\%3c./!/g
%s/\%>7l\%12c./?/g
%s/\%>7l\%<9l\%>5v\%<8v./#/g
$s/\%(|\u.*\)\@<=[^|\t]\+$//ge
1,$yank
quit!
endfunc
Go-0-:set re=0
:call Postest()
:put
o-1-:set re=1
:call Postest()
:put
o-2-:set re=2
:call Postest()
:put
:"
:" start and end of buffer
/\%^
yeGop:"
50%/\%^..
yeGopA END:"
50%/\%$
"ayb20gg/..\%$
"bybGo"apo"bp:"
:"
:" Check for detecting error
:set regexpengine=2
:for pat in [' \ze*', ' \zs*']
: try
: let l = matchlist('x x', pat)
: $put ='E888 NOT detected for ' . pat
: catch
: $put ='E888 detected for ' . pat
: endtry
:endfor
:"
:""""" Write the results """""""""""""
:/\%#=1^Results/,$wq! test.out
ENDTEST
Substitute here:
<T="">Ta 5</Title>
<T="">Ac 7</Title>
Behind:
asdfasd<yyy
xxstart1
asdfasd<yy
xxxstart2
asdfasd<yy
xxstart3
Visual:
thexe the thexethe
andaxand andaxand
oooxofor foroxooo
oooxofor foroxooo
Marks:
asdfSasdfsadfEasdf
asdfSas
dfsadfEasdf
Results of test64:

1107
src/nvim/testdir/test64.ok
View File

File diff suppressed because it is too large Load Diff

25
src/nvim/testdir/test_fold.vim
View File

@ -769,3 +769,28 @@ func Test_fold_delete_with_marker_and_whichwrap()
set fdm& ww&
bwipe!
endfunc
func Test_fold_delete_first_line()
new
call setline(1, [
\ '" x {{{1',
\ '" a',
\ '" aa',
\ '" x {{{1',
\ '" b',
\ '" bb',
\ '" x {{{1',
\ '" c',
\ '" cc',
\ ])
set foldmethod=marker
1
normal dj
call assert_equal([
\ '" x {{{1',
\ '" c',
\ '" cc',
\ ], getline(1,'$'))
bwipe!
set foldmethod&
endfunc

668
src/nvim/testdir/test_regexp_latin.vim
View File

@ -3,7 +3,7 @@ set encoding=latin1
scriptencoding latin1
func s:equivalence_test()
let str = "AÀÁÂÃÄÅ B C D EÈÉÊË F G H IÌÍÎÏ J K L M NÑ OÒÓÔÕÖØ P Q R S T UÙÚÛÜ V W X YÝ Z aàáâãäå b c d eèéêë f g h iìíîï j k l m nñ oòóôõöø p q r s t uùúûü v w x yýÿ z"
let str = "AÀÁÂÃÄÅ B C D EÈÉÊË F G H IÌÍÎÏ J K L M NÑ OÒÓÔÕÖØ P Q R S T UÙÚÛÜ V W X YÝ Z aàáâãäå b c d eèéêë f g h iìíîï j k l m nñ oòóôõöø p q r s t uùúûü v w x yýÿ z"
let groups = split(str)
for group1 in groups
for c in split(group1, '\zs')
@ -98,3 +98,669 @@ func Test_out_of_memory()
" This will be slow...
call assert_fails('call search("\\v((n||<)+);")', 'E363:')
endfunc
" Tests for regexp patterns without multi-byte support.
func Test_regexp_single_line_pat()
" tl is a List of Lists with:
" regexp engine
" regexp pattern
" text to test the pattern on
" expected match (optional)
" expected submatch 1 (optional)
" expected submatch 2 (optional)
" etc.
" When there is no match use only the first two items.
let tl = []
call add(tl, [2, 'ab', 'aab', 'ab'])
call add(tl, [2, 'b', 'abcdef', 'b'])
call add(tl, [2, 'bc*', 'abccccdef', 'bcccc'])
call add(tl, [2, 'bc\{-}', 'abccccdef', 'b'])
call add(tl, [2, 'bc\{-}\(d\)', 'abccccdef', 'bccccd', 'd'])
call add(tl, [2, 'bc*', 'abbdef', 'b'])
call add(tl, [2, 'c*', 'ccc', 'ccc'])
call add(tl, [2, 'bc*', 'abdef', 'b'])
call add(tl, [2, 'c*', 'abdef', ''])
call add(tl, [2, 'bc\+', 'abccccdef', 'bcccc'])
call add(tl, [2, 'bc\+', 'abdef']) " no match
" operator \|
call add(tl, [2, 'a\|ab', 'cabd', 'a']) " alternation is ordered
call add(tl, [2, 'c\?', 'ccb', 'c'])
call add(tl, [2, 'bc\?', 'abd', 'b'])
call add(tl, [2, 'bc\?', 'abccd', 'bc'])
call add(tl, [2, '\va{1}', 'ab', 'a'])
call add(tl, [2, '\va{2}', 'aa', 'aa'])
call add(tl, [2, '\va{2}', 'caad', 'aa'])
call add(tl, [2, '\va{2}', 'aba'])
call add(tl, [2, '\va{2}', 'ab'])
call add(tl, [2, '\va{2}', 'abaa', 'aa'])
call add(tl, [2, '\va{2}', 'aaa', 'aa'])
call add(tl, [2, '\vb{1}', 'abca', 'b'])
call add(tl, [2, '\vba{2}', 'abaa', 'baa'])
call add(tl, [2, '\vba{3}', 'aabaac'])
call add(tl, [2, '\v(ab){1}', 'ab', 'ab', 'ab'])
call add(tl, [2, '\v(ab){1}', 'dabc', 'ab', 'ab'])
call add(tl, [2, '\v(ab){1}', 'acb'])
call add(tl, [2, '\v(ab){0,2}', 'acb', "", ""])
call add(tl, [2, '\v(ab){0,2}', 'ab', 'ab', 'ab'])
call add(tl, [2, '\v(ab){1,2}', 'ab', 'ab', 'ab'])
call add(tl, [2, '\v(ab){1,2}', 'ababc', 'abab', 'ab'])
call add(tl, [2, '\v(ab){2,4}', 'ababcab', 'abab', 'ab'])
call add(tl, [2, '\v(ab){2,4}', 'abcababa', 'abab', 'ab'])
call add(tl, [2, '\v(ab){2}', 'abab', 'abab', 'ab'])
call add(tl, [2, '\v(ab){2}', 'cdababe', 'abab', 'ab'])
call add(tl, [2, '\v(ab){2}', 'abac'])
call add(tl, [2, '\v(ab){2}', 'abacabab', 'abab', 'ab'])
call add(tl, [2, '\v((ab){2}){2}', 'abababab', 'abababab', 'abab', 'ab'])
call add(tl, [2, '\v((ab){2}){2}', 'abacabababab', 'abababab', 'abab', 'ab'])
call add(tl, [2, '\v(a{1}){1}', 'a', 'a', 'a'])
call add(tl, [2, '\v(a{2}){1}', 'aa', 'aa', 'aa'])
call add(tl, [2, '\v(a{2}){1}', 'aaac', 'aa', 'aa'])
call add(tl, [2, '\v(a{2}){1}', 'daaac', 'aa', 'aa'])
call add(tl, [2, '\v(a{1}){2}', 'daaac', 'aa', 'a'])
call add(tl, [2, '\v(a{1}){2}', 'aaa', 'aa', 'a'])
call add(tl, [2, '\v(a{2})+', 'adaac', 'aa', 'aa'])
call add(tl, [2, '\v(a{2})+', 'aa', 'aa', 'aa'])
call add(tl, [2, '\v(a{2}){1}', 'aa', 'aa', 'aa'])
call add(tl, [2, '\v(a{1}){2}', 'aa', 'aa', 'a'])
call add(tl, [2, '\v(a{1}){1}', 'a', 'a', 'a'])
call add(tl, [2, '\v(a{2}){2}', 'aaaa', 'aaaa', 'aa'])
call add(tl, [2, '\v(a{2}){2}', 'aaabaaaa', 'aaaa', 'aa'])
call add(tl, [2, '\v(a+){2}', 'dadaac', 'aa', 'a'])
call add(tl, [2, '\v(a{3}){2}', 'aaaaaaa', 'aaaaaa', 'aaa'])
call add(tl, [2, '\v(a{1,2}){2}', 'daaac', 'aaa', 'a'])
call add(tl, [2, '\v(a{1,3}){2}', 'daaaac', 'aaaa', 'a'])
call add(tl, [2, '\v(a{1,3}){2}', 'daaaaac', 'aaaaa', 'aa'])
call add(tl, [2, '\v(a{1,3}){3}', 'daac'])
call add(tl, [2, '\v(a{1,2}){2}', 'dac'])
call add(tl, [2, '\v(a+)+', 'daac', 'aa', 'aa'])
call add(tl, [2, '\v(a+)+', 'aaa', 'aaa', 'aaa'])
call add(tl, [2, '\v(a+){1,2}', 'aaa', 'aaa', 'aaa'])
call add(tl, [2, '\v(a+)(a+)', 'aaa', 'aaa', 'aa', 'a'])
call add(tl, [2, '\v(a{3})+', 'daaaac', 'aaa', 'aaa'])
call add(tl, [2, '\v(a|b|c)+', 'aacb', 'aacb', 'b'])
call add(tl, [2, '\v(a|b|c){2}', 'abcb', 'ab', 'b'])
call add(tl, [2, '\v(abc){2}', 'abcabd', ])
call add(tl, [2, '\v(abc){2}', 'abdabcabc','abcabc', 'abc'])
call add(tl, [2, 'a*', 'cc', ''])
call add(tl, [2, '\v(a*)+', 'cc', ''])
call add(tl, [2, '\v((ab)+)+', 'ab', 'ab', 'ab', 'ab'])
call add(tl, [2, '\v(((ab)+)+)+', 'ab', 'ab', 'ab', 'ab', 'ab'])
call add(tl, [2, '\v(((ab)+)+)+', 'dababc', 'abab', 'abab', 'abab', 'ab'])
call add(tl, [2, '\v(a{0,2})+', 'cc', ''])
call add(tl, [2, '\v(a*)+', '', ''])
call add(tl, [2, '\v((a*)+)+', '', ''])
call add(tl, [2, '\v((ab)*)+', '', ''])
call add(tl, [2, '\va{1,3}', 'aab', 'aa'])
call add(tl, [2, '\va{2,3}', 'abaa', 'aa'])
call add(tl, [2, '\v((ab)+|c*)+', 'abcccaba', 'abcccab', '', 'ab'])
call add(tl, [2, '\v(a{2})|(b{3})', 'bbabbbb', 'bbb', '', 'bbb'])
call add(tl, [2, '\va{2}|b{2}', 'abab'])
call add(tl, [2, '\v(a)+|(c)+', 'bbacbaacbbb', 'a', 'a'])
call add(tl, [2, '\vab{2,3}c', 'aabbccccccccccccc', 'abbc'])
call add(tl, [2, '\vab{2,3}c', 'aabbbccccccccccccc', 'abbbc'])
call add(tl, [2, '\vab{2,3}cd{2,3}e', 'aabbbcddee', 'abbbcdde'])
call add(tl, [2, '\va(bc){2}d', 'aabcbfbc' ])
call add(tl, [2, '\va*a{2}', 'a', ])
call add(tl, [2, '\va*a{2}', 'aa', 'aa' ])
call add(tl, [2, '\va*a{2}', 'aaa', 'aaa' ])
call add(tl, [2, '\va*a{2}', 'bbbabcc', ])
call add(tl, [2, '\va*b*|a*c*', 'a', 'a'])
call add(tl, [2, '\va{1}b{1}|a{1}b{1}', ''])
" submatches
call add(tl, [2, '\v(a)', 'ab', 'a', 'a'])
call add(tl, [2, '\v(a)(b)', 'ab', 'ab', 'a', 'b'])
call add(tl, [2, '\v(ab)(b)(c)', 'abbc', 'abbc', 'ab', 'b', 'c'])
call add(tl, [2, '\v((a)(b))', 'ab', 'ab', 'ab', 'a', 'b'])
call add(tl, [2, '\v(a)|(b)', 'ab', 'a', 'a'])
call add(tl, [2, '\v(a*)+', 'aaaa', 'aaaa', ''])
call add(tl, [2, 'x', 'abcdef'])
"
" Simple tests
"
" Search single groups
call add(tl, [2, 'ab', 'aab', 'ab'])
call add(tl, [2, 'ab', 'baced'])
call add(tl, [2, 'ab', ' ab ', 'ab'])
" Search multi-modifiers
call add(tl, [2, 'x*', 'xcd', 'x'])
call add(tl, [2, 'x*', 'xxxxxxxxxxxxxxxxsofijiojgf', 'xxxxxxxxxxxxxxxx'])
" empty match is good
call add(tl, [2, 'x*', 'abcdoij', ''])
" no match here
call add(tl, [2, 'x\+', 'abcdoin'])
call add(tl, [2, 'x\+', 'abcdeoijdfxxiuhfij', 'xx'])
call add(tl, [2, 'x\+', 'xxxxx', 'xxxxx'])
call add(tl, [2, 'x\+', 'abc x siufhiush xxxxxxxxx', 'x'])
call add(tl, [2, 'x\=', 'x sdfoij', 'x'])
call add(tl, [2, 'x\=', 'abc sfoij', '']) " empty match is good
call add(tl, [2, 'x\=', 'xxxxxxxxx c', 'x'])
call add(tl, [2, 'x\?', 'x sdfoij', 'x'])
" empty match is good
call add(tl, [2, 'x\?', 'abc sfoij', ''])
call add(tl, [2, 'x\?', 'xxxxxxxxxx c', 'x'])
call add(tl, [2, 'a\{0,0}', 'abcdfdoij', ''])
" same thing as 'a?'
call add(tl, [2, 'a\{0,1}', 'asiubid axxxaaa', 'a'])
" same thing as 'a\{0,1}'
call add(tl, [2, 'a\{1,0}', 'asiubid axxxaaa', 'a'])
call add(tl, [2, 'a\{3,6}', 'aa siofuh'])
call add(tl, [2, 'a\{3,6}', 'aaaaa asfoij afaa', 'aaaaa'])
call add(tl, [2, 'a\{3,6}', 'aaaaaaaa', 'aaaaaa'])
call add(tl, [2, 'a\{0}', 'asoiuj', ''])
call add(tl, [2, 'a\{2}', 'aaaa', 'aa'])
call add(tl, [2, 'a\{2}', 'iuash fiusahfliusah fiushfilushfi uhsaifuh askfj nasfvius afg aaaa sfiuhuhiushf', 'aa'])
call add(tl, [2, 'a\{2}', 'abcdefghijklmnopqrestuvwxyz1234567890'])
" same thing as 'a*'
call add(tl, [2, 'a\{0,}', 'oij sdigfusnf', ''])
call add(tl, [2, 'a\{0,}', 'aaaaa aa', 'aaaaa'])
call add(tl, [2, 'a\{2,}', 'sdfiougjdsafg'])
call add(tl, [2, 'a\{2,}', 'aaaaasfoij ', 'aaaaa'])
call add(tl, [2, 'a\{5,}', 'xxaaaaxxx '])
call add(tl, [2, 'a\{5,}', 'xxaaaaaxxx ', 'aaaaa'])
call add(tl, [2, 'a\{,0}', 'oidfguih iuhi hiu aaaa', ''])
call add(tl, [2, 'a\{,5}', 'abcd', 'a'])
call add(tl, [2, 'a\{,5}', 'aaaaaaaaaa', 'aaaaa'])
" leading star as normal char when \{} follows
call add(tl, [2, '^*\{4,}$', '***'])
call add(tl, [2, '^*\{4,}$', '****', '****'])
call add(tl, [2, '^*\{4,}$', '*****', '*****'])
" same thing as 'a*'
call add(tl, [2, 'a\{}', 'bbbcddiuhfcd', ''])
call add(tl, [2, 'a\{}', 'aaaaioudfh coisf jda', 'aaaa'])
call add(tl, [2, 'a\{-0,0}', 'abcdfdoij', ''])
" anti-greedy version of 'a?'
call add(tl, [2, 'a\{-0,1}', 'asiubid axxxaaa', ''])
call add(tl, [2, 'a\{-3,6}', 'aa siofuh'])
call add(tl, [2, 'a\{-3,6}', 'aaaaa asfoij afaa', 'aaa'])
call add(tl, [2, 'a\{-3,6}', 'aaaaaaaa', 'aaa'])
call add(tl, [2, 'a\{-0}', 'asoiuj', ''])
call add(tl, [2, 'a\{-2}', 'aaaa', 'aa'])
call add(tl, [2, 'a\{-2}', 'abcdefghijklmnopqrestuvwxyz1234567890'])
call add(tl, [2, 'a\{-0,}', 'oij sdigfusnf', ''])
call add(tl, [2, 'a\{-0,}', 'aaaaa aa', ''])
call add(tl, [2, 'a\{-2,}', 'sdfiougjdsafg'])
call add(tl, [2, 'a\{-2,}', 'aaaaasfoij ', 'aa'])
call add(tl, [2, 'a\{-,0}', 'oidfguih iuhi hiu aaaa', ''])
call add(tl, [2, 'a\{-,5}', 'abcd', ''])
call add(tl, [2, 'a\{-,5}', 'aaaaaaaaaa', ''])
" anti-greedy version of 'a*'
call add(tl, [2, 'a\{-}', 'bbbcddiuhfcd', ''])
call add(tl, [2, 'a\{-}', 'aaaaioudfh coisf jda', ''])
" Test groups of characters and submatches
call add(tl, [2, '\(abc\)*', 'abcabcabc', 'abcabcabc', 'abc'])
call add(tl, [2, '\(ab\)\+', 'abababaaaaa', 'ababab', 'ab'])
call add(tl, [2, '\(abaaaaa\)*cd', 'cd', 'cd', ''])
call add(tl, [2, '\(test1\)\? \(test2\)\?', 'test1 test3', 'test1 ', 'test1', ''])
call add(tl, [2, '\(test1\)\= \(test2\) \(test4443\)\=', ' test2 test4443 yupiiiiiiiiiii', ' test2 test4443', '', 'test2', 'test4443'])
call add(tl, [2, '\(\(sub1\) hello \(sub 2\)\)', 'asterix sub1 hello sub 2 obelix', 'sub1 hello sub 2', 'sub1 hello sub 2', 'sub1', 'sub 2'])
call add(tl, [2, '\(\(\(yyxxzz\)\)\)', 'abcdddsfiusfyyzzxxyyxxzz', 'yyxxzz', 'yyxxzz', 'yyxxzz', 'yyxxzz'])
call add(tl, [2, '\v((ab)+|c+)+', 'abcccaba', 'abcccab', 'ab', 'ab'])
call add(tl, [2, '\v((ab)|c*)+', 'abcccaba', 'abcccab', '', 'ab'])
call add(tl, [2, '\v(a(c*)+b)+', 'acbababaaa', 'acbabab', 'ab', ''])
call add(tl, [2, '\v(a|b*)+', 'aaaa', 'aaaa', ''])
call add(tl, [2, '\p*', 'aá ', 'aá '])
" Test greedy-ness and lazy-ness
call add(tl, [2, 'a\{-2,7}','aaaaaaaaaaaaa', 'aa'])
call add(tl, [2, 'a\{-2,7}x','aaaaaaaaax', 'aaaaaaax'])
call add(tl, [2, 'a\{2,7}','aaaaaaaaaaaaaaaaaaaa', 'aaaaaaa'])
call add(tl, [2, 'a\{2,7}x','aaaaaaaaax', 'aaaaaaax'])
call add(tl, [2, '\vx(.{-,8})yz(.*)','xayxayzxayzxayz','xayxayzxayzxayz','ayxa','xayzxayz'])
call add(tl, [2, '\vx(.*)yz(.*)','xayxayzxayzxayz','xayxayzxayzxayz', 'ayxayzxayzxa',''])
call add(tl, [2, '\v(a{1,2}){-2,3}','aaaaaaa','aaaa','aa'])
call add(tl, [2, '\v(a{-1,3})+', 'aa', 'aa', 'a'])
call add(tl, [2, '^\s\{-}\zs\( x\|x$\)', ' x', ' x', ' x'])
call add(tl, [2, '^\s\{-}\zs\(x\| x$\)', ' x', ' x', ' x'])
call add(tl, [2, '^\s\{-}\ze\(x\| x$\)', ' x', '', ' x'])
call add(tl, [2, '^\(\s\{-}\)\(x\| x$\)', ' x', ' x', '', ' x'])
" Test Character classes
call add(tl, [2, '\d\+e\d\d','test 10e23 fd','10e23'])
" Test collections and character range []
call add(tl, [2, '\v[a]', 'abcd', 'a'])
call add(tl, [2, 'a[bcd]', 'abcd', 'ab'])
call add(tl, [2, 'a[b-d]', 'acbd', 'ac'])
call add(tl, [2, '[a-d][e-f][x-x]d', 'cexdxx', 'cexd'])
call add(tl, [2, '\v[[:alpha:]]+', 'abcdefghijklmnopqrstuvwxyz6','abcdefghijklmnopqrstuvwxyz'])
call add(tl, [2, '[[:alpha:]\+]', '6x8','x'])
call add(tl, [2, '[^abc]\+','abcabcabc'])
call add(tl, [2, '[^abc]','defghiasijvoinasoiunbvb','d'])
call add(tl, [2, '[^abc]\+','ddddddda','ddddddd'])
call add(tl, [2, '[^a-d]\+','aaaAAAZIHFNCddd','AAAZIHFNC'])
call add(tl, [2, '[a-f]*','iiiiiiii',''])
call add(tl, [2, '[a-f]*','abcdefgh','abcdef'])
call add(tl, [2, '[^a-f]\+','abcdefgh','gh'])
call add(tl, [2, '[a-c]\{-3,6}','abcabc','abc'])
call add(tl, [2, '[^[:alpha:]]\+','abcccadfoij7787ysf287yrnccdu','7787'])
call add(tl, [2, '[-a]', '-', '-'])
call add(tl, [2, '[a-]', '-', '-'])
call add(tl, [2, '[a-f]*\c','ABCDEFGH','ABCDEF'])
call add(tl, [2, '[abc][xyz]\c','-af-AF-BY--','BY'])
" filename regexp
call add(tl, [2, '[-./[:alnum:]_~]\+', 'log13.file', 'log13.file'])
" special chars
call add(tl, [2, '[\]\^\-\\]\+', '\^\\\-\---^', '\^\\\-\---^'])
" collation elem
call add(tl, [2, '[[.a.]]\+', 'aa', 'aa'])
" middle of regexp
call add(tl, [2, 'abc[0-9]*ddd', 'siuhabc ii'])
call add(tl, [2, 'abc[0-9]*ddd', 'adf abc44482ddd oijs', 'abc44482ddd'])
call add(tl, [2, '\_[0-9]\+', 'asfi9888u', '9888'])
call add(tl, [2, '[0-9\n]\+', 'asfi9888u', '9888'])
call add(tl, [2, '\_[0-9]\+', "asfi\n9888u", "\n9888"])
call add(tl, [2, '\_f', " \na ", "\n"])
call add(tl, [2, '\_f\+', " \na ", "\na"])
call add(tl, [2, '[0-9A-Za-z-_.]\+', " @0_a.A-{ ", "0_a.A-"])
" Test start/end of line, start/end of file
call add(tl, [2, '^a.', "a_\nb ", "a_"])
call add(tl, [2, '^a.', "b a \na_"])
call add(tl, [2, '.a$', " a\n "])
call add(tl, [2, '.a$', " a b\n_a", "_a"])
call add(tl, [2, '\%^a.', "a a\na", "a "])
call add(tl, [2, '\%^a', " a \na "])
call add(tl, [2, '.a\%$', " a\n "])
call add(tl, [2, '.a\%$', " a\n_a", "_a"])
" Test recognition of character classes
call add(tl, [2, '[0-7]\+', 'x0123456789x', '01234567'])
call add(tl, [2, '[^0-7]\+', '0a;X+% 897', 'a;X+% 89'])
call add(tl, [2, '[0-9]\+', 'x0123456789x', '0123456789'])
call add(tl, [2, '[^0-9]\+', '0a;X+% 9', 'a;X+% '])
call add(tl, [2, '[0-9a-fA-F]\+', 'x0189abcdefg', '0189abcdef'])
call add(tl, [2, '[^0-9A-Fa-f]\+', '0189g;X+% ab', 'g;X+% '])
call add(tl, [2, '[a-z_A-Z0-9]\+', ';+aso_SfOij ', 'aso_SfOij'])
call add(tl, [2, '[^a-z_A-Z0-9]\+', 'aSo_;+% sfOij', ';+% '])
call add(tl, [2, '[a-z_A-Z]\+', '0abyz_ABYZ;', 'abyz_ABYZ'])
call add(tl, [2, '[^a-z_A-Z]\+', 'abAB_09;+% yzYZ', '09;+% '])
call add(tl, [2, '[a-z]\+', '0abcxyz1', 'abcxyz'])
call add(tl, [2, '[a-z]\+', 'AabxyzZ', 'abxyz'])
call add(tl, [2, '[^a-z]\+', 'a;X09+% x', ';X09+% '])
call add(tl, [2, '[^a-z]\+', 'abX0;%yz', 'X0;%'])
call add(tl, [2, '[a-zA-Z]\+', '0abABxzXZ9', 'abABxzXZ'])
call add(tl, [2, '[^a-zA-Z]\+', 'ab09_;+ XZ', '09_;+ '])
call add(tl, [2, '[A-Z]\+', 'aABXYZz', 'ABXYZ'])
call add(tl, [2, '[^A-Z]\+', 'ABx0;%YZ', 'x0;%'])
call add(tl, [2, '[a-z]\+\c', '0abxyzABXYZ;', 'abxyzABXYZ'])
call add(tl, [2, '[A-Z]\+\c', '0abABxzXZ9', 'abABxzXZ'])
call add(tl, [2, '\c[^a-z]\+', 'ab09_;+ XZ', '09_;+ '])
call add(tl, [2, '\c[^A-Z]\+', 'ab09_;+ XZ', '09_;+ '])
call add(tl, [2, '\C[^A-Z]\+', 'ABCOIJDEOIFNSD jsfoij sa', ' jsfoij sa'])
" Tests for \z features
" match ends at \ze
call add(tl, [2, 'xx \ze test', 'xx '])
call add(tl, [2, 'abc\zeend', 'oij abcend', 'abc'])
call add(tl, [2, 'aa\zebb\|aaxx', ' aabb ', 'aa'])
call add(tl, [2, 'aa\zebb\|aaxx', ' aaxx ', 'aaxx'])
call add(tl, [2, 'aabb\|aa\zebb', ' aabb ', 'aabb'])
call add(tl, [2, 'aa\zebb\|aaebb', ' aabb ', 'aa'])
" match starts at \zs
call add(tl, [2, 'abc\zsdd', 'ddabcddxyzt', 'dd'])
call add(tl, [2, 'aa \zsax', ' ax'])
call add(tl, [2, 'abc \zsmatch\ze abc', 'abc abc abc match abc abc', 'match'])
call add(tl, [2, '\v(a \zsif .*){2}', 'a if then a if last', 'if last', 'a if last'])
call add(tl, [2, '\>\zs.', 'aword. ', '.'])
call add(tl, [2, '\s\+\ze\[/\|\s\zs\s\+', 'is [a t', ' '])
" Tests for \@= and \& features
call add(tl, [2, 'abc\@=', 'abc', 'ab'])
call add(tl, [2, 'abc\@=cd', 'abcd', 'abcd'])
call add(tl, [2, 'abc\@=', 'ababc', 'ab'])
" will never match, no matter the input text
call add(tl, [2, 'abcd\@=e', 'abcd'])
" will never match
call add(tl, [2, 'abcd\@=e', 'any text in here ... '])
call add(tl, [2, '\v(abc)@=..', 'xabcd', 'ab', 'abc'])
call add(tl, [2, '\(.*John\)\@=.*Bob', 'here is John, and here is B'])
call add(tl, [2, '\(John.*\)\@=.*Bob', 'John is Bobs friend', 'John is Bob', 'John is Bobs friend'])
call add(tl, [2, '\<\S\+\())\)\@=', '$((i=i+1))', 'i=i+1', '))'])
call add(tl, [2, '.*John\&.*Bob', 'here is John, and here is B'])
call add(tl, [2, '.*John\&.*Bob', 'John is Bobs friend', 'John is Bob'])
call add(tl, [2, '\v(test1)@=.*yep', 'this is a test1, yep it is', 'test1, yep', 'test1'])
call add(tl, [2, 'foo\(bar\)\@!', 'foobar'])
call add(tl, [2, 'foo\(bar\)\@!', 'foo bar', 'foo'])
call add(tl, [2, 'if \(\(then\)\@!.\)*$', ' if then else'])
call add(tl, [2, 'if \(\(then\)\@!.\)*$', ' if else ', 'if else ', ' '])
call add(tl, [2, '\(foo\)\@!bar', 'foobar', 'bar'])
call add(tl, [2, '\(foo\)\@!...bar', 'foobar'])
call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' bar foo '])
call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' foo bar '])
call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' foo xxx ', 'foo'])
call add(tl, [2, '[ ]\@!\p\%([ ]\@!\p\)*:', 'implicit mappings:', 'mappings:'])
call add(tl, [2, '[ ]\@!\p\([ ]\@!\p\)*:', 'implicit mappings:', 'mappings:', 's'])
call add(tl, [2, 'm\k\+_\@=\%(_\@!\k\)\@<=\k\+e', 'mx__xe', 'mx__xe'])
call add(tl, [2, '\%(\U\@<=S\k*\|S\l\)R', 'SuR', 'SuR'])
" Combining different tests and features
call add(tl, [2, '[[:alpha:]]\{-2,6}', '787abcdiuhsasiuhb4', 'ab'])
call add(tl, [2, '', 'abcd', ''])
call add(tl, [2, '\v(())', 'any possible text', ''])
call add(tl, [2, '\v%(ab(xyz)c)', ' abxyzc ', 'abxyzc', 'xyz'])
call add(tl, [2, '\v(test|)empty', 'tesempty', 'empty', ''])
call add(tl, [2, '\v(a|aa)(a|aa)', 'aaa', 'aa', 'a', 'a'])
" \%u and friends
call add(tl, [2, '\%d32', 'yes no', ' '])
call add(tl, [2, '\%o40', 'yes no', ' '])
call add(tl, [2, '\%x20', 'yes no', ' '])
call add(tl, [2, '\%u0020', 'yes no', ' '])
call add(tl, [2, '\%U00000020', 'yes no', ' '])
call add(tl, [2, '\%d0', "yes\x0ano", "\x0a"])
"" \%[abc]
call add(tl, [2, 'foo\%[bar]', 'fobar'])
call add(tl, [2, 'foo\%[bar]', 'foobar', 'foobar'])
call add(tl, [2, 'foo\%[bar]', 'fooxx', 'foo'])
call add(tl, [2, 'foo\%[bar]', 'foobxx', 'foob'])
call add(tl, [2, 'foo\%[bar]', 'foobaxx', 'fooba'])
call add(tl, [2, 'foo\%[bar]', 'foobarxx', 'foobar'])
call add(tl, [2, 'foo\%[bar]x', 'foobxx', 'foobx'])
call add(tl, [2, 'foo\%[bar]x', 'foobarxx', 'foobarx'])
call add(tl, [2, '\%[bar]x', 'barxx', 'barx'])
call add(tl, [2, '\%[bar]x', 'bxx', 'bx'])
call add(tl, [2, '\%[bar]x', 'xxx', 'x'])
call add(tl, [2, 'b\%[[ao]r]', 'bar bor', 'bar'])
call add(tl, [2, 'b\%[[]]r]', 'b]r bor', 'b]r'])
call add(tl, [2, '@\%[\w\-]*', '<http://john.net/pandoc/>[@pandoc]', '@pandoc'])
" Alternatives, must use first longest match
call add(tl, [2, 'goo\|go', 'google', 'goo'])
call add(tl, [2, '\<goo\|\<go', 'google', 'goo'])
call add(tl, [2, '\<goo\|go', 'google', 'goo'])
" Back references
call add(tl, [2, '\(\i\+\) \1', ' abc abc', 'abc abc', 'abc'])
call add(tl, [2, '\(\i\+\) \1', 'xgoo goox', 'goo goo', 'goo'])
call add(tl, [2, '\(a\)\(b\)\(c\)\(dd\)\(e\)\(f\)\(g\)\(h\)\(i\)\1\2\3\4\5\6\7\8\9', 'xabcddefghiabcddefghix', 'abcddefghiabcddefghi', 'a', 'b', 'c', 'dd', 'e', 'f', 'g', 'h', 'i'])
call add(tl, [2, '\(\d*\)a \1b', ' a b ', 'a b', ''])
call add(tl, [2, '^.\(.\).\_..\1.', "aaa\naaa\nb", "aaa\naaa", 'a'])
call add(tl, [2, '^.*\.\(.*\)/.\+\(\1\)\@<!$', 'foo.bat/foo.com', 'foo.bat/foo.com', 'bat'])
call add(tl, [2, '^.*\.\(.*\)/.\+\(\1\)\@<!$', 'foo.bat/foo.bat'])
call add(tl, [2, '^.*\.\(.*\)/.\+\(\1\)\@<=$', 'foo.bat/foo.bat', 'foo.bat/foo.bat', 'bat', 'bat'])
call add(tl, [2, '\\\@<!\${\(\d\+\%(:.\{-}\)\?\\\@<!\)}', '2013-06-27${0}', '${0}', '0'])
call add(tl, [2, '^\(a*\)\1$', 'aaaaaaaa', 'aaaaaaaa', 'aaaa'])
call add(tl, [2, '^\(a\{-2,}\)\1\+$', 'aaaaaaaaa', 'aaaaaaaaa', 'aaa'])
" Look-behind with limit
call add(tl, [2, '<\@<=span.', 'xxspanxx<spanyyy', 'spany'])
call add(tl, [2, '<\@1<=span.', 'xxspanxx<spanyyy', 'spany'])
call add(tl, [2, '<\@2<=span.', 'xxspanxx<spanyyy', 'spany'])
call add(tl, [2, '\(<<\)\@<=span.', 'xxspanxxxx<spanxx<<spanyyy', 'spany', '<<'])
call add(tl, [2, '\(<<\)\@1<=span.', 'xxspanxxxx<spanxx<<spanyyy'])
call add(tl, [2, '\(<<\)\@2<=span.', 'xxspanxxxx<spanxx<<spanyyy', 'spany', '<<'])
call add(tl, [2, '\(foo\)\@<!bar.', 'xx foobar1 xbar2 xx', 'bar2'])
" look-behind match in front of a zero-width item
call add(tl, [2, '\v\C%(<Last Changed:\s+)@<=.*$', '" test header'])
call add(tl, [2, '\v\C%(<Last Changed:\s+)@<=.*$', '" Last Changed: 1970', '1970'])
call add(tl, [2, '\(foo\)\@<=\>', 'foobar'])
call add(tl, [2, '\(foo\)\@<=\>', 'barfoo', '', 'foo'])
call add(tl, [2, '\(foo\)\@<=.*', 'foobar', 'bar', 'foo'])
" complicated look-behind match
call add(tl, [2, '\(r\@<=\|\w\@<!\)\/', 'x = /word/;', '/'])
call add(tl, [2, '^[a-z]\+\ze \&\(asdf\)\@<!', 'foo bar', 'foo'])
"" \@>
call add(tl, [2, '\(a*\)\@>a', 'aaaa'])
call add(tl, [2, '\(a*\)\@>b', 'aaab', 'aaab', 'aaa'])
call add(tl, [2, '^\(.\{-}b\)\@>.', ' abcbd', ' abc', ' ab'])
call add(tl, [2, '\(.\{-}\)\(\)\@>$', 'abc', 'abc', 'abc', ''])
" TODO: BT engine does not restore submatch after failure
call add(tl, [1, '\(a*\)\@>a\|a\+', 'aaaa', 'aaaa'])
" "\_" prepended negated collection matches EOL
call add(tl, [2, '\_[^8-9]\+', "asfi\n9888", "asfi\n"])
call add(tl, [2, '\_[^a]\+', "asfi\n9888", "sfi\n9888"])
" Requiring lots of states.
call add(tl, [2, '[0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12}', " 12345678-1234-1234-1234-123456789012 ", "12345678-1234-1234-1234-123456789012", "1234-"])
" Skip adding state twice
call add(tl, [2, '^\%(\%(^\s*#\s*if\>\|#\s*if\)\)\(\%>1c.*$\)\@=', "#if FOO", "#if", ' FOO'])
" Test \%V atom
call add(tl, [2, '\%>70vGesamt', 'Jean-Michel Charlier & Victor Hubinon\Gesamtausgabe [Salleck] Buck Danny {Jean-Michel Charlier & Victor Hubinon}\Gesamtausgabe', 'Gesamt'])
" Run the tests
for t in tl
let re = t[0]
let pat = t[1]
let text = t[2]
let matchidx = 3
for engine in [0, 1, 2]
if engine == 2 && re == 0 || engine == 1 && re == 1
continue
endif
let &regexpengine = engine
try
let l = matchlist(text, pat)
catch
call assert_report('Error ' . engine . ': pat: \"' . pat
\ . '\", text: \"' . text . '\", caused an exception: \"'
\ . v:exception . '\"')
endtry
" check the match itself
if len(l) == 0 && len(t) > matchidx
call assert_report('Error ' . engine . ': pat: \"' . pat
\ . '\", text: \"' . text . '\", did not match, expected: \"'
\ . t[matchidx] . '\"')
elseif len(l) > 0 && len(t) == matchidx
call assert_report('Error ' . engine . ': pat: \"' . pat
\ . '\", text: \"' . text . '\", match: \"' . l[0]
\ . '\", expected no match')
elseif len(t) > matchidx && l[0] != t[matchidx]
call assert_report('Error ' . engine . ': pat: \"' . pat
\ . '\", text: \"' . text . '\", match: \"' . l[0]
\ . '\", expected: \"' . t[matchidx] . '\"')
else
" Test passed
endif
" check all the nine submatches
if len(l) > 0
for i in range(1, 9)
if len(t) <= matchidx + i
let e = ''
else
let e = t[matchidx + i]
endif
if l[i] != e
call assert_report('Error ' . engine . ': pat: \"' . pat
\ . '\", text: \"' . text . '\", submatch ' . i . ': \"'
\ . l[i] . '\", expected: \"' . e . '\"')
endif
endfor
unlet i
endif
endfor
endfor
unlet t tl e l
endfunc
" Tests for multi-line regexp patterns without multi-byte support.
func Test_regexp_multiline_pat()
let tl = []
" back references
call add(tl, [2, '^.\(.\).\_..\1.', ['aaa', 'aaa', 'b'], ['XX', 'b']])
call add(tl, [2, '\v.*\/(.*)\n.*\/\1$', ['./Dir1/Dir2/zyxwvuts.txt', './Dir1/Dir2/abcdefgh.bat', '', './Dir1/Dir2/file1.txt', './OtherDir1/OtherDir2/file1.txt'], ['./Dir1/Dir2/zyxwvuts.txt', './Dir1/Dir2/abcdefgh.bat', '', 'XX']])
" line breaks
call add(tl, [2, '\S.*\nx', ['abc', 'def', 'ghi', 'xjk', 'lmn'], ['abc', 'def', 'XXjk', 'lmn']])
" Check that \_[0-9] matching EOL does not break a following \>
call add(tl, [2, '\<\(\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\.\)\{3\}\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\>', ['', 'localnet/192.168.0.1', ''], ['', 'localnet/XX', '']])
" Check a pattern with a line break and ^ and $
call add(tl, [2, 'a\n^b$\n^c', ['a', 'b', 'c'], ['XX']])
call add(tl, [2, '\(^.\+\n\)\1', [' dog', ' dog', 'asdf'], ['XXasdf']])
" Run the multi-line tests
for t in tl
let re = t[0]
let pat = t[1]
let before = t[2]
let after = t[3]
for engine in [0, 1, 2]
if engine == 2 && re == 0 || engine == 1 && re ==1
continue
endif
let &regexpengine = engine
new
call setline(1, before)
exe '%s/' . pat . '/XX/'
let result = getline(1, '$')
q!
if result != after
call assert_report('Error: pat: \"' . pat . '\", text: \"'
\ . string(before) . '\", expected: \"' . string(after)
\ . '\", got: \"' . string(result) . '\"')
else
" Test passed
endif
endfor
endfor
unlet t tl
endfunc
" Check that using a pattern on two lines doesn't get messed up by using
" matchstr() with \ze in between.
func Test_matchstr_with_ze()
new
call append(0, ['Substitute here:', '<T="">Ta 5</Title>',
\ '<T="">Ac 7</Title>'])
call cursor(1, 1)
set re=0
.+1,.+2s/""/\='"' . matchstr(getline("."), '\d\+\ze<') . '"'
call assert_equal(['Substitute here:', '<T="5">Ta 5</Title>',
\ '<T="7">Ac 7</Title>', ''], getline(1, '$'))
bwipe!
endfunc
" Check a pattern with a look beind crossing a line boundary
func Test_lookbehind_across_line()
new
call append(0, ['Behind:', 'asdfasd<yyy', 'xxstart1', 'asdfasd<yy',
\ 'xxxstart2', 'asdfasd<yy', 'xxstart3'])
call cursor(1, 1)
call search('\(<\_[xy]\+\)\@3<=start')
call assert_equal([0, 7, 3, 0], getpos('.'))
bwipe!
endfunc
" Check matching Visual area
func Test_matching_visual_area()
new
call append(0, ['Visual:', 'thexe the thexethe', 'andaxand andaxand',
\ 'oooxofor foroxooo', 'oooxofor foroxooo'])
call cursor(1, 1)
exe "normal jfxvfx:s/\\%Ve/E/g\<CR>"
exe "normal jV:s/\\%Va/A/g\<CR>"
exe "normal jfx\<C-V>fxj:s/\\%Vo/O/g\<CR>"
call assert_equal(['Visual:', 'thexE thE thExethe', 'AndAxAnd AndAxAnd',
\ 'oooxOfOr fOrOxooo', 'oooxOfOr fOrOxooo', ''], getline(1, '$'))
bwipe!
endfunc
" Check matching marks
func Test_matching_marks()
new
call append(0, ['', '', '', 'Marks:', 'asdfSasdfsadfEasdf', 'asdfSas',
\ 'dfsadfEasdf', '', '', '', '', ''])
call cursor(4, 1)
exe "normal jfSmsfEme:.-4,.+6s/.\\%>'s.*\\%<'e../here/\<CR>"
exe "normal jfSmsj0fEme:.-4,.+6s/.\\%>'s\\_.*\\%<'e../again/\<CR>"
call assert_equal(['', '', '', 'Marks:', 'asdfhereasdf', 'asdfagainasdf',
\ '', '', '', '', '', ''], getline(1, '$'))
bwipe!
endfunc
" Check patterns matching cursor position.
func s:curpos_test()
new
call setline(1, ['ffooooo', 'boboooo', 'zoooooo', 'koooooo', 'moooooo',
\ "\t\t\tfoo", 'abababababababfoo', 'bababababababafoo', '********_',
\ ' xxxxxxxxxxxx xxxx xxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxx xxxxx xxxxxxx xx xxxx xxxxxxxx xxxx xxxxxxxxxxx xxx xxxxxxx xxxxxxxxx xx xxxxxx xx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx xxx xxxxxxxx xxxxxxxxx xxxx xxx xxxx xxx xxx xxxxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxxxx xx xxxxx xxx xxxxxxxx xxxxxx xxx xxx xxxxxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxxx xxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxx xxxxxxxx xxxxxxx xxxx xxx xxxxxx xxxxx xxxxx xx xxxxxx xxxxxxx xxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxx xxxxxx xxxxx xxx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxxx xxxx xx xxxxxxxx xxx xxxxxxxxxxx xxxxx'])
call setpos('.', [0, 1, 0, 0])
s/\%>3c.//g
call setpos('.', [0, 2, 4, 0])
s/\%#.*$//g
call setpos('.', [0, 3, 0, 0])
s/\%<3c./_/g
%s/\%4l\%>5c./_/g
%s/\%6l\%>25v./_/g
%s/\%>6l\%3c./!/g
%s/\%>7l\%12c./?/g
%s/\%>7l\%<9l\%>5v\%<8v./#/g
$s/\%(|\u.*\)\@<=[^|\t]\+$//ge
call assert_equal(['ffo', 'bob', '__ooooo', 'koooo__', 'moooooo',
\ ' f__', 'ab!babababababfoo',
\ 'ba!ab##abab?bafoo', '**!*****_',
\ ' ! xxx?xxxxxxxx xxxx xxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxx xxxxx xxxxxxx xx xxxx xxxxxxxx xxxx xxxxxxxxxxx xxx xxxxxxx xxxxxxxxx xx xxxxxx xx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx xxx xxxxxxxx xxxxxxxxx xxxx xxx xxxx xxx xxx xxxxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxxxx xx xxxxx xxx xxxxxxxx xxxxxx xxx xxx xxxxxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxxx xxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxx xxxxxxxx xxxxxxx xxxx xxx xxxxxx xxxxx xxxxx xx xxxxxx xxxxxxx xxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxx xxxxxx xxxxx xxx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxxxx xxxx xx xxxxxxxx xxx xxxxxxxxxxx xxxxx'],
\ getline(1, '$'))
bwipe!
endfunc
func Test_matching_curpos()
set re=0
call s:curpos_test()
set re=1
call s:curpos_test()
set re=2
call s:curpos_test()
set re&
endfunc
" Test for matching the start and end of a buffer
func Test_start_end_of_buffer_match()
new
call setline(1, repeat(['vim edit'], 20))
/\%^
call assert_equal([0, 1, 1, 0], getpos('.'))
exe "normal 50%/\\%^..\<CR>"
call assert_equal([0, 1, 1, 0], getpos('.'))
exe "normal 50%/\\%$\<CR>"
call assert_equal([0, 20, 8, 0], getpos('.'))
exe "normal 6gg/..\\%$\<CR>"
call assert_equal([0, 20, 7, 0], getpos('.'))
bwipe!
endfunc
" Check for detecting error
func Test_regexp_error()
set regexpengine=2
call assert_fails("call matchlist('x x', ' \\ze*')", 'E888:')
call assert_fails("call matchlist('x x', ' \\zs*')", 'E888:')
set re&
endfunc
" vim: shiftwidth=2 sts=2 expandtab

241
src/nvim/testdir/test_undo.vim
View File

@ -241,6 +241,26 @@ func Test_undojoin()
close!
endfunc
" undojoin not allowed after undo
func Test_undojoin_after_undo()
new
call feedkeys("ixx\<Esc>u", 'xt')
call assert_fails(':undojoin', 'E790:')
bwipe!
endfunc
" undojoin is a noop when no change yet, or when 'undolevels' is negative
func Test_undojoin_noop()
new
call feedkeys(":undojoin\<CR>", 'xt')
call assert_equal([''], getline(1, '$'))
setlocal undolevels=-1
call feedkeys("ixx\<Esc>u", 'xt')
call feedkeys(":undojoin\<CR>", 'xt')
call assert_equal(['xx'], getline(1, '$'))
bwipe!
endfunc
func Test_undo_write()
call delete('Xtest')
split Xtest
@ -327,6 +347,22 @@ func Test_undofile_earlier()
call delete('Xundofile')
endfunc
func Test_wundo_errors()
new
call setline(1, 'hello')
call assert_fails('wundo! Xdoesnotexist/Xundofile', 'E828:')
bwipe!
endfunc
func Test_rundo_errors()
call assert_fails('rundo XfileDoesNotExist', 'E822:')
call writefile(['abc'], 'Xundofile')
call assert_fails('rundo Xundofile', 'E823:')
call delete('Xundofile')
endfunc
" Test for undo working properly when executing commands from a register.
" Also test this in an empty buffer.
func Test_cmd_in_reg_undo()
@ -343,6 +379,24 @@ func Test_cmd_in_reg_undo()
let @a = ''
endfunc
" undo or redo are noop if there is nothing to undo or redo
func Test_undo_redo_noop()
new
call assert_fails('undo 2', 'E830:')
message clear
undo
let messages = split(execute('message'), "\n")
call assert_equal('Already at oldest change', messages[-1])
message clear
redo
let messages = split(execute('message'), "\n")
call assert_equal('Already at newest change', messages[-1])
bwipe!
endfunc
func Test_redo_empty_line()
new
exe "norm\x16r\x160"
@ -443,3 +497,190 @@ func Test_undo_0()
bwipe!
endfunc
" Tests for the undo file
" Explicitly break changes up in undo-able pieces by setting 'undolevels'.
func Test_undofile_2()
set undolevels=100 undofile
edit Xtestfile
call append(0, 'this is one line')
call cursor(1, 1)
" first a simple one-line change.
set undolevels=100
s/one/ONE/
set undolevels=100
write
bwipe!
edit Xtestfile
undo
call assert_equal('this is one line', getline(1))
" change in original file fails check
set noundofile
edit! Xtestfile
s/line/Line/
write
set undofile
bwipe!
edit Xtestfile
undo
call assert_equal('this is ONE Line', getline(1))
" add 10 lines, delete 6 lines, undo 3
set undofile
call setbufline(0, 1, ['one', 'two', 'three', 'four', 'five', 'six',
\ 'seven', 'eight', 'nine', 'ten'])
set undolevels=100
normal 3Gdd
set undolevels=100
normal dd
set undolevels=100
normal dd
set undolevels=100
normal dd
set undolevels=100
normal dd
set undolevels=100
normal dd
set undolevels=100
write
bwipe!
edit Xtestfile
normal uuu
call assert_equal(['one', 'two', 'six', 'seven', 'eight', 'nine', 'ten'],
\ getline(1, '$'))
" Test that reading the undofiles when setting undofile works
set noundofile undolevels=0
exe "normal i\n"
undo
edit! Xtestfile
set undofile undolevels=100
normal uuuuuu
call assert_equal(['one', 'two', 'three', 'four', 'five', 'six', 'seven',
\ 'eight', 'nine', 'ten'], getline(1, '$'))
bwipe!
call delete('Xtestfile')
let ufile = has('vms') ? '_un_Xtestfile' : '.Xtestfile.un~'
call delete(ufile)
set undofile& undolevels&
endfunc
" Test 'undofile' using a file encrypted with 'zip' crypt method
func Test_undofile_cryptmethod_zip()
throw 'skipped: Nvim does not support cryptmethod'
edit Xtestfile
set undofile cryptmethod=zip
call append(0, ['monday', 'tuesday', 'wednesday', 'thursday', 'friday'])
call cursor(5, 1)
set undolevels=100
normal kkkdd
set undolevels=100
normal dd
set undolevels=100
normal dd
set undolevels=100
" encrypt the file using key 'foobar'
call feedkeys("foobar\nfoobar\n")
X
write!
bwipe!
call feedkeys("foobar\n")
edit Xtestfile
set key=
normal uu
call assert_equal(['monday', 'wednesday', 'thursday', 'friday', ''],
\ getline(1, '$'))
bwipe!
call delete('Xtestfile')
let ufile = has('vms') ? '_un_Xtestfile' : '.Xtestfile.un~'
call delete(ufile)
set undofile& undolevels& cryptmethod&
endfunc
" Test 'undofile' using a file encrypted with 'blowfish' crypt method
func Test_undofile_cryptmethod_blowfish()
throw 'skipped: Nvim does not support cryptmethod'
edit Xtestfile
set undofile cryptmethod=blowfish
call append(0, ['jan', 'feb', 'mar', 'apr', 'jun'])
call cursor(5, 1)
set undolevels=100
exe 'normal kk0ifoo '
set undolevels=100
normal dd
set undolevels=100
exe 'normal ibar '
set undolevels=100
" encrypt the file using key 'foobar'
call feedkeys("foobar\nfoobar\n")
X
write!
bwipe!
call feedkeys("foobar\n")
edit Xtestfile
set key=
call search('bar')
call assert_equal('bar apr', getline('.'))
undo
call assert_equal('apr', getline('.'))
undo
call assert_equal('foo mar', getline('.'))
undo
call assert_equal('mar', getline('.'))
bwipe!
call delete('Xtestfile')
let ufile = has('vms') ? '_un_Xtestfile' : '.Xtestfile.un~'
call delete(ufile)
set undofile& undolevels& cryptmethod&
endfunc
" Test 'undofile' using a file encrypted with 'blowfish2' crypt method
func Test_undofile_cryptmethod_blowfish2()
throw 'skipped: Nvim does not support cryptmethod'
edit Xtestfile
set undofile cryptmethod=blowfish2
call append(0, ['jan', 'feb', 'mar', 'apr', 'jun'])
call cursor(5, 1)
set undolevels=100
exe 'normal kk0ifoo '
set undolevels=100
normal dd
set undolevels=100
exe 'normal ibar '
set undolevels=100
" encrypt the file using key 'foo2bar'
call feedkeys("foo2bar\nfoo2bar\n")
X
write!
bwipe!
call feedkeys("foo2bar\n")
edit Xtestfile
set key=
call search('bar')
call assert_equal('bar apr', getline('.'))
normal u
call assert_equal('apr', getline('.'))
normal u
call assert_equal('foo mar', getline('.'))
normal u
call assert_equal('mar', getline('.'))
bwipe!
call delete('Xtestfile')
let ufile = has('vms') ? '_un_Xtestfile' : '.Xtestfile.un~'
call delete(ufile)
set undofile& undolevels& cryptmethod&
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
test/functional/legacy/095_regexp_multibyte_spec.lua
View File

@ -1,5 +1,5 @@
-- Test for regexp patterns with multi-byte support, using utf-8.
-- See test64 for the non-multi-byte tests.
-- See test_regexp_latin.vim for the non-multi-byte tests.
-- A pattern that gives the expected result produces OK, so that we know it was
-- actually tried.