From 73492010b3d3450d27915073473a537bb45fa7bd Mon Sep 17 00:00:00 2001
From: Peter Slattery <slattery.peter.j@gmail.com>
Date: Mon, 7 Jul 2025 19:39:30 -0700
Subject: [PATCH] render_buffer no longer overwrites the cpp token coloring for
 keywords

---
 code/custom/4coder_default_hooks.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/custom/4coder_default_hooks.cpp b/code/custom/4coder_default_hooks.cpp
index 9e7d306d..9aeaeba7 100644
--- a/code/custom/4coder_default_hooks.cpp
+++ b/code/custom/4coder_default_hooks.cpp
@@ -390,7 +390,6 @@ function void default_render_buffer(
           break;
         }
 
-        ARGB_Color token_color = color_default;
         Token *token = token_it_read(&it);
         if (token->kind == TokenBaseKind_Operator ||
             token->kind == TokenBaseKind_ScopeOpen ||
@@ -399,7 +398,7 @@ function void default_render_buffer(
             token->kind == TokenBaseKind_ParentheticalClose ||
             token->kind == TokenBaseKind_StatementClose)
         {
-          token_color = color_operator;
+          paint_text_color(app, text_layout_id, Ii64_size(token->pos, token->size), color_operator);
         }
         else
         {
@@ -416,6 +415,7 @@ function void default_render_buffer(
 
           if (note != 0)
           {
+            ARGB_Color token_color = color_default;
             switch (note->note_kind)
             {
               case CodeIndexNote_Type: token_color = color_type; break;
@@ -423,9 +423,9 @@ function void default_render_buffer(
               case CodeIndexNote_Macro: token_color = color_macro; break;
               default: {} break;
             }
+            paint_text_color(app, text_layout_id, Ii64_size(token->pos, token->size), token_color);
           }
         }
-        paint_text_color(app, text_layout_id, Ii64_size(token->pos, token->size), token_color);
       }
     }
     else