syntax,viml/parser/expressions: Add missing highlight groups

Also adjusts some names.

2 files changed, 43 insertions, 8 deletions

diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index f8a62423ce..d787790bc3 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -6029,6 +6029,8 @@ static const char *highlight_init_cmdline[] = {
 
   "default link NVimUnaryOperator NVimOperator",
   "default link NVimUnaryPlus NVimUnaryOperator",
+  "default link NVimUnaryMinus NVimUnaryOperator",
+  "default link NVimNot NVimUnaryOperator",
 
   "default link NVimBinaryOperator NVimOperator",
   "default link NVimComparison NVimBinaryOperator",
@@ -6036,6 +6038,11 @@ static const char *highlight_init_cmdline[] = {
   "default link NVimBinaryPlus NVimBinaryOperator",
   "default link NVimConcat NVimBinaryOperator",
   "default link NVimConcatOrSubscript NVimConcat",
+  "default link NVimOr NVimBinaryOperator",
+  "default link NVimAnd NVimBinaryOperator",
+  "default link NVimMultiplication NVimBinaryOperator",
+  "default link NVimDivision NVimBinaryOperator",
+  "default link NVimMod NVimBinaryOperator",
 
   "default link NVimTernary NVimOperator",
   "default link NVimTernaryColon NVimTernary",
@@ -6068,7 +6075,15 @@ static const char *highlight_init_cmdline[] = {
   "default link NVimRegister SpecialChar",
   "default link NVimNumber Number",
   "default link NVimFloat NVimNumber",
-  "default link NVimNumberPrefix SpecialChar",
+  "default link NVimNumberPrefix Type",
+
+  "default link NVimOptionSigil Type",
+  "default link NVimOptionName NVimIdentifier",
+  "default link NVimOptionScope NVimIdentifierScope",
+  "default link NVimOptionScopeDelimiter NVimIdentifierScopeDelimiter",
+
+  "default link NVimEnvironmentSigil NVimOptionSigil",
+  "default link NVimEnvironmentName NVimIdentifier",
 
   "default link NVimString String",
   "default link NVimStringBody NVimString",
@@ -6089,6 +6104,8 @@ static const char *highlight_init_cmdline[] = {
   "default link NVimFigureBrace NVimInternalError",
   "default link NVimSingleQuotedUnknownEscape NVimInternalError",
 
+  "default link NVimSpacing Normal",
+
   // NVimInvalid groups:
 
   "default link NVimInvalidSingleQuotedUnknownEscape NVimInternalError",
@@ -6099,6 +6116,8 @@ static const char *highlight_init_cmdline[] = {
 
   "default link NVimInvalidUnaryOperator NVimInvalidOperator",
   "default link NVimInvalidUnaryPlus NVimInvalidUnaryOperator",
+  "default link NVimInvalidUnaryMinus NVimInvalidUnaryOperator",
+  "default link NVimInvalidNot NVimInvalidUnaryOperator",
 
   "default link NVimInvalidBinaryOperator NVimInvalidOperator",
   "default link NVimInvalidComparison NVimInvalidBinaryOperator",
@@ -6106,6 +6125,11 @@ static const char *highlight_init_cmdline[] = {
   "default link NVimInvalidBinaryPlus NVimInvalidBinaryOperator",
   "default link NVimInvalidConcat NVimInvalidBinaryOperator",
   "default link NVimInvalidConcatOrSubscript NVimInvalidConcat",
+  "default link NVimInvalidOr NVimInvalidBinaryOperator",
+  "default link NVimInvalidAnd NVimInvalidBinaryOperator",
+  "default link NVimInvalidMultiplication NVimInvalidBinaryOperator",
+  "default link NVimInvalidDivision NVimInvalidBinaryOperator",
+  "default link NVimInvalidMod NVimInvalidBinaryOperator",
 
   "default link NVimInvalidTernary NVimInvalidOperator",
   "default link NVimInvalidTernaryColon NVimInvalidTernary",
@@ -6144,6 +6168,15 @@ static const char *highlight_init_cmdline[] = {
   "default link NVimInvalidFloat NVimInvalidNumber",
   "default link NVimInvalidNumberPrefix NVimInvalidNumber",
 
+  "default link NVimInvalidOptionSigil NVimInvalidIdentifier",
+  "default link NVimInvalidOptionName NVimInvalidIdentifier",
+  "default link NVimInvalidOptionScope NVimInvalidIdentifierScope",
+  "default link NVimInvalidOptionScopeDelimiter "
+      "NVimInvalidIdentifierScopeDelimiter",
+
+  "default link NVimInvalidEnvironmentSigil NVimInvalidOptionSigil",
+  "default link NVimInvalidEnvironmentName NVimInvalidIdentifier",
+
   // Invalid string bodies and specials are still highlighted as valid ones to
   // minimize the red area.
   "default link NVimInvalidString NVimInvalidValue",
@@ -6160,7 +6193,9 @@ static const char *highlight_init_cmdline[] = {
   "default link NVimInvalidDoubleQuotedEscape NVimInvalidStringSpecial",
   "default link NVimInvalidDoubleQuotedUnknownEscape NVimInvalidValue",
 
-  "default link NVimInvalidFigureBrace NVimInternalError",
+  "default link NVimInvalidFigureBrace NVimInvalidDelimiter",
+
+  "default link NVimInvalidSpacing ErrorMsg",
 };
 
 /// Create default links for NVim* highlight groups used for cmdline coloring
diff --git a/src/nvim/viml/parser/expressions.c b/src/nvim/viml/parser/expressions.c
index 615a59573f..f5bc547d54 100644
--- a/src/nvim/viml/parser/expressions.c
+++ b/src/nvim/viml/parser/expressions.c
@@ -1472,7 +1472,7 @@ static void parse_quoted_string(ParserState *const pstate,
   kvec_withinit_t(StringShift, 16) shifts;
   kvi_init(shifts);
   if (!is_double) {
-    viml_parser_highlight(pstate, token.start, 1, HL(SingleQuotedString));
+    viml_parser_highlight(pstate, token.start, 1, HL(SingleQuote));
     while (p < e) {
       const char *const chunk_e = memchr(p, '\'', (size_t)(e - p));
       if (chunk_e == NULL) {
@@ -1509,7 +1509,7 @@ static void parse_quoted_string(ParserState *const pstate,
       }
     }
   } else {
-    viml_parser_highlight(pstate, token.start, 1, HL(DoubleQuotedString));
+    viml_parser_highlight(pstate, token.start, 1, HL(DoubleQuote));
     for (p = s + 1; p < e; p++) {
       if (*p == '\\' && p + 1 < e) {
         p++;
@@ -1741,10 +1741,10 @@ static void parse_quoted_string(ParserState *const pstate,
   if (token.data.str.closed) {
     if (is_double) {
       viml_parser_highlight(pstate, shifted_pos(token.start, token.len - 1),
-                            1, HL(DoubleQuotedString));
+                            1, HL(DoubleQuote));
     } else {
       viml_parser_highlight(pstate, shifted_pos(token.start, token.len - 1),
-                            1, HL(SingleQuotedString));
+                            1, HL(SingleQuote));
     }
   }
   kvi_destroy(shifts);
@@ -2035,7 +2035,7 @@ viml_pexpr_parse_process_token:
         }
         viml_parser_highlight(
             pstate, shifted_pos(cur_token.start, scope_shift + 1),
-            cur_token.len - (scope_shift + 1), HL(Option));
+            cur_token.len - (scope_shift + 1), HL(OptionName));
         break;
       }
       case kExprLexEnv: {
@@ -2053,7 +2053,7 @@ viml_pexpr_parse_process_token:
         want_node = kENodeOperator;
         viml_parser_highlight(pstate, cur_token.start, 1, HL(EnvironmentSigil));
         viml_parser_highlight(pstate, shifted_pos(cur_token.start, 1),
-                              cur_token.len - 1, HL(Environment));
+                              cur_token.len - 1, HL(EnvironmentName));
         break;
       }
       case kExprLexNot: {