ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a4.0.5 - ready to go

This commit is contained in:
Allen Webster 2016-05-16 16:30:19 -04:00
parent 1d9b327b96
commit cc91b72883
2 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
4ed.cpp
View File

@ -4031,28 +4031,33 @@ App_Step_Sig(app_step){
} }
update_command_data(vars, cmd); update_command_data(vars, cmd);
// NOTE(allen): initialize message // NOTE(allen): initialize message
if (first_step){ if (first_step){
String welcome = make_lit_string( String welcome = make_lit_string(
"Welcome to " VERSION "\n" "Welcome to " VERSION "\n"
"If you're new to 4coder there's no tutorial yet :(\n" "If you're new to 4coder there's no tutorial yet :(\n"
"you can use the key combo control + o to look for a file\n" "you can use the key combo control + o to look for a file\n"
"and if you load README.txt you'll find all the key combos there are.\n" "and if you load README.txt you'll find all the key combos there are.\n"
"\n" "\n"
"Newest features:\n" "Newest features:\n"
"-Scroll bar on files and file lists\n" "-New indent rule\n"
"-Arrow navigation in lists\n" "-app->buffer_compute_cursor in the customization API\n"
"-A new minimal theme editor\n" "-f keys are available\n"
"\n" "\n"
"New in alpha 4.0.2:\n" "New in alpha 4.0.3 and 4.0.4\n"
"-The file count limit is over 8 million now\n" "-Scroll bar on files and file lists\n"
"-File equality is handled better so renamings (such as 'subst') are safe now\n" "-Arrow navigation in lists\n"
"-This buffer will report events including errors that happen in 4coder\n" "-A new minimal theme editor\n"
"-Super users can post their own messages here with app->print_message\n" "\n"
"-<ctrl e> centers view on cursor; cmdid_center_view in customization API\n" "New in alpha 4.0.2:\n"
"-Set font size on command line with -f N, N = 16 by default\n\n" "-The file count limit is over 8 million now\n"
); "-File equality is handled better so renamings (such as 'subst') are safe now\n"
"-This buffer will report events including errors that happen in 4coder\n"
"-Super users can post their own messages here with app->print_message\n"
"-<ctrl e> centers view on cursor; cmdid_center_view in customization API\n"
"-Set font size on command line with -f N, N = 16 by default\n\n"
);
do_feedback_message(system, models, welcome); do_feedback_message(system, models, welcome);
} }

29
4ed_file_view.cpp
View File

@ -2256,17 +2256,22 @@ internal Cpp_Token*
seek_matching_token_backwards(Cpp_Token_Stack tokens, Cpp_Token *token, seek_matching_token_backwards(Cpp_Token_Stack tokens, Cpp_Token *token,
Cpp_Token_Type open_type, Cpp_Token_Type close_type){ Cpp_Token_Type open_type, Cpp_Token_Type close_type){
int nesting_level = 0; int nesting_level = 0;
for (; token > tokens.tokens; --token){ if (token <= tokens.tokens){
if (!(token->flags & CPP_TFLAG_PP_BODY)){ token = tokens.tokens;
if (token->type == close_type){ }
++nesting_level; else{
} for (; token > tokens.tokens; --token){
else if (token->type == open_type){ if (!(token->flags & CPP_TFLAG_PP_BODY)){
if (nesting_level == 0){ if (token->type == close_type){
break; ++nesting_level;
} }
else{ else if (token->type == open_type){
--nesting_level; if (nesting_level == 0){
break;
}
else{
--nesting_level;
}
} }
} }
} }
@ -2392,7 +2397,7 @@ get_line_indentation_marks(Partition *part, Buffer *buffer, Cpp_Token_Stack toke
else{ else{
int close = 0; int close = 0;
for (token = start_token; token < brace_token; ++token){ for (token = brace_token; token >= start_token; --token){
switch(token->type){ switch(token->type){
case CPP_TOKEN_PARENTHESE_CLOSE: case CPP_TOKEN_PARENTHESE_CLOSE:
case CPP_TOKEN_BRACKET_CLOSE: case CPP_TOKEN_BRACKET_CLOSE:
@ -2402,7 +2407,7 @@ get_line_indentation_marks(Partition *part, Buffer *buffer, Cpp_Token_Stack toke
} }
} }
out_of_loop2:; out_of_loop2:;
switch (close){ switch (close){
case 0: token = start_token; found_safe_start_position = 1; break; case 0: token = start_token; found_safe_start_position = 1; break;