mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

fixed bug with close-all-code

master
Allen Webster 2016-06-06 13:33:23 -04:00
parent b6f86f4f8d
commit 201b7f65a4
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
4coder_default_include.cpp
View File

@ -427,19 +427,19 @@ CUSTOM_COMMAND_SIG(snipe_token_or_word){
View_Summary view;
Buffer_Summary buffer;
int pos1, pos2;
view = app->get_active_view(app);
push_parameter(app, par_flags, BoundryToken | BoundryWhitespace);
exec_command(app, cmdid_seek_left);
app->refresh_view(app, &view);
pos1 = view.cursor.pos;
push_parameter(app, par_flags, BoundryToken | BoundryWhitespace);
exec_command(app, cmdid_seek_right);
app->refresh_view(app, &view);
pos2 = view.cursor.pos;
Range range = make_range(pos1, pos2);
buffer = app->get_buffer(app, view.buffer_id);
app->buffer_replace_range(app, &buffer, range.start, range.end, 0, 0);
@ -450,28 +450,28 @@ CUSTOM_COMMAND_SIG(open_file_in_quotes){
Buffer_Summary buffer;
char short_file_name[128];
int pos, start, end, size;
view = app->get_active_view(app);
buffer = app->get_buffer(app, view.buffer_id);
pos = view.cursor.pos;
buffer_seek_delimiter_forward(app, &buffer, pos, '"', &end);
buffer_seek_delimiter_backward(app, &buffer, pos, '"', &start);
++start;
size = end - start;
// NOTE(allen): This check is necessary because app->buffer_read_range
// requiers that the output buffer you provide is at least (end - start) bytes long.
if (size < sizeof(short_file_name)){
char file_name_[256];
String file_name = make_fixed_width_string(file_name_);
app->buffer_read_range(app, &buffer, start, end, short_file_name);
copy(&file_name, make_string(buffer.file_name, buffer.file_name_len));
remove_last_folder(&file_name);
append(&file_name, make_string(short_file_name, size));
exec_command(app, cmdid_change_active_panel);
push_parameter(app, par_name, expand_str(file_name));
exec_command(app, cmdid_interactive_open);
@ -736,21 +736,30 @@ CUSTOM_COMMAND_SIG(query_replace){
CUSTOM_COMMAND_SIG(close_all_code){
String extension;
Buffer_Summary buffer;
// TODO(allen): Get better memory constructs to the custom layer
// so that it doesn't have to rely on arbitrary limits like this one.
int buffers_to_close[2048];
int buffers_to_close_count = 0;
for (buffer = app->get_buffer_first(app);
buffer.exists;
app->get_buffer_next(app, &buffer)){
buffer.exists;
app->get_buffer_next(app, &buffer)){
extension = file_extension(make_string(buffer.file_name, buffer.file_name_len));
if (match(extension, make_lit_string("cpp")) ||
match(extension, make_lit_string("hpp")) ||
match(extension, make_lit_string("c")) ||
match(extension, make_lit_string("h"))){
//
push_parameter(app, par_buffer_id, buffer.buffer_id);
exec_command(app, cmdid_kill_buffer);
match(extension, make_lit_string("hpp")) ||
match(extension, make_lit_string("c")) ||
match(extension, make_lit_string("h"))){
buffers_to_close[buffers_to_close_count++] = buffer.buffer_id;
}
}
for (int i = 0; i < buffers_to_close_count; ++i){
push_parameter(app, par_buffer_id, buffers_to_close[i]);
exec_command(app, cmdid_kill_buffer);
}
}
CUSTOM_COMMAND_SIG(open_all_code){

10
4ed_file_view.cpp
View File

@ -1619,6 +1619,10 @@ view_set_file(View *view, Editing_File *file, Models *models){
view->font_advance = fnt_info->advance;
view->line_height = fnt_info->height;
if (view->file_data.file != 0){
touch_file(&models->working_set, view->file_data.file);
}
file_view_nullify_file(view);
view->file_data.file = file;
@ -3325,12 +3329,12 @@ try_kill_file(System_Functions *system, Models *models,
internal void
interactive_view_complete(System_Functions *system, View *view, String dest, i32 user_action){
Models *models = view->persistent.models;
Editing_File *old_file = view->file_data.file;
//Editing_File *old_file = view->file_data.file;
switch (view->action){
case IAct_Open:
view_open_file(system, models, view, dest);
touch_file(&models->working_set, old_file);
//touch_file(&models->working_set, old_file);
view_show_file(view);
break;
@ -3347,7 +3351,7 @@ interactive_view_complete(System_Functions *system, View *view, String dest, i32
case IAct_Switch:
{
touch_file(&models->working_set, old_file);
//touch_file(&models->working_set, old_file);
Editing_File *file = 0;
String string = dest;