mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 15:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ext_cmdline: turn nested cmdlines into a linked list

Browse Source
This commit is contained in:
Björn Linse
2017-08-20 16:30:09 +02:00
parent 91f94bfef8
commit 2050e66046
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/nvim/ex_getln.c
View File

@@ -92,6 +92,7 @@ struct cmdline_info {
unsigned prompt_id; ///< Prompt number, used to disable coloring on errors. unsigned prompt_id; ///< Prompt number, used to disable coloring on errors.
Callback highlight_callback; ///< Callback used for coloring user input. Callback highlight_callback; ///< Callback used for coloring user input.
int level; // current cmdline level int level; // current cmdline level
struct cmdline_info *prev_ccline; ///< pointer to saved cmdline state
}; };
/// Last value of prompt_id, incremented when doing new prompt /// Last value of prompt_id, incremented when doing new prompt
static unsigned last_prompt_id = 0; static unsigned last_prompt_id = 0;
@@ -2958,9 +2959,6 @@ void put_on_cmdline(char_u *str, int len, int redraw)
msg_check(); msg_check();
} }
static struct cmdline_info prev_ccline;
static int prev_ccline_used = FALSE;
/* /*
* Save ccline, because obtaining the "=" register may execute "normal :cmd" * Save ccline, because obtaining the "=" register may execute "normal :cmd"
* and overwrite it. But get_cmdline_str() may need it, thus make it * and overwrite it. But get_cmdline_str() may need it, thus make it
@@ -2968,12 +2966,8 @@ static int prev_ccline_used = FALSE;
*/ */
static void save_cmdline(struct cmdline_info *ccp) static void save_cmdline(struct cmdline_info *ccp)
{ {
if (!prev_ccline_used) { *ccp = ccline;
memset(&prev_ccline, 0, sizeof(struct cmdline_info)); ccline.prev_ccline = ccp;
prev_ccline_used = TRUE;
}
*ccp = prev_ccline;
prev_ccline = ccline;
ccline.cmdbuff = NULL; ccline.cmdbuff = NULL;
ccline.cmdprompt = NULL; ccline.cmdprompt = NULL;
ccline.xpc = NULL; ccline.xpc = NULL;
@@ -2984,8 +2978,7 @@ static void save_cmdline(struct cmdline_info *ccp)
*/ */
static void restore_cmdline(struct cmdline_info *ccp) static void restore_cmdline(struct cmdline_info *ccp)
{ {
ccline = prev_ccline; ccline = *ccp;
prev_ccline = *ccp;
} }
/* /*
@@ -5312,13 +5305,15 @@ int get_history_idx(int histype)
*/ */
static struct cmdline_info *get_ccline_ptr(void) static struct cmdline_info *get_ccline_ptr(void)
{ {
if ((State & CMDLINE) == 0) if ((State & CMDLINE) == 0) {
return NULL; return NULL;
if (ccline.cmdbuff != NULL) } else if (ccline.cmdbuff != NULL) {
return &ccline; return &ccline;
if (prev_ccline_used && prev_ccline.cmdbuff != NULL) } else if (ccline.prev_ccline && ccline.prev_ccline->cmdbuff != NULL) {
return &prev_ccline; return ccline.prev_ccline;
return NULL; } else {
return NULL;
}
} }
/* /*