Merge pull request #14 from Jack-Punter/CursorTokenHighlight

Added cursor token occurrence highlighting.

Author: ryanfleury

4coder_fleury.cpp

@@ -139,6 +139,9 @@
 // - fleury_color_token_highlight: The color used to underline/highlight
 //   tokens that the cursor is over.
 //
+// - fleury_color_token_minor_highlight: The Color That is used for minor
+//   highlights. i.e. cursor token occurance underlines.
+//
 // - fleury_color_comment_user_name: The color used to highlight the
 //   username in comments.
 
@@ -174,6 +177,13 @@
 //   *compilation* window, it will display what that error is to the right of
 //   the line. Turn it off with "f4_disable_error_annotations" in your config
 //   file.
+//
+// - Cursor Identifier Highlight: The Identifier under the cursor is highlighted
+//   with an underline (using the fleury_color_token_highlight color). It also
+//   highlights all other occurances of the identifier (by string) that is
+//   visible and syntax highlighted (occurances are highlighted using 
+//   "fleury_color_token_minor_highlight". Turn the highlight of other occurances
+//   off with "f4_disable_cursor_token_occurance" in your config file.
 
 //- @f4_calc_intro Built-In Calculator/Plotting
 //

4coder_fleury_colors.h

@@ -22,6 +22,7 @@ CUSTOM_ID(colors, fleury_color_cursor_power_mode);
 CUSTOM_ID(colors, fleury_color_cursor_inactive);
 CUSTOM_ID(colors, fleury_color_plot_cycle);
 CUSTOM_ID(colors, fleury_color_token_highlight);
+CUSTOM_ID(colors, fleury_color_token_minor_highlight);
 CUSTOM_ID(colors, fleury_color_comment_user_name);
 CUSTOM_ID(colors, fleury_color_lego_grab);
 CUSTOM_ID(colors, fleury_color_lego_splat);

4coder_fleury_hooks.cpp

@@ -102,7 +102,65 @@ F4_RenderBuffer(Application_Links *app, View_ID view_id, Face_ID face_id,
         F4_RenderErrorAnnotations(app, buffer, text_layout_id, compilation_buffer);
     }
 
-    // NOTE(rjf): Token highlight
+    // NOTE(jack): Token Occurance Highlight
+    if (!def_get_config_b32(vars_save_string_lit("f4_disable_cursor_token_occurance"))) 
+    {
+        ProfileScope(app, "[Fleury] Token Occurance Highlight");
+        
+        // NOTE(jack): Get the active cursor's token string
+        Buffer_ID active_cursor_buffer = view_get_buffer(app, active_view, Access_Always);
+        i64 active_cursor_pos = view_get_cursor_pos(app, active_view);
+        Token_Array active_cursor_buffer_tokens = get_token_array_from_buffer(app, active_cursor_buffer);
+        Token_Iterator_Array active_cursor_it = token_iterator_pos(0, &active_cursor_buffer_tokens, active_cursor_pos);
+        Token *active_cursor_token = token_it_read(&active_cursor_it);
+        
+        String_Const_u8 active_cursor_string = string_u8_litexpr("");
+        if(active_cursor_token)
+        {
+            active_cursor_string = push_buffer_range(app, scratch, active_cursor_buffer, Ii64(active_cursor_token));
+            
+            // Loop the visible tokens
+            Range_i64 visible_range = text_layout_get_visible_range(app, text_layout_id);
+            i64 first_index = token_index_from_pos(&token_array, visible_range.first);
+            Token_Iterator_Array it = token_iterator_index(0, &token_array, first_index);
+            for (;;)
+            {
+                Token *token = token_it_read(&it);
+                if(!token || token->pos >= visible_range.one_past_last)
+                {
+                    break;
+                }
+                
+                if (token->kind == TokenBaseKind_Identifier)
+                {
+                    Range_i64 token_range = Ii64(token);
+                    String_Const_u8 token_string = push_buffer_range(app, scratch, buffer, token_range);
+                    
+                    // NOTE(jack) If this is the buffers cursor token, highlight it with an Underline
+                    if (range_contains(token_range, view_get_cursor_pos(app, view_id)))
+                    {
+                        F4_RenderRangeHighlight(app, view_id, text_layout_id,
+                                                token_range, F4_RangeHighlightKind_Underline);
+                    }
+                    // NOTE(jack): If the token matches the active buffer token. highlight it with a Minor Underline
+                    else if(active_cursor_token->kind == TokenBaseKind_Identifier && 
+                            string_match(token_string, active_cursor_string))
+                    {
+                        F4_RenderRangeHighlight(app, view_id, text_layout_id,
+                                                token_range, F4_RangeHighlightKind_MinorUnderline);
+                        
+                    } 
+                }
+                
+                if(!token_it_inc_non_whitespace(&it))
+                {
+                    break;
+                }
+            }
+        }
+    }
+    // NOTE(jack): if "f4_disable_cursor_token_occurance" is set, just highlight the cusror 
+    else
     {
         ProfileScope(app, "[Fleury] Token Highlight");
 

4coder_fleury_render_helpers.cpp

@@ -27,10 +27,20 @@ F4_RenderRangeHighlight(Application_Links *app, View_ID view_id, Text_Layout_ID
     total_range_rect.y0 = MinimumF32(range_start_rect.y0, range_end_rect.y0);
     total_range_rect.x1 = MaximumF32(range_start_rect.x1, range_end_rect.x1);
     total_range_rect.y1 = MaximumF32(range_start_rect.y1, range_end_rect.y1);
-    if(kind == F4_RangeHighlightKind_Underline)
-    {
-        total_range_rect.y0 = total_range_rect.y1 - 1.f;
-        total_range_rect.y1 += 1.f;
+    
+    ARGB_Color color = fcolor_resolve(fcolor_id(fleury_color_token_highlight));
+    
+    switch (kind) {
+        case F4_RangeHighlightKind_Underline: {
+            total_range_rect.y0 = total_range_rect.y1 - 1.f;
+            total_range_rect.y1 += 1.f;
+        } break;
+        
+        case F4_RangeHighlightKind_MinorUnderline: {
+            total_range_rect.y0 = total_range_rect.y1 - 1.f;
+            total_range_rect.y1 += 1.f;
+            color = fcolor_resolve(fcolor_id(fleury_color_token_minor_highlight));
+        }
     }
     draw_rectangle(app, total_range_rect, 4.f, color);
 }

4coder_fleury_render_helpers.h

@@ -7,6 +7,7 @@ enum F4_RangeHighlightKind
 {
     F4_RangeHighlightKind_Whole,
     F4_RangeHighlightKind_Underline,
+    F4_RangeHighlightKind_MinorUnderline,
 };
 
 struct F4_Flash

config.4coder

@@ -96,3 +96,4 @@ default_flags_sh  = "-g";
 // f4_disable_calc_comments = true;
 // f4_poscontext_draw_at_bottom_of_buffer = true;
 // f4_disable_poscontext = true;
+// f4_disable_cursor_token_occurance = true;