feat(main): add cmdline highlighting to allow for independent styling of the command (instead of forcing Statement)

lua/noice/config/highlights.lua

@@ -16,6 +16,7 @@ M.defaults = {
   CmdlinePopupBorder = "DiagnosticSignInfo", -- Cmdline popup border
   CmdlinePopupTitle = "DiagnosticSignInfo", -- Cmdline popup border
   CmdlinePopupBorderSearch = "DiagnosticSignWarn", -- Cmdline popup border for search
+  CmdlineCommand = "Statement", -- Highlight for the command (first word) in the cmdline
   Confirm = "Normal", -- Normal for the confirm view
   ConfirmBorder = "DiagnosticSignInfo", -- Border for the confirm view
   Cursor = "Cursor", -- Fake Cursor

lua/noice/text/syntax.lua

@@ -19,6 +19,7 @@ function M.highlight(buf, ns, range, lang)
     if not pcall(vim.cmd, string.format("syntax include %s syntax/%s.vim", group, lang)) then
       return
     end
+
     vim.cmd(
       string.format(
         "syntax region %s start=+\\%%%dl+ end=+\\%%%dl+ contains=%s keepend",
@@ -28,6 +29,23 @@ function M.highlight(buf, ns, range, lang)
         group
       )
     )
+
+    if lang == "vim" then
+      local ok = pcall(vim.cmd, string.format([[
+        syntax match NoiceCmdlineCommand /\v^\s*\w+/ display
+        highlight default link NoiceCmdlineCommand Statement
+      ]]))
+
+      if ok then
+        local line = vim.api.nvim_buf_get_lines(buf, 0, 1, false)[1]
+        if line then
+          local cmd_end = line:find("%s") or #line + 1
+          if cmd_end > 1 then
+            vim.api.nvim_buf_add_highlight(buf, ns, "NoiceCmdlineCommand", 0, 0, cmd_end - 1)
+          end
+        end
+      end
+    end
   end)
 end
 

lua/noice/ui/cmdline.lua

@@ -151,7 +151,24 @@ function Cmdline:format(message, text_only)
 
   local cmd = self:get():sub(self.offset)
 
-  message:append(cmd)
+  -- Apply custom command highlighting instead of appending the whole string at once
+  if format.lang == "vim" and cmd:match("^%s*%w+") then
+    -- Find the first word (the command)
+    local first_word_end = cmd:find("%s") or #cmd + 1
+    local command_part = cmd:sub(1, first_word_end-1)
+    local rest_part = first_word_end <= #cmd and cmd:sub(first_word_end) or ""
+
+    -- Highlight the command part with NoiceCmdlineCommand
+    message:append(command_part, "NoiceCmdlineCommand")
+
+    -- Append the rest normally
+    if rest_part ~= "" then
+      message:append(rest_part)
+    end
+  else
+    -- Original behavior for non-vim language or when there's no command
+    message:append(cmd)
+  end
 
   if format.lang then
     message:append(NoiceText.syntax(format.lang, 1, -vim.fn.strlen(cmd)))
@@ -318,6 +335,12 @@ function M.update()
   M.message:clear()
   local cmdline = M.last()
 
+  -- Force define NoiceCmdlineCommand highlight only if it doesn't exist
+  local exists = pcall(function() return vim.api.nvim_get_hl(0, {name = "NoiceCmdlineCommand"}).fg end)
+  if not exists then
+    vim.api.nvim_set_hl(0, "NoiceCmdlineCommand", { link = "Statement" })
+  end
+
   if cmdline then
     cmdline:format(M.message)
     if not M.real_cursor then