cleaned up the indentation code some more

4coder_custom.h

@@ -390,6 +390,7 @@ struct Application_Links;
 #define GET_ACTIVE_VIEW_SIG(n) View_Summary n(Application_Links *app)
 
 #define REFRESH_VIEW_SIG(n) int n(Application_Links *app, View_Summary *view)
+#define VIEW_COMPUTE_CURSOR_SIG(n) Full_Cursor n(Application_Links *app, View_Summary *view, Buffer_Seek seek)
 #define VIEW_SET_CURSOR_SIG(n) int n(Application_Links *app, View_Summary *view, Buffer_Seek seek, int set_preferred_x)
 #define VIEW_SET_MARK_SIG(n) int n(Application_Links *app, View_Summary *view, Buffer_Seek seek)
 #define VIEW_SET_HIGHLIGHT_SIG(n) int n(Application_Links *app, View_Summary *view, int start, int end, int turn_on)
@@ -472,6 +473,7 @@ extern "C"{
     typedef GET_ACTIVE_VIEW_SIG(Get_Active_View_Function);
     
     typedef REFRESH_VIEW_SIG(Refresh_View_Function);
+    typedef VIEW_COMPUTE_CURSOR_SIG(View_Compute_Cursor_Function);
     typedef VIEW_SET_CURSOR_SIG(View_Set_Cursor_Function);
     typedef VIEW_SET_MARK_SIG(View_Set_Mark_Function);
     typedef VIEW_SET_HIGHLIGHT_SIG(View_Set_Highlight_Function);
@@ -536,6 +538,7 @@ struct Application_Links{
     Get_Active_View_Function *get_active_view;
     
     Refresh_View_Function *refresh_view;
+    View_Compute_Cursor_Function *view_compute_cursor;
     View_Set_Cursor_Function *view_set_cursor;
     View_Set_Mark_Function *view_set_mark;
     View_Set_Highlight_Function *view_set_highlight;

4ed.cpp

@@ -1169,15 +1169,16 @@ COMMAND_DECL(eol_nixify){
 }
 
 COMMAND_DECL(auto_tab_range){
-    
     USE_MODELS(models);
     REQ_OPEN_VIEW(view);
     REQ_FILE(file, view);
 
     int r_start = 0, r_end = 0;
     int start_set = 0, end_set = 0;
-    int clear_blank_lines = 1;
+    Indent_Options opts;
-    int use_tabs = 0;
+    opts.empty_blank_lines = 1;
+    opts.use_tabs = 0;
+    opts.tab_width = 4;
 
     // TODO(allen): deduplicate
     Command_Parameter *end = param_stack_end(&command->part);
@@ -1196,11 +1197,11 @@ COMMAND_DECL(auto_tab_range){
             break;
 
             case par_clear_blank_lines:
-            clear_blank_lines = dynamic_to_bool(&param->param.value);
+            opts.empty_blank_lines = dynamic_to_bool(&param->param.value);
             break;
             
             case par_use_tabs:
-            use_tabs = dynamic_to_bool(&param->param.value);
+            opts.use_tabs = dynamic_to_bool(&param->param.value);
             break;
         }
     }
@@ -1209,7 +1210,7 @@ COMMAND_DECL(auto_tab_range){
         Range range = make_range(view->file_data.cursor.pos, view->file_data.mark);
         if (start_set) range.start = r_start;
         if (end_set) range.end = r_end;
-        view_auto_tab_tokens(system, models, view, range.start, range.end, clear_blank_lines, use_tabs);
+        view_auto_tab_tokens(system, models, view, range.start, range.end, opts);
     }
 }
 
@@ -2283,6 +2284,33 @@ extern "C"{
         return(result);
     }
     
+    VIEW_COMPUTE_CURSOR_SIG(external_view_compute_cursor){
+        Command_Data *cmd = (Command_Data*)app->cmd_context;
+        Live_Views *live_set;
+        View *vptr;
+        Editing_File *file;
+        Full_Cursor result = {0};
+        int view_id;
+        
+        if (view->exists){
+            live_set = cmd->live_set;
+            view_id = view->view_id - 1;
+            if (view_id >= 0 && view_id < live_set->max){
+                vptr = live_set->views + view_id;
+                file = vptr->file_data.file;
+                if (file && !file->state.is_loading){
+                    if (seek.type == buffer_seek_line_char && seek.character <= 0){
+                        seek.character = 1;
+                    }
+                    result = view_compute_cursor(vptr, seek);
+                    fill_view_summary(view, vptr, live_set, &cmd->models->working_set);
+                }
+            }
+        }
+        
+        return(result);
+    }
+    
     VIEW_SET_CURSOR_SIG(external_view_set_cursor){
         Command_Data *cmd = (Command_Data*)app->cmd_context;
         Live_Views *live_set;
@@ -2557,6 +2585,7 @@ app_links_init(System_Functions *system, Application_Links *app_links, void *dat
     app_links->get_active_view = external_get_active_view;
 
     app_links->refresh_view = external_refresh_view;
+    app_links->view_compute_cursor = external_view_compute_cursor;
     app_links->view_set_cursor = external_view_set_cursor;
     app_links->view_set_mark = external_view_set_mark;
     app_links->view_set_highlight = external_view_set_highlight;
@@ -4013,9 +4042,9 @@ App_Step_Sig(app_step){
                 "and if you load README.txt you'll find all the key combos there are.\n"
                 "\n"
                 "Newest features:\n"
-                "Scroll bar on files and file lists\n"
+                "-Scroll bar on files and file lists\n"
-                "Arrow navigation in lists\n"
+                "-Arrow navigation in lists\n"
-                "A new minimal theme editor\n"
+                "-A new minimal theme editor\n"
                 "\n"
                 "New in alpha 4.0.2:\n"
                 "-The file count limit is over 8 million now\n"

4ed_file_view.cpp

@@ -2233,30 +2233,28 @@ view_clean_whitespace(System_Functions *system, Models *models, View *view){
     end_temp_memory(temp);
 }
 
-internal void
+struct Indent_Options{
-view_auto_tab_tokens(System_Functions *system, Models *models,
+    b32 empty_blank_lines;
-    View *view, i32 start, i32 end, b32 empty_blank_lines, b32 use_tabs){
+    b32 use_tabs;
-#if BUFFER_EXPERIMENT_SCALPEL <= 0
+    i32 tab_width;
-    Editing_File *file = view->file_data.file;
+};
-    Mem_Options *mem = &models->mem;
-    Partition *part = &mem->part;
-    Buffer *buffer = &file->state.buffer;
 
-    Assert(file && !file->state.is_dummy);
+struct Make_Batch_Result{
-    Cpp_Token_Stack tokens = file->state.token_stack;
+    char *str_base;
-    Assert(tokens.tokens);
+    i32 str_size;
     
-    i32 line_start = buffer_get_line_index(buffer, start);
+    Buffer_Edit *edits;
-    i32 line_end = buffer_get_line_index(buffer, end) + 1;
+    i32 edit_max;
+    i32 edit_count;
+};
 
-    i32 edit_max = (line_end - line_start) * 2;
+internal i32*
-    i32 edit_count = 0;
+get_line_indentation_marks(Partition *part, Buffer *buffer, Cpp_Token_Stack tokens,
+    i32 line_start, i32 line_end){
 
     i32 indent_mark_count = line_end - line_start;
-
-    Temp_Memory temp = begin_temp_memory(part);
     i32 *indent_marks = push_array(part, i32, indent_mark_count);
-    {
+
     i32 current_indent = 0;
     i32 token_i;
     Cpp_Token *token, *self_token;
@@ -2269,9 +2267,6 @@ view_auto_tab_tokens(System_Functions *system, Models *models,
         self_token = tokens.tokens + token_i;
     }
 
-        // NOTE(allen): This part looks at code before the current code to figure out
-        // how much to indent the current code.
-        
     for (token = self_token; token_i > 0; --token_i, --token){
         switch(token->type){
             case CPP_TOKEN_BRACKET_OPEN:
@@ -2291,43 +2286,13 @@ view_auto_tab_tokens(System_Functions *system, Models *models,
         buffer_find_hard_start(buffer, start, &all_whitespace, &all_space, &current_indent, 4);
     }
 
-        // NOTE(allen): It is not clear what this part does...
-        // it looks like it figures out the current token from the line, but
-        // the system now figures out the line from the current token...
-        // All we really need here is to make sure we start on the first
-        // token of the line we want to start at I think.
-        
-        if (line < 0){
-            token_i = 0;
-            token = tokens.tokens + token_i;
-        }
-        else{
     i32 start_pos = buffer->line_starts[line];
     Cpp_Get_Token_Result result = cpp_get_token(&tokens, start_pos);
     token_i = result.token_index;
     if (result.in_whitespace) token_i += 1;
     token = tokens.tokens + token_i;
 
-            while (token >= tokens.tokens &&
+    // NOTE(allen): Shift the array so that line_i can just take on it's natural value.
-                    token->flags & CPP_TFLAG_PP_DIRECTIVE ||
-                    token->flags & CPP_TFLAG_PP_BODY){
-                --token;
-            }
-            
-            if (token < tokens.tokens){
-                ++token;
-                current_indent = 0;
-            }
-            else if (token->start < start_pos){
-                line = buffer_get_line_index(buffer, token->start);
-                i32 start = buffer->line_starts[line];
-                b32 all_whitespace = 0;
-                b32 all_space = 0;
-                buffer_find_hard_start(buffer, start, &all_whitespace, &all_space, &current_indent, 4);
-                Assert(!all_whitespace);
-            }
-        }
-        
     indent_marks -= line_start;
     i32 line_i = line_start;
     i32 next_line_start = buffer->line_starts[line_i];
@@ -2363,7 +2328,7 @@ view_auto_tab_tokens(System_Functions *system, Models *models,
             i32 this_indent;
             if (prev_token.type == CPP_TOKEN_COMMENT &&
                     prev_token.start <= this_line_start && prev_token.start + prev_token.size > this_line_start){
-                    if (line_i > 0){
+                if (line_i > line_start){
                     this_indent = indent_marks[line_i-1];
                 }
                 else{
@@ -2414,25 +2379,43 @@ view_auto_tab_tokens(System_Functions *system, Models *models,
         }
         prev_token = T;
     }
-    }
+    
+    // NOTE(allen): Unshift the indent_marks array so that the return value
+    // is the exact starting point of the array of indent marks.
+    indent_marks += line_start;
+    
+    return(indent_marks);
+}
+
+internal Make_Batch_Result
+make_batch_from_indent_marks(Partition *part, Buffer *buffer, i32 line_start, i32 line_end,
+    i32 *indent_marks, Indent_Options opts){
+    
+    Make_Batch_Result result = {0};
+    
+    i32 edit_max = line_end - line_start;
+    i32 edit_count = 0;
     
     Buffer_Edit *edits = push_array(part, Buffer_Edit, edit_max);
     
     char *str_base = (char*)part->base + part->pos;
     i32 str_size = 0;
+    
+    // NOTE(allen): Shift the array so that line_i can just take on it's natural value.
+    indent_marks -= line_start;
+    
     for (i32 line_i = line_start; line_i < line_end; ++line_i){
         i32 start = buffer->line_starts[line_i];
-        i32 preferred_indentation;
+        i32 preferred_indentation = 0;
-        i32 correct_indentation;
+        i32 correct_indentation = 0;
         b32 all_whitespace = 0;
         b32 all_space = 0;
-        i32 tab_width = 4;
         i32 hard_start =
             buffer_find_hard_start(buffer, start, &all_whitespace, &all_space,
-                &preferred_indentation, tab_width);
+                &preferred_indentation, opts.tab_width);
 
         correct_indentation = indent_marks[line_i];
-        if (all_whitespace && empty_blank_lines) correct_indentation = 0;
+        if (all_whitespace && opts.empty_blank_lines) correct_indentation = 0;
         if (correct_indentation == -1) correct_indentation = preferred_indentation;
 
         if ((all_whitespace && hard_start > start) || !all_space || correct_indentation != preferred_indentation){
@@ -2441,9 +2424,9 @@ view_auto_tab_tokens(System_Functions *system, Models *models,
             str_size += correct_indentation;
             char *str = push_array(part, char, correct_indentation);
             i32 j = 0;
-            if (use_tabs){
+            if (opts.use_tabs){
                 i32 i = 0;
-                for (; i + tab_width <= correct_indentation; i += tab_width) str[j++] = '\t';
+                for (; i + opts.tab_width <= correct_indentation; i += opts.tab_width) str[j++] = '\t';
                 for (; i < correct_indentation; ++i) str[j++] = ' ';
             }
             else{
@@ -2458,20 +2441,56 @@ view_auto_tab_tokens(System_Functions *system, Models *models,
         Assert(edit_count <= edit_max);
     }
     
-    if (edit_count > 0){
+    result.str_base = str_base;
-        Assert(buffer_batch_debug_sort_check(edits, edit_count));
+    result.str_size = str_size;
+    
+    result.edits = edits;
+    result.edit_max = edit_max;
+    result.edit_count = edit_count;
+    
+    return(result);
+}
+
+internal void
+view_auto_tab_tokens(System_Functions *system, Models *models,
+    View *view, i32 start, i32 end, Indent_Options opts){
+#if BUFFER_EXPERIMENT_SCALPEL <= 0
+    Editing_File *file = view->file_data.file;
+    Mem_Options *mem = &models->mem;
+    Partition *part = &mem->part;
+    Buffer *buffer = &file->state.buffer;
+
+    Assert(file && !file->state.is_dummy);
+    Cpp_Token_Stack tokens = file->state.token_stack;
+    Assert(tokens.tokens);
+
+    i32 line_start = buffer_get_line_index(buffer, start);
+    i32 line_end = buffer_get_line_index(buffer, end) + 1;
+
+    Temp_Memory temp = begin_temp_memory(part);
+    
+    i32 *indent_marks =
+        get_line_indentation_marks(part, buffer, tokens, line_start, line_end);
+    
+    Make_Batch_Result batch = 
+        make_batch_from_indent_marks(part, buffer, line_start, line_end, indent_marks, opts);
+
+    if (batch.edit_count > 0){
+        Assert(buffer_batch_debug_sort_check(batch.edits, batch.edit_count));
 
         // NOTE(allen): computing edit spec, doing batch edit
-        Buffer_Edit *inverse_array = push_array(part, Buffer_Edit, edit_count);
+        Buffer_Edit *inverse_array = push_array(part, Buffer_Edit, batch.edit_count);
         Assert(inverse_array);
 
         char *inv_str = (char*)part->base + part->pos;
         Edit_Spec spec =
-            file_compute_whitespace_edit(mem, file, view->file_data.cursor.pos, edits, str_base, str_size,
+            file_compute_whitespace_edit(mem, file, view->file_data.cursor.pos,
-            inverse_array, inv_str, part->max - part->pos, edit_count);
+                batch.edits, batch.str_base, batch.str_size,
+                inverse_array, inv_str, part->max - part->pos, batch.edit_count);
 
         file_do_white_batch_edit(system, models, view->file_data.file, spec, hist_normal);
     }
+    end_temp_memory(temp);
 
     {
         b32 all_whitespace = 0;
@@ -2484,8 +2503,6 @@ view_auto_tab_tokens(System_Functions *system, Models *models,
 
         view_cursor_move(view, hard_start);
     }
-
-    end_temp_memory(temp);
 #endif
 }
 

build_all.bat

@@ -21,8 +21,8 @@ if %ERRORLEVEL% neq 0 (set FirstError=1)
 popd
 
 pushd ..\build
-call "..\code\buildsuper.bat" ..\code\4coder_default_bindings.cpp
+REM call "..\code\buildsuper.bat" ..\code\4coder_default_bindings.cpp
-REM call "..\code\buildsuper.bat" ..\code\power\4coder_experiments.cpp
+call "..\code\buildsuper.bat" ..\code\power\4coder_experiments.cpp
 REM call "..\code\buildsuper.bat" ..\code\power\4coder_casey.cpp
 if %ERRORLEVEL% neq 0 (set FirstError=1)
 

power/4coder_experiments.cpp

@@ -7,6 +7,7 @@
 CUSTOM_COMMAND_SIG(kill_rect){
     View_Summary view = app->get_active_view(app);
     Buffer_Summary buffer = app->get_buffer(app, view.buffer_id);
+    Full_Cursor cursor;
     
     Buffer_Rect rect = get_rect(&view);
     
@@ -14,13 +15,11 @@ CUSTOM_COMMAND_SIG(kill_rect){
         int start = 0;
         int end = 0;
         
-        app->view_set_cursor(app, &view, seek_line_char(line, rect.char0), 0);
+        cursor = app->view_compute_cursor(app, &view, seek_line_char(line, rect.char0));
-        app->refresh_view(app, &view);
+        start = cursor.pos;
-        start = view.cursor.pos;
         
-        app->view_set_cursor(app, &view, seek_line_char(line, rect.char1), 0);
+        cursor = app->view_compute_cursor(app, &view, seek_line_char(line, rect.char1));
-        app->refresh_view(app, &view);
+        end = cursor.pos;
-        end = view.cursor.pos;
         
         app->buffer_replace_range(app, &buffer, start, end, 0, 0);
     }