feat: added config options for input() cmdline. Fixes #115

folke · Oct 25, 2022 · b645e30 · b645e30
1 parent 927e754
commit b645e30
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -73,6 +73,7 @@ Check the [wiki](https://github.com/folke/noice.nvim/wiki/Configuration-Recipes)
       filter = { pattern = "^:%s*!", icon = "$", lang = "bash" },
       lua = { pattern = "^:%s*lua%s+", icon = "", lang = "lua" },
       help = { pattern = "^:%s*h%s+", icon = "" },
+      input = {}, -- Used by input()
       -- lua = false, -- to disable a format, set to `false`
     },
   },
@@ -458,16 +459,21 @@ require("telescope").load_extension("noice")
 | **NoiceCmdlineIcon**                   | _DiagnosticSignInfo_             | Cmdline icon                                       |
 | **NoiceCmdlineIconCmdline**            | _DiagnosticSignInfo_             |                                                    |
 | **NoiceCmdlineIconFilter**             | _DiagnosticSignInfo_             |                                                    |
+| **NoiceCmdlineIconHelp**               | _DiagnosticSignInfo_             |                                                    |
 | **NoiceCmdlineIconIncRename**          | _DiagnosticSignInfo_             |                                                    |
+| **NoiceCmdlineIconInput**              | _DiagnosticSignInfo_             |                                                    |
 | **NoiceCmdlineIconLua**                | _DiagnosticSignInfo_             |                                                    |
 | **NoiceCmdlineIconSearch**             | _DiagnosticSignWarn_             | Cmdline search icon (`/` and `?`)                  |
 | **NoiceCmdlinePopup**                  | _Normal_                         | Normal for the cmdline popup                       |
 | **NoiceCmdlinePopupBorder**            | _DiagnosticSignInfo_             | Cmdline popup border                               |
 | **NoiceCmdlinePopupBorderCmdline**     | _DiagnosticSignInfo_             |                                                    |
 | **NoiceCmdlinePopupBorderFilter**      | _DiagnosticSignInfo_             |                                                    |
+| **NoiceCmdlinePopupBorderHelp**        | _DiagnosticSignInfo_             |                                                    |
 | **NoiceCmdlinePopupBorderIncRename**   | _DiagnosticSignInfo_             |                                                    |
+| **NoiceCmdlinePopupBorderInput**       | _DiagnosticSignInfo_             |                                                    |
 | **NoiceCmdlinePopupBorderLua**         | _DiagnosticSignInfo_             |                                                    |
 | **NoiceCmdlinePopupBorderSearch**      | _DiagnosticSignWarn_             | Cmdline popup border for search                    |
+| **NoiceCmdlinePrompt**                 | _Title_                          | prompt for input()                                 |
 | **NoiceCompletionItemKindClass**       | _NoiceCompletionItemKindDefault_ |                                                    |
 | **NoiceCompletionItemKindColor**       | _NoiceCompletionItemKindDefault_ |                                                    |
 | **NoiceCompletionItemKindConstant**    | _NoiceCompletionItemKindDefault_ |                                                    |

diff --git a/lua/noice/config/highlights.lua b/lua/noice/config/highlights.lua
@@ -11,6 +11,7 @@ M.defaults = {
   Cmdline = "MsgArea", -- Normal for the classic cmdline area at the bottom"
   CmdlineIcon = "DiagnosticSignInfo", -- Cmdline icon
   CmdlineIconSearch = "DiagnosticSignWarn", -- Cmdline search icon (`/` and `?`)
+  CmdlinePrompt = "Title", -- prompt for input()
   CmdlinePopup = "Normal", -- Normal for the cmdline popup
   CmdlinePopupBorder = "DiagnosticSignInfo", -- Cmdline popup border
   CmdlinePopupBorderSearch = "DiagnosticSignWarn", -- Cmdline popup border for search

diff --git a/lua/noice/config/init.lua b/lua/noice/config/init.lua
@@ -24,6 +24,7 @@ M.defaults = {
       filter = { pattern = "^:%s*!", icon = "$", lang = "bash" },
       lua = { pattern = "^:%s*lua%s+", icon = "", lang = "lua" },
       help = { pattern = "^:%s*h%s+", icon = "" },
+      input = {}, -- Used by input()
       -- lua = false, -- to disable a format, set to `false`
     },
   },

diff --git a/lua/noice/ui/cmdline.lua b/lua/noice/ui/cmdline.lua
@@ -66,9 +66,14 @@ end
 
 ---@return CmdlineFormat
 function Cmdline:get_format()
+  if self.state.prompt and self.state.prompt ~= "" then
+    return Config.options.cmdline.format.input
+  end
   local line = self.state.firstc .. self:get()
 
-  local formats = vim.tbl_values(Config.options.cmdline.format)
+  local formats = vim.tbl_values(vim.tbl_filter(function(f)
+    return f.pattern
+  end, Config.options.cmdline.format))
   table.sort(formats, function(a, b)
     return #a.pattern > #b.pattern
   end)
@@ -101,7 +106,7 @@ function Cmdline:format(message)
 
   -- FIXME: prompt
   if self.state.prompt ~= "" then
-    message:append(self.state.prompt)
+    message:append(self.state.prompt, "NoiceCmdlinePrompt")
   end
 
   if not format.conceal then