ext_cmdline: Added cmdline prompt

2 files changed, 27 insertions, 12 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index aab777955c..72b97cbab9 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -11149,15 +11149,19 @@ void get_user_input(const typval_T *const argvars,
   // Only the part of the message after the last NL is considered as
   // prompt for the command line.
   const char *p = strrchr(prompt, '\n');
-  if (p == NULL) {
+  if (ui_is_external(kUICmdline)) {
     p = prompt;
   } else {
-    p++;
-    msg_start();
-    msg_clr_eos();
-    msg_puts_attr_len(prompt, p - prompt, echo_attr);
-    msg_didout = false;
-    msg_starthere();
+    if (p == NULL) {
+      p = prompt;
+    } else {
+      p++;
+      msg_start();
+      msg_clr_eos();
+      msg_puts_attr_len(prompt, p - prompt, echo_attr);
+      msg_didout = false;
+      msg_starthere();
+    }
   }
   cmdline_row = msg_row;
 
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 87bf46d4d0..a05331d13a 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -3114,11 +3114,17 @@ static void redrawcmdprompt(void)
     }
   }
   if (ccline.cmdprompt != NULL) {
-    msg_puts_attr((const char *)ccline.cmdprompt, ccline.cmdattr);
-    ccline.cmdindent = msg_col + (msg_row - cmdline_row) * Columns;
-    /* do the reverse of set_cmdspos() */
-    if (ccline.cmdfirstc != NUL)
-      --ccline.cmdindent;
+    if (cmdline_external) {
+      Array args = ARRAY_DICT_INIT;
+      ADD(args, STRING_OBJ(cstr_to_string((char *)(ccline.cmdprompt))));
+      ui_event("cmdline_prompt", args);
+    } else {
+      msg_puts_attr((const char *)ccline.cmdprompt, ccline.cmdattr);
+      ccline.cmdindent = msg_col + (msg_row - cmdline_row) * Columns;
+      /* do the reverse of set_cmdspos() */
+      if (ccline.cmdfirstc != NUL)
+        --ccline.cmdindent;
+    }
   } else
     for (i = ccline.cmdindent; i > 0; --i)
       msg_putchar(' ');
@@ -6036,3 +6042,8 @@ void cmdline_set_external(bool external)
 {
   cmdline_external = external;
 }
+
+bool cmdline_get_external(void)
+{
+  return cmdline_external;
+}