thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0924: cannot save and restore a register properly

Browse Source 
Problem:    Cannot save and restore a register properly.
Solution:   Add getreginfo() and make setreg() accept a dictionary. (Andy
            Massimino, closes #3370)
This commit is contained in:
Bram Moolenaar
2020-06-07 18:16:36 +02:00
parent c82dd86084
commit bb861e293e
8 changed files with 241 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
src/evalfunc.c
View File

@@ -94,6 +94,7 @@ static void f_getpid(typval_T *argvars, typval_T *rettv);
static void f_getcurpos(typval_T *argvars, typval_T *rettv);
static void f_getpos(typval_T *argvars, typval_T *rettv);
static void f_getreg(typval_T *argvars, typval_T *rettv);
static void f_getreginfo(typval_T *argvars, typval_T *rettv);
static void f_getregtype(typval_T *argvars, typval_T *rettv);
static void f_gettagstack(typval_T *argvars, typval_T *rettv);
static void f_haslocaldir(typval_T *argvars, typval_T *rettv);
@@ -586,6 +587,7 @@ static funcentry_T global_functions[] =
{"getpos", 1, 1, FEARG_1, ret_list_number, f_getpos},
{"getqflist", 0, 1, 0, ret_list_dict_any, f_getqflist},
{"getreg", 0, 3, FEARG_1, ret_string, f_getreg},
{"getreginfo", 0, 1, FEARG_1, ret_dict_any, f_getreginfo},
{"getregtype", 0, 1, FEARG_1, ret_string, f_getregtype},
{"gettabinfo", 0, 1, FEARG_1, ret_list_dict_any, f_gettabinfo},
{"gettabvar", 2, 3, FEARG_1, ret_any, f_gettabvar},
@@ -6227,6 +6229,72 @@ range_list_materialize(list_T *list)
break;
}
/*
* "getreginfo()" function
*/
static void
f_getreginfo(typval_T *argvars, typval_T *rettv)
{
char_u *strregname;
int regname;
char_u buf[NUMBUFLEN + 2];
long reglen = 0;
dict_T *dict;
list_T *list;
if (argvars[0].v_type != VAR_UNKNOWN)
{
strregname = tv_get_string_chk(&argvars[0]);
if (strregname == NULL)
return;
}
else
strregname = get_vim_var_str(VV_REG);
regname = (strregname == NULL ? '"' : *strregname);
if (regname == 0 || regname == '@')
regname = '"';
if (rettv_dict_alloc(rettv) == FAIL)
return;
dict = rettv->vval.v_dict;
list = (list_T *)get_reg_contents(regname, GREG_EXPR_SRC | GREG_LIST);
if (list == NULL)
return;
dict_add_list(dict, "regcontents", list);
buf[0] = NUL;
buf[1] = NUL;
switch (get_reg_type(regname, &reglen))
{
case MLINE: buf[0] = 'V'; break;
case MCHAR: buf[0] = 'v'; break;
case MBLOCK:
vim_snprintf((char *)buf, sizeof(buf), "%c%ld", Ctrl_V,
reglen + 1);
break;
}
dict_add_string(dict, (char *)"regtype", buf);
buf[0] = get_register_name(get_unname_register());
buf[1] = NUL;
if (regname == '"')
dict_add_string(dict, (char *)"points_to", buf);
else
{
dictitem_T *item = dictitem_alloc((char_u *)"isunnamed");
if (item != NULL)
{
item->di_tv.v_type = VAR_SPECIAL;
item->di_tv.vval.v_number = regname == buf[0]
? VVAL_TRUE : VVAL_FALSE;
dict_add(dict, item);
}
}
}
static void
return_register(int regname, typval_T *rettv)
{
@@ -7203,7 +7271,11 @@ f_setreg(typval_T *argvars, typval_T *rettv)
int append;
char_u yank_type;
long block_len;
typval_T *regcontents;
int pointreg;
pointreg = 0;
regcontents = NULL;
block_len = -1;
yank_type = MAUTO;
append = FALSE;
@@ -7217,6 +7289,49 @@ f_setreg(typval_T *argvars, typval_T *rettv)
if (regname == 0 || regname == '@')
regname = '"';
if (argvars[1].v_type == VAR_DICT)
{
dict_T *d = argvars[1].vval.v_dict;
dictitem_T *di = dict_find(d, (char_u *)"regcontents", -1);
if (di != NULL)
regcontents = &di->di_tv;
stropt = dict_get_string(d, (char_u *)"regtype", FALSE);
if (stropt != NULL)
switch (*stropt)
{
case 'v': // character-wise selection
yank_type = MCHAR;
break;
case 'V': // line-wise selection
yank_type = MLINE;
break;
case Ctrl_V: // block-wise selection
yank_type = MBLOCK;
if (VIM_ISDIGIT(stropt[1]))
{
++stropt;
block_len = getdigits(&stropt) - 1;
--stropt;
}
break;
}
if (regname == '"')
{
stropt = dict_get_string(d, (char_u *)"points_to", FALSE);
if (stropt != NULL)
{
pointreg = *stropt;
regname = pointreg;
}
}
else if (dict_get_number(d, (char_u *)"isunnamed"))
pointreg = regname;
}
else
regcontents = &argvars[1];
if (argvars[2].v_type != VAR_UNKNOWN)
{
stropt = tv_get_string_chk(&argvars[2]);
@@ -7246,14 +7361,14 @@ f_setreg(typval_T *argvars, typval_T *rettv)
}
}
if (argvars[1].v_type == VAR_LIST)
if (regcontents && regcontents->v_type == VAR_LIST)
{
char_u **lstval;
char_u **allocval;
char_u buf[NUMBUFLEN];
char_u **curval;
char_u **curallocval;
list_T *ll = argvars[1].vval.v_list;
list_T *ll = regcontents->vval.v_list;
listitem_T *li;
int len;
@@ -7298,14 +7413,17 @@ free_lstval:
vim_free(*--curallocval);
vim_free(lstval);
}
else
else if (regcontents)
{
strval = tv_get_string_chk(&argvars[1]);
strval = tv_get_string_chk(regcontents);
if (strval == NULL)
return;
write_reg_contents_ex(regname, strval, -1,
append, yank_type, block_len);
}
if (pointreg != 0)
get_yank_register(pointreg, TRUE);
rettv->vval.v_number = 0;
}