Merge pull request #28114 from echasnovski/builtin-hl-grey-gray

fix(highlight): add `Nvim{Light,Dark}Gray{1,2,3,4}` colors

3 files changed, 17 insertions, 9 deletions

diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 4b99fbface..5e95e00e45 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4776,11 +4776,11 @@ guisp={color-name}					*guisp*
 	Colors which define Nvim's default color scheme:
 	    NvimDarkBlue    NvimLightBlue
 	    NvimDarkCyan    NvimLightCyan
+	    NvimDarkGray1   NvimLightGray1
+	    NvimDarkGray2   NvimLightGray2
+	    NvimDarkGray3   NvimLightGray3
+	    NvimDarkGray4   NvimLightGray4
 	    NvimDarkGreen   NvimLightGreen
-	    NvimDarkGrey1   NvimLightGrey1
-	    NvimDarkGrey2   NvimLightGrey2
-	    NvimDarkGrey3   NvimLightGrey3
-	    NvimDarkGrey4   NvimLightGrey4
 	    NvimDarkMagenta NvimLightMagenta
 	    NvimDarkRed     NvimLightRed
 	    NvimDarkYellow  NvimLightYellow
diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c
index ca8c2999e1..79960b51e6 100644
--- a/src/nvim/highlight_group.c
+++ b/src/nvim/highlight_group.c
@@ -2472,7 +2472,7 @@ color_name_table_T color_name_table[] = {
   { "Cyan4", RGB_(0x0, 0x8b, 0x8b) },
   { "DarkBlue", RGB_(0x00, 0x00, 0x8b) },
   { "DarkCyan", RGB_(0x00, 0x8b, 0x8b) },
-  { "DarkGoldenRod", RGB_(0xb8, 0x86, 0x0b) },
+  { "DarkGoldenrod", RGB_(0xb8, 0x86, 0x0b) },
   { "DarkGoldenrod1", RGB_(0xff, 0xb9, 0xf) },
   { "DarkGoldenrod2", RGB_(0xee, 0xad, 0xe) },
   { "DarkGoldenrod3", RGB_(0xcd, 0x95, 0xc) },
@@ -2546,7 +2546,7 @@ color_name_table_T color_name_table[] = {
   { "Gold2", RGB_(0xee, 0xc9, 0x0) },
   { "Gold3", RGB_(0xcd, 0xad, 0x0) },
   { "Gold4", RGB_(0x8b, 0x75, 0x0) },
-  { "GoldenRod", RGB_(0xda, 0xa5, 0x20) },
+  { "Goldenrod", RGB_(0xda, 0xa5, 0x20) },
   { "Goldenrod1", RGB_(0xff, 0xc1, 0x25) },
   { "Goldenrod2", RGB_(0xee, 0xb4, 0x22) },
   { "Goldenrod3", RGB_(0xcd, 0x9b, 0x1d) },
@@ -2815,7 +2815,7 @@ color_name_table_T color_name_table[] = {
   { "LightGoldenrod2", RGB_(0xee, 0xdc, 0x82) },
   { "LightGoldenrod3", RGB_(0xcd, 0xbe, 0x70) },
   { "LightGoldenrod4", RGB_(0x8b, 0x81, 0x4c) },
-  { "LightGoldenRodYellow", RGB_(0xfa, 0xfa, 0xd2) },
+  { "LightGoldenrodYellow", RGB_(0xfa, 0xfa, 0xd2) },
   { "LightGray", RGB_(0xd3, 0xd3, 0xd3) },
   { "LightGreen", RGB_(0x90, 0xee, 0x90) },
   { "LightGrey", RGB_(0xd3, 0xd3, 0xd3) },
@@ -2900,6 +2900,10 @@ color_name_table_T color_name_table[] = {
   // for foreground in light/dark color scheme.
   { "NvimDarkBlue", RGB_(0x00, 0x4c, 0x73) },
   { "NvimDarkCyan", RGB_(0x00, 0x73, 0x73) },
+  { "NvimDarkGray1", RGB_(0x07, 0x08, 0x0d) },
+  { "NvimDarkGray2", RGB_(0x14, 0x16, 0x1b) },
+  { "NvimDarkGray3", RGB_(0x2c, 0x2e, 0x33) },
+  { "NvimDarkGray4", RGB_(0x4f, 0x52, 0x58) },
   { "NvimDarkGreen", RGB_(0x00, 0x55, 0x23) },
   { "NvimDarkGrey1", RGB_(0x07, 0x08, 0x0d) },
   { "NvimDarkGrey2", RGB_(0x14, 0x16, 0x1b) },
@@ -2910,6 +2914,10 @@ color_name_table_T color_name_table[] = {
   { "NvimDarkYellow", RGB_(0x6b, 0x53, 0x00) },
   { "NvimLightBlue", RGB_(0xa6, 0xdb, 0xff) },
   { "NvimLightCyan", RGB_(0x8c, 0xf8, 0xf7) },
+  { "NvimLightGray1", RGB_(0xee, 0xf1, 0xf8) },
+  { "NvimLightGray2", RGB_(0xe0, 0xe2, 0xea) },
+  { "NvimLightGray3", RGB_(0xc4, 0xc6, 0xcd) },
+  { "NvimLightGray4", RGB_(0x9b, 0x9e, 0xa4) },
   { "NvimLightGreen", RGB_(0xb3, 0xf6, 0xc0) },
   { "NvimLightGrey1", RGB_(0xee, 0xf1, 0xf8) },
   { "NvimLightGrey2", RGB_(0xe0, 0xe2, 0xea) },
@@ -2940,7 +2948,7 @@ color_name_table_T color_name_table[] = {
   { "Orchid2", RGB_(0xee, 0x7a, 0xe9) },
   { "Orchid3", RGB_(0xcd, 0x69, 0xc9) },
   { "Orchid4", RGB_(0x8b, 0x47, 0x89) },
-  { "PaleGoldenRod", RGB_(0xee, 0xe8, 0xaa) },
+  { "PaleGoldenrod", RGB_(0xee, 0xe8, 0xaa) },
   { "PaleGreen", RGB_(0x98, 0xfb, 0x98) },
   { "PaleGreen1", RGB_(0x9a, 0xff, 0x9a) },
   { "PaleGreen2", RGB_(0x90, 0xee, 0x90) },
diff --git a/src/nvim/highlight_group.h b/src/nvim/highlight_group.h
index 47d58d20f2..edf5fbde16 100644
--- a/src/nvim/highlight_group.h
+++ b/src/nvim/highlight_group.h
@@ -12,7 +12,7 @@ typedef struct {
   char *name;
   RgbValue color;
 } color_name_table_T;
-extern color_name_table_T color_name_table[700];
+extern color_name_table_T color_name_table[708];
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "highlight_group.h.generated.h"