Merge remote-tracking branch 'upstream/master' into BraceHighlightTweaks

Author: Jack-Punter

4coder_fleury.cpp

@@ -14,7 +14,7 @@
 
 //~ @f4_features 4coder Fleury Feature/Option List
 
-//~ @f4_lang_intro Multi-Language Support
+//- @f4_lang_intro Multi-Language Support
 //
 // This custom layer has been tweaked to allow for better multi-language support
 // in 4coder. It isn't perfect and will not support all languages, but it works
@@ -79,7 +79,7 @@
 // 3. Add the info for your language to the 4coder_fleury_lang_list.h file.
 // More information is in that file.
 
-//~ @f4_colors_intro Syntax Highlighting and Color Additions
+//- @f4_colors_intro Syntax Highlighting and Color Additions
 //
 // 4coder provides very basic syntax highlighting, but this layer implements
 // some more features, particularly ones that rely on the code index. There
@@ -139,11 +139,17 @@
 // - 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.
+// 
+// - fleury_color_error_annotation: Text color used for the inline error
+//   message string with F4_RenderErrorAnnotations
 
 
-//~ @f4_render_intro Rendering Features
+//- @f4_render_intro Rendering Features
 //
 // Many of the features in this layer are just rendering tweaks/improvements to
 // 4coder's defaults. Below is a list of features and some options for them.
@@ -174,8 +180,15 @@
 //   *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
+//- @f4_calc_intro Built-In Calculator/Plotting
 //
 // This custom layer includes a tiny little calculator language, which has
 // plotting capabilities. It has a few features that comprise it all:
@@ -191,7 +204,7 @@
 //   to. The entire buffer is interpreted as calculator code, and it will
 //   do all the same things that calc comments do.
 
-//~ @f4_pos_context_intro Language Position-Context Tooltips
+//- @f4_pos_context_intro Language Position-Context Tooltips
 //
 // This feature shows tooltips relating to the current cursor position, as it
 // adheres to the programming language of the buffer in question. For example,
@@ -206,7 +219,7 @@
 // Alternatively, you can turn the whole thing off with "f4_disable_poscontext"
 // in your config file.
 
-//~ @f4_commands
+//- @f4_commands
 //
 // There are a lot of commands you can bind in your bindings.4coder file that
 // have been helpful for me and others. Here is a list of the most useful ones.
@@ -238,6 +251,8 @@
 //   so your laptop doesn't get hot. Set its default value with "f4_battery_saver"
 //   in your config file.
 //
+// - f4_disable_cursor_trails: Turns off cursor animation.
+//
 // - f4_toggle_compilation_expand: Expands/shrinks the *compilation* panel at the
 //   bottom of the screen. Bind this to a key that you want to press when you are
 //   checking out the output of a build, and be sure to send your build commands
@@ -339,6 +354,19 @@
 // DONE:
 //
 
+//~ TODO FOR CASEY
+//
+// [X] Active pane frame color/thickness control in Fleury config options, to allow turning it
+//     off entirely or changing the color
+//     done: f4_margin_size and f4_margin_use_mode_color
+// [X] Inactive pane color cursor differences
+// [X] Filenames to disambiguate indexed stuff with the same name
+// [X] Way to get to forward decl for an indexed thing too
+//     done: use go-to-definition again, at the definition site, and it should cycle between
+//     all the definitions
+// [ ] Fix clipboard stuff
+// [ ] CPM counter shenanigans
+
 //~ TODO PLOTS
 // [ ] Un-Bust Histograms
 // [ ] Fix plot clip rect bugs when the plot is not 100% in the visible range
@@ -347,7 +375,7 @@
 // [ ] Plots and Calc are so coupled and I hate it, please rewrite or something
 
 //~ TODO META
-// [ ] Project-wide todo list (by searching for TODO and DONE comments, lister for toggling)
+// [X] Project-wide todo list (by searching for TODO and DONE comments, lister for toggling)
 // [ ] Project switcher
 // [ ] Plan + do modal input scheme... Identifier-mode, text-mode, semantics mode, search mode...?
 
@@ -388,6 +416,7 @@ typedef int socklen_t;
 #include "4coder_fleury_cursor.h"
 #include "4coder_fleury_plot.h"
 #include "4coder_fleury_calc.h"
+#include "4coder_fleury_lego.h"
 #include "4coder_fleury_pos_context_tooltips.h"
 #include "4coder_fleury_code_peek.h"
 #include "4coder_fleury_recent_files.h"
@@ -412,6 +441,7 @@ typedef int socklen_t;
 #include "4coder_fleury_cursor.cpp"
 #include "4coder_fleury_plot.cpp"
 #include "4coder_fleury_calc.cpp"
+#include "4coder_fleury_lego.cpp"
 #include "4coder_fleury_pos_context_tooltips.cpp"
 #include "4coder_fleury_code_peek.cpp"
 #include "4coder_fleury_recent_files.cpp"
@@ -475,7 +505,6 @@ void custom_layer_init(Application_Links *app)
     }
 }
 
-
 //~ NOTE(rjf): @f4_startup Whenever 4coder's core is ready for the custom layer to start up,
 // this is called.
 
@@ -513,7 +542,6 @@ CUSTOM_DOC("Fleury startup event")
 
     //~ NOTE(rjf): Open special buffers.
     {
-        
         // NOTE(rjf): Open compilation buffer.
         {
             Buffer_ID comp_buffer = create_buffer(app, string_u8_litexpr("*compilation*"),
@@ -523,6 +551,15 @@ CUSTOM_DOC("Fleury startup event")
             buffer_set_setting(app, comp_buffer, BufferSetting_ReadOnly, true);
         }
 
+        // NOTE(rjf): Open lego buffer.
+        {
+            Buffer_ID comp_buffer = create_buffer(app, string_u8_litexpr("*lego*"),
+                                                  BufferCreate_NeverAttachToFile |
+                                                  BufferCreate_AlwaysNew);
+            buffer_set_setting(app, comp_buffer, BufferSetting_Unimportant, true);
+            buffer_set_setting(app, comp_buffer, BufferSetting_ReadOnly, true);
+        }
+        
         // NOTE(rjf): Open calc buffer.
         {
             Buffer_ID calc_buffer = create_buffer(app, string_u8_litexpr("*calc*"),
@@ -564,10 +601,11 @@ CUSTOM_DOC("Fleury startup event")
             Face_Metrics metrics = get_face_metrics(app, face_id);
             view_set_split_pixel_size(app, compilation_view, (i32)(metrics.line_height*4.f));
             view_set_passive(app, compilation_view, true);
+            global_compilation_view = compilation_view;
+            view_set_buffer(app, compilation_view, comp_id, 0);
         }
-        view_set_buffer(app, compilation_view, comp_id, 0);
+        
         view_set_active(app, view);
-        global_compilation_view = compilation_view;
 
         // NOTE(rjf): Right Panel
         open_panel_vsplit(app);
@@ -588,6 +626,11 @@ CUSTOM_DOC("Fleury startup event")
         }
     }
 
+    //~ NOTE(rjf): Set misc options.
+    {
+        global_battery_saver = def_get_config_b32(vars_save_string_lit("f4_battery_saver"));
+    }
+    
     //~ NOTE(rjf): Initialize audio.
     {
         def_audio_init();

4coder_fleury_base_commands.cpp

@@ -116,47 +116,82 @@ F4_GoToDefinition(Application_Links *app, F4_Index_Note *note, b32 same_panel)
         Buffer_Scroll scroll = view_get_buffer_scroll(app, view);
         scroll.position.line_number = line_number;
         scroll.target.line_number = line_number;
-        scroll.target.pixel_shift.y = -view_height*0.5f;
+        scroll.position.pixel_shift.y = scroll.target.pixel_shift.y = -view_height*0.5f;
         view_set_buffer_scroll(app, view, scroll, SetBufferScroll_SnapCursorIntoView);
         view_set_cursor(app, view, seek_pos(note->range.min));
         view_set_mark(app, view, seek_pos(note->range.min));
     }
 }
 
 internal F4_Index_Note *
-F4_FindMostIntuitiveNoteInDuplicateChain(F4_Index_Note *note)
+F4_FindMostIntuitiveNoteInDuplicateChain(F4_Index_Note *note, Buffer_ID cursor_buffer, i64 cursor_pos)
 {
-    if(note && note->flags & F4_Index_NoteFlag_Prototype)
+    F4_Index_Note *result = note;
+    if(note != 0)
     {
+        F4_Index_Note *best_note_based_on_cursor = 0;
         for(F4_Index_Note *candidate = note; candidate; candidate = candidate->next)
         {
-            if(!(candidate->flags & F4_Index_NoteFlag_Prototype))
+            F4_Index_File *file = candidate->file;
+            if(file != 0)
             {
-                note = candidate;
-                break;
+                if(cursor_buffer == file->buffer &&
+                   candidate->range.min <= cursor_pos && cursor_pos <= candidate->range.max)
+                {
+                    if(candidate->next)
+                    {
+                        best_note_based_on_cursor = candidate->next;
+                        break;
+                    }
+                    else
+                    {
+                        best_note_based_on_cursor = note;
+                        break;
+                    }
+                }
+            }
+        }
+        
+        if(best_note_based_on_cursor)
+        {
+            result = best_note_based_on_cursor;
+        }
+        else if(note->flags & F4_Index_NoteFlag_Prototype)
+        {
+            for(F4_Index_Note *candidate = note; candidate; candidate = candidate->next)
+            {
+                if(!(candidate->flags & F4_Index_NoteFlag_Prototype))
+                {
+                    result = candidate;
+                    break;
+                }
             }
         }
     }
-    return note;
+    return result;
 }
 
 CUSTOM_COMMAND_SIG(f4_go_to_definition)
 CUSTOM_DOC("Goes to the definition of the identifier under the cursor.")
 {
+    View_ID view = get_active_view(app, Access_Always);
+    Buffer_ID buffer = view_get_buffer(app, view, Access_Always);
     Scratch_Block scratch(app);
     String_Const_u8 string = push_token_or_word_under_active_cursor(app, scratch);
     F4_Index_Note *note = F4_Index_LookupNote(string);
-    note = F4_FindMostIntuitiveNoteInDuplicateChain(note);
+    note = F4_FindMostIntuitiveNoteInDuplicateChain(note, buffer, view_get_cursor_pos(app, view));
     F4_GoToDefinition(app, note, 0);
 }
 
 CUSTOM_COMMAND_SIG(f4_go_to_definition_same_panel)
 CUSTOM_DOC("Goes to the definition of the identifier under the cursor in the same panel.")
 {
+    View_ID view = get_active_view(app, Access_Always);
+    Buffer_ID buffer = view_get_buffer(app, view, Access_Always);
     Scratch_Block scratch(app);
     String_Const_u8 string = push_token_or_word_under_active_cursor(app, scratch);
     F4_Index_Note *note = F4_Index_LookupNote(string);
-    note = F4_FindMostIntuitiveNoteInDuplicateChain(note);
+    note = F4_FindMostIntuitiveNoteInDuplicateChain(note, buffer, view_get_cursor_pos(app, view));
     F4_GoToDefinition(app, note, 1);
 }
 
@@ -172,6 +207,8 @@ _F4_PushListerOptionForNote(Application_Links *app, Arena *arena, Lister *lister
         jump->buffer = buffer;
         jump->pos = note->range.first;
 
+        String_Const_u8 buffer_name = push_buffer_unique_name(app, arena, buffer);
+        String_Const_u8 name = push_stringf(arena, "[%.*s] %.*s", string_expand(buffer_name), string_expand(note->string));
         String_Const_u8 sort = S8Lit("");
         switch(note->kind)
         {
@@ -209,7 +246,7 @@ _F4_PushListerOptionForNote(Application_Links *app, Arena *arena, Lister *lister
 
             default: break;
         }
-        lister_add_item(lister, note->string, sort, jump, 0);
+        lister_add_item(lister, name, sort, jump, 0);
     }
 }
 
@@ -403,11 +440,11 @@ CUSTOM_DOC("Open a project by navigating to the project file.")
             if (HasFlag(attribs.flags, FileAttribute_IsDirectory)){
                 set_hot_directory(app, full_file_name);
                 continue;
-			}
-			if (string_looks_like_drive_letter(file_name)){
-				set_hot_directory(app, file_name);
-				continue;
-			}
+            }
+            if (string_looks_like_drive_letter(file_name)){
+                set_hot_directory(app, file_name);
+                continue;
+            }
             if (query_create_folder(app, file_name)){
                 set_hot_directory(app, full_file_name);
                 continue;
@@ -524,7 +561,6 @@ CUSTOM_DOC("Sets up a blank 4coder project provided some user folder.")
     load_project(app);
 }
 
-
 function i64
 F4_Boundary_TokenAndWhitespace(Application_Links *app, Buffer_ID buffer, 
                                Side side, Scan_Direction direction, i64 pos)
@@ -1145,12 +1181,12 @@ CUSTOM_DOC("Interactively open a file out of the file system, filtered to files
             {
                 set_hot_directory(app, full_file_name);
                 continue;
-			}
-			if(string_looks_like_drive_letter(file_name))
+            }
+            if(string_looks_like_drive_letter(file_name))
             {
-				set_hot_directory(app, file_name);
-				continue;
-			}
+                set_hot_directory(app, file_name);
+                continue;
+            }
             if(query_create_folder(app, file_name))
             {
                 set_hot_directory(app, full_file_name);

4coder_fleury_bindings.cpp

@@ -103,8 +103,10 @@ F4_SetAbsolutelyNecessaryBindings(Mapping *mapping)
     SelectMap(code_map_id);
     ParentMap(file_map_id);
     BindTextInput(fleury_write_text_and_auto_indent);
-	
-	SelectMap(global_command_map_id);
+    BindMouse(f4_lego_click_store_token_1, MouseCode_Right);
+    BindMouse(f4_lego_click_store_token_2, MouseCode_Middle);
+    
+    SelectMap(global_command_map_id);
 	ParentMap(global_map_id);
 	GlobalCommandMapReroute[0].From = global_map_id;
 	GlobalCommandMapReroute[0].To = global_command_map_id;