api: add API for themes

co-author: hlpr98 <hlpr98@gmail.com> (dict2hlattrs function)

orange is sus??

NOVEMBER DAWN

erase the lie that is redraw_later()

1 files changed, 65 insertions, 27 deletions

diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 9a9cc45c6b..62fabc74e5 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -73,9 +73,9 @@ struct hl_group {
   RgbValue sg_rgb_fg;           ///< RGB foreground color
   RgbValue sg_rgb_bg;           ///< RGB background color
   RgbValue sg_rgb_sp;           ///< RGB special color
-  uint8_t *sg_rgb_fg_name;      ///< RGB foreground color name
-  uint8_t *sg_rgb_bg_name;      ///< RGB background color name
-  uint8_t *sg_rgb_sp_name;      ///< RGB special color name
+  char *sg_rgb_fg_name;         ///< RGB foreground color name
+  char *sg_rgb_bg_name;         ///< RGB background color name
+  char *sg_rgb_sp_name;         ///< RGB special color name
 
   int sg_blend;                 ///< blend level (0-100 inclusive), -1 if unset
 };
@@ -3147,7 +3147,7 @@ static void syn_cmd_spell(exarg_T *eap, int syncing)
   }
 
   // assume spell checking changed, force a redraw
-  redraw_win_later(curwin, NOT_VALID);
+  redraw_later(curwin, NOT_VALID);
 }
 
 /// Handle ":syntax iskeyword" command.
@@ -3187,7 +3187,7 @@ static void syn_cmd_iskeyword(exarg_T *eap, int syncing)
       curbuf->b_p_isk = save_isk;
     }
   }
-  redraw_win_later(curwin, NOT_VALID);
+  redraw_later(curwin, NOT_VALID);
 }
 
 /*
@@ -6899,7 +6899,7 @@ void do_highlight(const char *line, const bool forceit, const bool init)
           }
         }
       } else if (strcmp(key, "GUIFG") == 0)   {
-        char_u **const namep = &HL_TABLE()[idx].sg_rgb_fg_name;
+        char **namep = &HL_TABLE()[idx].sg_rgb_fg_name;
 
         if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI)) {
           if (!init) {
@@ -6909,8 +6909,8 @@ void do_highlight(const char *line, const bool forceit, const bool init)
           if (*namep == NULL || STRCMP(*namep, arg) != 0) {
             xfree(*namep);
             if (strcmp(arg, "NONE") != 0) {
-              *namep = (char_u *)xstrdup(arg);
-              HL_TABLE()[idx].sg_rgb_fg = name_to_color((char_u *)arg);
+              *namep = xstrdup(arg);
+              HL_TABLE()[idx].sg_rgb_fg = name_to_color(arg);
             } else {
               *namep = NULL;
               HL_TABLE()[idx].sg_rgb_fg = -1;
@@ -6923,7 +6923,7 @@ void do_highlight(const char *line, const bool forceit, const bool init)
           normal_fg = HL_TABLE()[idx].sg_rgb_fg;
         }
       } else if (STRCMP(key, "GUIBG") == 0)   {
-        char_u **const namep = &HL_TABLE()[idx].sg_rgb_bg_name;
+        char **const namep = &HL_TABLE()[idx].sg_rgb_bg_name;
 
         if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI)) {
           if (!init) {
@@ -6933,8 +6933,8 @@ void do_highlight(const char *line, const bool forceit, const bool init)
           if (*namep == NULL || STRCMP(*namep, arg) != 0) {
             xfree(*namep);
             if (STRCMP(arg, "NONE") != 0) {
-              *namep = (char_u *)xstrdup(arg);
-              HL_TABLE()[idx].sg_rgb_bg = name_to_color((char_u *)arg);
+              *namep = xstrdup(arg);
+              HL_TABLE()[idx].sg_rgb_bg = name_to_color(arg);
             } else {
               *namep = NULL;
               HL_TABLE()[idx].sg_rgb_bg = -1;
@@ -6947,7 +6947,7 @@ void do_highlight(const char *line, const bool forceit, const bool init)
           normal_bg = HL_TABLE()[idx].sg_rgb_bg;
         }
       } else if (strcmp(key, "GUISP") == 0)   {
-        char_u **const namep = &HL_TABLE()[idx].sg_rgb_sp_name;
+        char **const namep = &HL_TABLE()[idx].sg_rgb_sp_name;
 
         if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI)) {
           if (!init) {
@@ -6957,8 +6957,8 @@ void do_highlight(const char *line, const bool forceit, const bool init)
           if (*namep == NULL || STRCMP(*namep, arg) != 0) {
             xfree(*namep);
             if (strcmp(arg, "NONE") != 0) {
-              *namep = (char_u *)xstrdup(arg);
-              HL_TABLE()[idx].sg_rgb_sp = name_to_color((char_u *)arg);
+              *namep = xstrdup(arg);
+              HL_TABLE()[idx].sg_rgb_sp = name_to_color(arg);
             } else {
               *namep = NULL;
               HL_TABLE()[idx].sg_rgb_sp = -1;
@@ -7152,13 +7152,32 @@ static void highlight_list_one(const int id)
     msg_outtrans(HL_TABLE()[HL_TABLE()[id - 1].sg_link - 1].sg_name);
   }
 
-  if (!didh)
-    highlight_list_arg(id, didh, LIST_STRING, 0, (char_u *)"cleared", "");
+  if (!didh) {
+    highlight_list_arg(id, didh, LIST_STRING, 0, "cleared", "");
+  }
   if (p_verbose > 0) {
     last_set_msg(sgp->sg_script_ctx);
   }
 }
 
+Dictionary get_global_hl_defs(void)
+{
+  Dictionary rv = ARRAY_DICT_INIT;
+  for (int i = 1; i <= highlight_ga.ga_len && !got_int; i++) {
+    Dictionary attrs = ARRAY_DICT_INIT;
+    struct hl_group *h = &HL_TABLE()[i - 1];
+    if (h->sg_attr > 0) {
+      attrs = hlattrs2dict(syn_attr2entry(h->sg_attr), true);
+    } else if (h->sg_link > 0) {
+      const char *link = (const char *)HL_TABLE()[h->sg_link - 1].sg_name;
+      PUT(attrs, "link", STRING_OBJ(cstr_to_string(link)));
+    }
+    PUT(rv, (const char *)h->sg_name, DICTIONARY_OBJ(attrs));
+  }
+
+  return rv;
+}
+
 /// Outputs a highlight when doing ":hi MyHighlight"
 ///
 /// @param type one of \ref LIST_XXX
@@ -7166,15 +7185,15 @@ static void highlight_list_one(const int id)
 /// @param sarg string used if \p type == LIST_STRING
 static bool highlight_list_arg(
     const int id, bool didh, const int type, int iarg,
-    char_u *const sarg, const char *const name)
+    char *const sarg, const char *const name)
 {
-  char_u buf[100];
+  char buf[100];
 
   if (got_int) {
     return false;
   }
   if (type == LIST_STRING ? (sarg != NULL) : (iarg != 0)) {
-    char_u *ts = buf;
+    char *ts = buf;
     if (type == LIST_INT) {
       snprintf((char *)buf, sizeof(buf), "%d", iarg - 1);
     } else if (type == LIST_STRING) {
@@ -7191,15 +7210,15 @@ static bool highlight_list_arg(
       }
     }
 
-    (void)syn_list_header(didh, (int)(vim_strsize(ts) + STRLEN(name) + 1), id,
-                          false);
+    (void)syn_list_header(didh, (int)(vim_strsize((char_u *)ts) + STRLEN(name)
+                                      + 1), id, false);
     didh = true;
     if (!got_int) {
       if (*name != NUL) {
         MSG_PUTS_ATTR(name, HL_ATTR(HLF_D));
         MSG_PUTS_ATTR("=", HL_ATTR(HLF_D));
       }
-      msg_outtrans(ts);
+      msg_outtrans((char_u *)ts);
     }
   }
   return didh;
@@ -7378,7 +7397,7 @@ static void set_hl_attr(int idx)
   at_en.rgb_sp_color = sgp->sg_rgb_sp_name ? sgp->sg_rgb_sp : -1;
   at_en.hl_blend = sgp->sg_blend;
 
-  sgp->sg_attr = hl_get_syn_attr(idx+1, at_en);
+  sgp->sg_attr = hl_get_syn_attr(0, idx+1, at_en);
 
   // a cursor style uses this syn_id, make sure its attribute is updated.
   if (cursor_mode_uses_syn_id(idx+1)) {
@@ -7541,11 +7560,17 @@ int syn_id2attr(int hl_id)
   struct hl_group     *sgp;
 
   hl_id = syn_get_final_id(hl_id);
-  sgp = &HL_TABLE()[hl_id - 1];             /* index is ID minus one */
+  int attr = ns_get_hl(-1, hl_id, false);
+  if (attr >= 0) {
+    return attr;
+  }
+  sgp = &HL_TABLE()[hl_id - 1];  // index is ID minus one
   return sgp->sg_attr;
 }
 
 
+
+
 /*
  * Translate a group ID to the final group ID (following links).
  */
@@ -7562,9 +7587,22 @@ int syn_get_final_id(int hl_id)
    * Look out for loops!  Break after 100 links.
    */
   for (count = 100; --count >= 0; ) {
-    sgp = &HL_TABLE()[hl_id - 1];           /* index is ID minus one */
-    if (sgp->sg_link == 0 || sgp->sg_link > highlight_ga.ga_len)
+    // ACHTUNG: when using "tmp" attribute (no link) the function might be
+    // called twice. it needs be smart enough to remember attr only to
+    // syn_id2attr time
+    int check = ns_get_hl(-1, hl_id, true);
+    if (check == 0) {
+      return 0;  // how dare! it broke the link!
+    } else if (check > 0) {
+      hl_id = check;
+      continue;
+    }
+
+
+    sgp = &HL_TABLE()[hl_id - 1];  // index is ID minus one
+    if (sgp->sg_link == 0 || sgp->sg_link > highlight_ga.ga_len) {
       break;
+    }
     hl_id = sgp->sg_link;
   }
 
@@ -8494,7 +8532,7 @@ color_name_table_T color_name_table[] = {
 ///
 /// @param[in] name string value to convert to RGB
 /// return the hex value or -1 if could not find a correct value
-RgbValue name_to_color(const char_u *name)
+RgbValue name_to_color(const char *name)
 {
 
   if (name[0] == '#' && isxdigit(name[1]) && isxdigit(name[2])