From c2fb1fc700db28cb554be9da8e79443b5d3a5fe9 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 24 Sep 2024 06:51:02 +0800 Subject: vim-patch:9.1.0741: No way to get prompt for input()/confirm() Problem: No way to get prompt for input()/confirm() Solution: add getcmdprompt() function (Shougo Matsushita) (Shougo Matsushita) closes: vim/vim#15667 https://github.com/vim/vim/commit/6908428560a0d6ae27bf7af6fcb6dc362e31926c Co-authored-by: Shougo Matsushita --- src/nvim/eval.lua | 32 +++++++++++++++++++++++--------- src/nvim/eval/funcs.c | 2 ++ src/nvim/ex_getln.c | 24 ++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 9 deletions(-) (limited to 'src/nvim') diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua index 2a3327b37b..4545ad1149 100644 --- a/src/nvim/eval.lua +++ b/src/nvim/eval.lua @@ -3594,8 +3594,8 @@ M.funcs = { Only works when the command line is being edited, thus requires use of |c_CTRL-\_e| or |c_CTRL-R_=|. See |:command-completion| for the return string. - Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()| and - |setcmdline()|. + Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()|, + |getcmdprompt()| and |setcmdline()|. Returns an empty string when completion is not defined. ]=], name = 'getcmdcompltype', @@ -3605,13 +3605,13 @@ M.funcs = { }, getcmdline = { desc = [=[ - Return the current command-line. Only works when the command - line is being edited, thus requires use of |c_CTRL-\_e| or - |c_CTRL-R_=|. + Return the current command-line input. Only works when the + command line is being edited, thus requires use of + |c_CTRL-\_e| or |c_CTRL-R_=|. Example: >vim cmap eescape(getcmdline(), ' \') - vval.v_number = p != NULL ? p->cmdpos + 1 : 0; } +static char current_prompt[CMDBUFFSIZE + 1] = ""; + +/// Get current command line prompt. +static char *get_prompt(void) +{ + return current_prompt; +} + +/// Set current command line prompt. +void set_prompt(const char *str) +{ + xstrlcpy(current_prompt, str, sizeof(current_prompt)); +} + +/// "getcmdprompt()" function +void f_getcmdprompt(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) +{ + CmdlineInfo *p = get_ccline_ptr(); + rettv->v_type = VAR_STRING; + rettv->vval.v_string = p != NULL ? xstrdup(get_prompt()) : NULL; +} + /// "getcmdscreenpos()" function void f_getcmdscreenpos(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) { @@ -4730,6 +4752,8 @@ void get_user_input(const typval_T *const argvars, typval_T *const rettv, const const bool cmd_silent_save = cmd_silent; cmd_silent = false; // Want to see the prompt. + set_prompt(prompt); + // Only the part of the message after the last NL is considered as // prompt for the command line, unlsess cmdline is externalized const char *p = prompt; -- cgit From 65b6cd1b3a43024f6c2d9d6f31b8ae3a69dabb56 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 26 Sep 2024 22:15:54 +0800 Subject: vim-patch:9.1.0742: getcmdprompt() implementation can be improved Problem: getcmdprompt() implementation can be improved Solution: Improve and simplify it (h-east) closes: vim/vim#15743 https://github.com/vim/vim/commit/25876a6cdd439054d0b3f920ccca0a435481de15 Co-authored-by: h-east --- src/nvim/eval/funcs.c | 2 -- src/nvim/ex_getln.c | 19 ++----------------- 2 files changed, 2 insertions(+), 19 deletions(-) (limited to 'src/nvim') diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 4a96c9a3f3..e8b9288717 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -813,8 +813,6 @@ static void f_confirm(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) const char *message = tv_get_string_chk(&argvars[0]); if (message == NULL) { error = true; - } else { - set_prompt(message); } if (argvars[1].v_type != VAR_UNKNOWN) { buttons = tv_get_string_buf_chk(&argvars[1], buf); diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 7eb4fe67a1..69fcdac095 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -4132,26 +4132,13 @@ void f_getcmdpos(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) rettv->vval.v_number = p != NULL ? p->cmdpos + 1 : 0; } -static char current_prompt[CMDBUFFSIZE + 1] = ""; - -/// Get current command line prompt. -static char *get_prompt(void) -{ - return current_prompt; -} - -/// Set current command line prompt. -void set_prompt(const char *str) -{ - xstrlcpy(current_prompt, str, sizeof(current_prompt)); -} - /// "getcmdprompt()" function void f_getcmdprompt(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) { CmdlineInfo *p = get_ccline_ptr(); rettv->v_type = VAR_STRING; - rettv->vval.v_string = p != NULL ? xstrdup(get_prompt()) : NULL; + rettv->vval.v_string = p != NULL && p->cmdprompt != NULL + ? xstrdup(p->cmdprompt) : NULL; } /// "getcmdscreenpos()" function @@ -4752,8 +4739,6 @@ void get_user_input(const typval_T *const argvars, typval_T *const rettv, const const bool cmd_silent_save = cmd_silent; cmd_silent = false; // Want to see the prompt. - set_prompt(prompt); - // Only the part of the message after the last NL is considered as // prompt for the command line, unlsess cmdline is externalized const char *p = prompt; -- cgit