1 files changed, 31 insertions, 46 deletions

diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 945172564b..0ce8d6e16f 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -2485,10 +2485,9 @@ update_si_end (
  */
 static void push_current_state(int idx)
 {
-  ga_grow(&current_state, 1);
-  memset(&CUR_STATE(current_state.ga_len), 0, sizeof(stateitem_T));
-  CUR_STATE(current_state.ga_len).si_idx = idx;
-  ++current_state.ga_len;
+  stateitem_T *p = GA_APPEND_VIA_PTR(stateitem_T, &current_state);
+  memset(p, 0, sizeof(*p));
+  p->si_idx = idx;
 }
 
 /*
@@ -4279,28 +4278,26 @@ syn_cmd_match (
     if (!ends_excmd(*rest) || eap->skip)
       rest = NULL;
     else {
-      ga_grow(&curwin->w_s->b_syn_patterns, 1);
       if ((syn_id = syn_check_group(arg, (int)(group_name_end - arg))) != 0) {
         syn_incl_toplevel(syn_id, &syn_opt_arg.flags);
         /*
          * Store the pattern in the syn_items list
          */
-        int idx = curwin->w_s->b_syn_patterns.ga_len;
-        SYN_ITEMS(curwin->w_s)[idx] = item;
-        SYN_ITEMS(curwin->w_s)[idx].sp_syncing = syncing;
-        SYN_ITEMS(curwin->w_s)[idx].sp_type = SPTYPE_MATCH;
-        SYN_ITEMS(curwin->w_s)[idx].sp_syn.id = syn_id;
-        SYN_ITEMS(curwin->w_s)[idx].sp_syn.inc_tag = current_syn_inc_tag;
-        SYN_ITEMS(curwin->w_s)[idx].sp_flags = syn_opt_arg.flags;
-        SYN_ITEMS(curwin->w_s)[idx].sp_sync_idx = sync_idx;
-        SYN_ITEMS(curwin->w_s)[idx].sp_cont_list = syn_opt_arg.cont_list;
-        SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list =
-          syn_opt_arg.cont_in_list;
-        SYN_ITEMS(curwin->w_s)[idx].sp_cchar = conceal_char;
+        synpat_T *spp = GA_APPEND_VIA_PTR(synpat_T,
+                                          &curwin->w_s->b_syn_patterns);
+        *spp = item;
+        spp->sp_syncing = syncing;
+        spp->sp_type = SPTYPE_MATCH;
+        spp->sp_syn.id = syn_id;
+        spp->sp_syn.inc_tag = current_syn_inc_tag;
+        spp->sp_flags = syn_opt_arg.flags;
+        spp->sp_sync_idx = sync_idx;
+        spp->sp_cont_list = syn_opt_arg.cont_list;
+        spp->sp_syn.cont_in_list = syn_opt_arg.cont_in_list;
+        spp->sp_cchar = conceal_char;
         if (syn_opt_arg.cont_in_list != NULL)
           curwin->w_s->b_syn_containedin = TRUE;
-        SYN_ITEMS(curwin->w_s)[idx].sp_next_list = syn_opt_arg.next_list;
-        ++curwin->w_s->b_syn_patterns.ga_len;
+        spp->sp_next_list = syn_opt_arg.next_list;
 
         /* remember that we found a match for syncing on */
         if (syn_opt_arg.flags & (HL_SYNC_HERE|HL_SYNC_THERE))
@@ -4755,16 +4752,12 @@ static int syn_add_cluster(char_u *name)
     return 0;
   }
 
-  /*
-   * Make room for at least one other cluster entry.
-   */
-  ga_grow(&curwin->w_s->b_syn_clusters, 1);
-
-  memset(&(SYN_CLSTR(curwin->w_s)[len]), 0, sizeof(syn_cluster_T));
-  SYN_CLSTR(curwin->w_s)[len].scl_name = name;
-  SYN_CLSTR(curwin->w_s)[len].scl_name_u = vim_strsave_up(name);
-  SYN_CLSTR(curwin->w_s)[len].scl_list = NULL;
-  ++curwin->w_s->b_syn_clusters.ga_len;
+  syn_cluster_T *scp = GA_APPEND_VIA_PTR(syn_cluster_T,
+                                         &curwin->w_s->b_syn_clusters);
+  memset(scp, 0, sizeof(*scp));
+  scp->scl_name = name;
+  scp->scl_name_u = vim_strsave_up(name);
+  scp->scl_list = NULL;
 
   if (STRICMP(name, "Spell") == 0)
     curwin->w_s->b_spell_cluster_id = len + SYNID_CLUSTER;
@@ -5701,8 +5694,7 @@ static void syntime_report(void)
   for (int idx = 0; idx < curwin->w_s->b_syn_patterns.ga_len; ++idx) {
     spp = &(SYN_ITEMS(curwin->w_s)[idx]);
     if (spp->sp_time.count > 0) {
-      ga_grow(&ga, 1);
-      p = ((time_entry_T *)ga.ga_data) + ga.ga_len;
+      p = GA_APPEND_VIA_PTR(time_entry_T, &ga);
       p->total = spp->sp_time.total;
       profile_add(&total_total, &spp->sp_time.total);
       p->count = spp->sp_time.count;
@@ -5713,7 +5705,6 @@ static void syntime_report(void)
       p->average = tm;
       p->id = spp->sp_syn.id;
       p->pattern = spp->sp_pattern;
-      ++ga.ga_len;
     }
   }
 
@@ -6810,10 +6801,8 @@ static int get_attr_entry(garray_T *table, attrentry_T *aep)
   /*
    * This is a new combination of colors and font, add an entry.
    */
-  ga_grow(table, 1);
-
-  taep = &(((attrentry_T *)table->ga_data)[table->ga_len]);
-  memset(taep, 0, sizeof(attrentry_T));
+  taep = GA_APPEND_VIA_PTR(attrentry_T, table);
+  memset(taep, 0, sizeof(*taep));
   taep->ae_attr = aep->ae_attr;
   if (table == &term_attr_table) {
     if (aep->ae_u.term.start == NULL)
@@ -6828,7 +6817,7 @@ static int get_attr_entry(garray_T *table, attrentry_T *aep)
     taep->ae_u.cterm.fg_color = aep->ae_u.cterm.fg_color;
     taep->ae_u.cterm.bg_color = aep->ae_u.cterm.bg_color;
   }
-  ++table->ga_len;
+
   return table->ga_len - 1 + ATTR_OFF;
 }
 
@@ -7319,15 +7308,11 @@ static int syn_add_group(char_u *name)
     return 0;
   }
 
-  /*
-   * Make room for at least one other syntax_highlight entry.
-   */
-  ga_grow(&highlight_ga, 1);
-
-  memset(&(HL_TABLE()[highlight_ga.ga_len]), 0, sizeof(struct hl_group));
-  HL_TABLE()[highlight_ga.ga_len].sg_name = name;
-  HL_TABLE()[highlight_ga.ga_len].sg_name_u = vim_strsave_up(name);
-  ++highlight_ga.ga_len;
+  // Append another syntax_highlight entry.
+  struct hl_group* hlgp = GA_APPEND_VIA_PTR(struct hl_group, &highlight_ga);
+  memset(hlgp, 0, sizeof(*hlgp));
+  hlgp->sg_name = name;
+  hlgp->sg_name_u = vim_strsave_up(name);
 
   return highlight_ga.ga_len;               /* ID is index plus one */
 }