runtime/syntax: Fix highlighting of augroup contents (#9328)

Comparing `vimCommand` from Vim's runtime/syntax/vim.vim, one can see
that "augroup" and similar commands are conspicuously missing. They are
handled specially (`vimAugroupKey`, `vimAutoCmd`).

Excluding them from the generated `vimCommand` keyword list, fixes their
highlighting.

closes #9327

1 files changed, 12 insertions, 3 deletions

diff --git a/scripts/genvimvim.lua b/scripts/genvimvim.lua
index 947aef6cb5..806533f2ff 100644
--- a/scripts/genvimvim.lua
+++ b/scripts/genvimvim.lua
@@ -14,7 +14,7 @@ package.path = nvimsrcdir .. '/?.lua;' .. package.path
 local lld = {}
 local syn_fd = io.open(syntax_file, 'w')
 lld.line_length = 0
-local w = function(s)
+local function w(s)
   syn_fd:write(s)
   if s:find('\n') then
     lld.line_length = #(s:gsub('.*\n', ''))
@@ -27,7 +27,7 @@ local options = require('options')
 local auevents = require('auevents')
 local ex_cmds = require('ex_cmds')
 
-local cmd_kw = function(prev_cmd, cmd)
+local function cmd_kw(prev_cmd, cmd)
   if not prev_cmd then
     return cmd:sub(1, 1) .. '[' .. cmd:sub(2) .. ']'
   else
@@ -43,6 +43,15 @@ local cmd_kw = function(prev_cmd, cmd)
   end
 end
 
+-- Exclude these from the vimCommand keyword list, they are handled specially
+-- in syntax/vim.vim (vimAugroupKey, vimAutoCmd). #9327
+local function is_autocmd_cmd(cmd)
+  return (cmd == 'augroup'
+          or cmd == 'autocmd'
+          or cmd == 'doautocmd'
+          or cmd == 'doautoall')
+end
+
 vimcmd_start = 'syn keyword vimCommand contained '
 w(vimcmd_start)
 local prev_cmd = nil
@@ -51,7 +60,7 @@ for _, cmd_desc in ipairs(ex_cmds) do
     w('\n' .. vimcmd_start)
   end
   local cmd = cmd_desc.command
-  if cmd:match('%w') and cmd ~= 'z' then
+  if cmd:match('%w') and cmd ~= 'z' and not is_autocmd_cmd(cmd) then
     w(' ' .. cmd_kw(prev_cmd, cmd))
   end
   prev_cmd = cmd