Mercurial > hg > forks > UniversalIndentGUI
changeset 758:8905d04b2967
Updated the uncrustify config file to suit for version 0.57. Also corrected a small tool tip comment typo. Fixes bug 3175027
git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1035 59b1889a-e5ac-428c-b0c7-476e01d41282
| author | thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282> |
|---|---|
| date | Mon, 11 Apr 2011 21:00:11 +0000 |
| parents | d690e8f38122 |
| children | 5a27624a035f |
| files | indenters/uigui_uncrustify.ini |
| diffstat | 1 files changed, 104 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/indenters/uigui_uncrustify.ini Mon Apr 11 20:34:27 2011 +0000 +++ b/indenters/uigui_uncrustify.ini Mon Apr 11 21:00:11 2011 +0000 @@ -15,7 +15,7 @@ showHelpParameter=-h stringparaminquotes=false useCfgFileParameter="-c " -version=0.56 +version=0.57 [Newlines] Category=0 @@ -568,7 +568,7 @@ [Sp Pp Stringify] Category=2 -Description="<html>Add or remove space after preprocessor '#' stringify operator. Default=Add</html>" +Description="<html>Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add</html>" Enabled=false EditorType=multiple Choices="sp_pp_stringify=ignore|sp_pp_stringify=add|sp_pp_stringify=remove|sp_pp_stringify=force" @@ -790,6 +790,15 @@ ChoicesReadable="Ignore Sp Angle Word|Add Sp Angle Word|Remove Sp Angle Word|Force Sp Angle Word" ValueDefault=0 +[Sp Angle Shift] +Category=2 +Description="<html>Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add</html>" +Enabled=false +EditorType=multiple +Choices="sp_angle_shift=ignore|sp_angle_shift=add|sp_angle_shift=remove|sp_angle_shift=force" +ChoicesReadable="Ignore Sp Angle Shift|Add Sp Angle Shift|Remove Sp Angle Shift|Force Sp Angle Shift" +ValueDefault=1 + [Sp Before Sparen] Category=2 Description="<html>Add or remove space before '(' of 'if', 'for', 'switch', and 'while'</html>" @@ -961,6 +970,15 @@ ChoicesReadable="Ignore Sp Before Comma|Add Sp Before Comma|Remove Sp Before Comma|Force Sp Before Comma" ValueDefault=2 +[Sp Paren Comma] +Category=2 +Description="<html>Add or remove space between an open paren and comma: '(,' vs '( ,'<BR></html>" +Enabled=false +EditorType=multiple +Choices="sp_paren_comma=ignore|sp_paren_comma=add|sp_paren_comma=remove|sp_paren_comma=force" +ChoicesReadable="Ignore Sp Paren Comma|Add Sp Paren Comma|Remove Sp Paren Comma|Force Sp Paren Comma" +ValueDefault=3 + [Sp Before Ellipsis] Category=2 Description="<html>Add or remove space before the variadic '...' when preceded by a non-punctuator</html>" @@ -1168,6 +1186,15 @@ ChoicesReadable="Ignore Sp Func Call Paren|Add Sp Func Call Paren|Remove Sp Func Call Paren|Force Sp Func Call Paren" ValueDefault=0 +[Sp Func Call Paren Empty] +Category=2 +Description="<html>Add or remove space between function name and '()' on function calls without parameters.<BR>If set to 'ignore' (the default), sp_func_call_paren is used.</html>" +Enabled=false +EditorType=multiple +Choices="sp_func_call_paren_empty=ignore|sp_func_call_paren_empty=add|sp_func_call_paren_empty=remove|sp_func_call_paren_empty=force" +ChoicesReadable="Ignore Sp Func Call Paren Empty|Add Sp Func Call Paren Empty|Remove Sp Func Call Paren Empty|Force Sp Func Call Paren Empty" +ValueDefault=0 + [Sp Func Call User Paren] Category=2 Description="<html>Add or remove space between the user function name and '(' on function calls<BR>You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.</html>" @@ -2449,6 +2476,15 @@ ChoicesReadable="Ignore Nl Func Paren|Add Nl Func Paren|Remove Nl Func Paren|Force Nl Func Paren" ValueDefault=0 +[Nl Func Def Paren] +Category=4 +Description="<html>Add or remove newline between a function name and the opening '(' in the definition</html>" +Enabled=false +EditorType=multiple +Choices="nl_func_def_paren=ignore|nl_func_def_paren=add|nl_func_def_paren=remove|nl_func_def_paren=force" +ChoicesReadable="Ignore Nl Func Def Paren|Add Nl Func Def Paren|Remove Nl Func Def Paren|Force Nl Func Def Paren" +ValueDefault=0 + [Nl Func Decl Start] Category=4 Description="<html>Add or remove newline after '(' in a function declaration</html>" @@ -2458,15 +2494,33 @@ ChoicesReadable="Ignore Nl Func Decl Start|Add Nl Func Decl Start|Remove Nl Func Decl Start|Force Nl Func Decl Start" ValueDefault=0 +[Nl Func Def Start] +Category=4 +Description="<html>Add or remove newline after '(' in a function definition</html>" +Enabled=false +EditorType=multiple +Choices="nl_func_def_start=ignore|nl_func_def_start=add|nl_func_def_start=remove|nl_func_def_start=force" +ChoicesReadable="Ignore Nl Func Def Start|Add Nl Func Def Start|Remove Nl Func Def Start|Force Nl Func Def Start" +ValueDefault=0 + [Nl Func Decl Start Single] Category=4 -Description="<html>Overrides nl_func_decl_start when there is only one paramter.</html>" +Description="<html>Overrides nl_func_decl_start when there is only one parameter.</html>" Enabled=false EditorType=multiple Choices="nl_func_decl_start_single=ignore|nl_func_decl_start_single=add|nl_func_decl_start_single=remove|nl_func_decl_start_single=force" ChoicesReadable="Ignore Nl Func Decl Start Single|Add Nl Func Decl Start Single|Remove Nl Func Decl Start Single|Force Nl Func Decl Start Single" ValueDefault=0 +[Nl Func Def Start Single] +Category=4 +Description="<html>Overrides nl_func_def_start when there is only one parameter.</html>" +Enabled=false +EditorType=multiple +Choices="nl_func_def_start_single=ignore|nl_func_def_start_single=add|nl_func_def_start_single=remove|nl_func_def_start_single=force" +ChoicesReadable="Ignore Nl Func Def Start Single|Add Nl Func Def Start Single|Remove Nl Func Def Start Single|Force Nl Func Def Start Single" +ValueDefault=0 + [Nl Func Decl Args] Category=4 Description="<html>Add or remove newline after each ',' in a function declaration</html>" @@ -2476,6 +2530,15 @@ ChoicesReadable="Ignore Nl Func Decl Args|Add Nl Func Decl Args|Remove Nl Func Decl Args|Force Nl Func Decl Args" ValueDefault=0 +[Nl Func Def Args] +Category=4 +Description="<html>Add or remove newline after each ',' in a function definition</html>" +Enabled=false +EditorType=multiple +Choices="nl_func_def_args=ignore|nl_func_def_args=add|nl_func_def_args=remove|nl_func_def_args=force" +ChoicesReadable="Ignore Nl Func Def Args|Add Nl Func Def Args|Remove Nl Func Def Args|Force Nl Func Def Args" +ValueDefault=0 + [Nl Func Decl End] Category=4 Description="<html>Add or remove newline before the ')' in a function declaration</html>" @@ -2485,15 +2548,33 @@ ChoicesReadable="Ignore Nl Func Decl End|Add Nl Func Decl End|Remove Nl Func Decl End|Force Nl Func Decl End" ValueDefault=0 +[Nl Func Def End] +Category=4 +Description="<html>Add or remove newline before the ')' in a function definition</html>" +Enabled=false +EditorType=multiple +Choices="nl_func_def_end=ignore|nl_func_def_end=add|nl_func_def_end=remove|nl_func_def_end=force" +ChoicesReadable="Ignore Nl Func Def End|Add Nl Func Def End|Remove Nl Func Def End|Force Nl Func Def End" +ValueDefault=0 + [Nl Func Decl End Single] Category=4 -Description="<html>Overrides nl_func_decl_end when there is only one paramter.</html>" +Description="<html>Overrides nl_func_decl_end when there is only one parameter.</html>" Enabled=false EditorType=multiple Choices="nl_func_decl_end_single=ignore|nl_func_decl_end_single=add|nl_func_decl_end_single=remove|nl_func_decl_end_single=force" ChoicesReadable="Ignore Nl Func Decl End Single|Add Nl Func Decl End Single|Remove Nl Func Decl End Single|Force Nl Func Decl End Single" ValueDefault=0 +[Nl Func Def End Single] +Category=4 +Description="<html>Overrides nl_func_def_end when there is only one parameter.</html>" +Enabled=false +EditorType=multiple +Choices="nl_func_def_end_single=ignore|nl_func_def_end_single=add|nl_func_def_end_single=remove|nl_func_def_end_single=force" +ChoicesReadable="Ignore Nl Func Def End Single|Add Nl Func Def End Single|Remove Nl Func Def End Single|Force Nl Func Def End Single" +ValueDefault=0 + [Nl Func Decl Empty] Category=4 Description="<html>Add or remove newline between '()' in a function declaration.</html>" @@ -2503,6 +2584,15 @@ ChoicesReadable="Ignore Nl Func Decl Empty|Add Nl Func Decl Empty|Remove Nl Func Decl Empty|Force Nl Func Decl Empty" ValueDefault=0 +[Nl Func Def Empty] +Category=4 +Description="<html>Add or remove newline between '()' in a function definition.</html>" +Enabled=false +EditorType=multiple +Choices="nl_func_def_empty=ignore|nl_func_def_empty=add|nl_func_def_empty=remove|nl_func_def_empty=force" +ChoicesReadable="Ignore Nl Func Def Empty|Add Nl Func Def Empty|Remove Nl Func Def Empty|Force Nl Func Def Empty" +ValueDefault=0 + [Nl Fdef Brace] Category=4 Description="<html>Add or remove newline between function signature and '{'</html>" @@ -2746,7 +2836,7 @@ Enabled=false EditorType=multiple Choices="pos_arith=ignore|pos_arith=lead|pos_arith=lead_break|pos_arith=lead_force|pos_arith=trail|pos_arith=trail_break|pos_arith=trail_force" -ChoicesReadable="Ignore Pos Arith|Lead Pos Arith|Trail Pos Arith" +ChoicesReadable="Ignore Pos Arith|Lead Pos Arith|Lead Break Pos Arith|Lead Force Pos Arith|Trail Pos Arith|Trail Break Pos Arith|Trail Force Pos Arith" ValueDefault=0 [Pos Assign] @@ -2755,7 +2845,7 @@ Enabled=false EditorType=multiple Choices="pos_assign=ignore|pos_assign=lead|pos_assign=lead_break|pos_assign=lead_force|pos_assign=trail|pos_assign=trail_break|pos_assign=trail_force" -ChoicesReadable="Ignore Pos Assign|Lead Pos Assign|Trail Pos Assign" +ChoicesReadable="Ignore Pos Assign|Lead Pos Assign|Lead Break Pos Assign|Lead Force Pos Assign|Trail Pos Assign|Trail Break Pos Assign|Trail Force Pos Assign" ValueDefault=0 [Pos Bool] @@ -2764,7 +2854,7 @@ Enabled=false EditorType=multiple Choices="pos_bool=ignore|pos_bool=lead|pos_bool=lead_break|pos_bool=lead_force|pos_bool=trail|pos_bool=trail_break|pos_bool=trail_force" -ChoicesReadable="Ignore Pos Bool|Lead Pos Bool|Trail Pos Bool" +ChoicesReadable="Ignore Pos Bool|Lead Pos Bool|Lead Break Pos Bool|Lead Force Pos Bool|Trail Pos Bool|Trail Break Pos Bool|Trail Force Pos Bool" ValueDefault=0 [Pos Compare] @@ -2773,7 +2863,7 @@ Enabled=false EditorType=multiple Choices="pos_compare=ignore|pos_compare=lead|pos_compare=lead_break|pos_compare=lead_force|pos_compare=trail|pos_compare=trail_break|pos_compare=trail_force" -ChoicesReadable="Ignore Pos Compare|Lead Pos Compare|Trail Pos Compare" +ChoicesReadable="Ignore Pos Compare|Lead Pos Compare|Lead Break Pos Compare|Lead Force Pos Compare|Trail Pos Compare|Trail Break Pos Compare|Trail Force Pos Compare" ValueDefault=0 [Pos Conditional] @@ -2782,7 +2872,7 @@ Enabled=false EditorType=multiple Choices="pos_conditional=ignore|pos_conditional=lead|pos_conditional=lead_break|pos_conditional=lead_force|pos_conditional=trail|pos_conditional=trail_break|pos_conditional=trail_force" -ChoicesReadable="Ignore Pos Conditional|Lead Pos Conditional|Trail Pos Conditional" +ChoicesReadable="Ignore Pos Conditional|Lead Pos Conditional|Lead Break Pos Conditional|Lead Force Pos Conditional|Trail Pos Conditional|Trail Break Pos Conditional|Trail Force Pos Conditional" ValueDefault=0 [Pos Comma] @@ -2791,7 +2881,7 @@ Enabled=false EditorType=multiple Choices="pos_comma=ignore|pos_comma=lead|pos_comma=lead_break|pos_comma=lead_force|pos_comma=trail|pos_comma=trail_break|pos_comma=trail_force" -ChoicesReadable="Ignore Pos Comma|Lead Pos Comma|Trail Pos Comma" +ChoicesReadable="Ignore Pos Comma|Lead Pos Comma|Lead Break Pos Comma|Lead Force Pos Comma|Trail Pos Comma|Trail Break Pos Comma|Trail Force Pos Comma" ValueDefault=0 [Pos Class Comma] @@ -2800,7 +2890,7 @@ Enabled=false EditorType=multiple Choices="pos_class_comma=ignore|pos_class_comma=lead|pos_class_comma=lead_break|pos_class_comma=lead_force|pos_class_comma=trail|pos_class_comma=trail_break|pos_class_comma=trail_force" -ChoicesReadable="Ignore Pos Class Comma|Lead Pos Class Comma|Trail Pos Class Comma" +ChoicesReadable="Ignore Pos Class Comma|Lead Pos Class Comma|Lead Break Pos Class Comma|Lead Force Pos Class Comma|Trail Pos Class Comma|Trail Break Pos Class Comma|Trail Force Pos Class Comma" ValueDefault=0 [Pos Class Colon] @@ -2809,7 +2899,7 @@ Enabled=false EditorType=multiple Choices="pos_class_colon=ignore|pos_class_colon=lead|pos_class_colon=lead_break|pos_class_colon=lead_force|pos_class_colon=trail|pos_class_colon=trail_break|pos_class_colon=trail_force" -ChoicesReadable="Ignore Pos Class Colon|Lead Pos Class Colon|Trail Pos Class Colon" +ChoicesReadable="Ignore Pos Class Colon|Lead Pos Class Colon|Lead Break Pos Class Colon|Lead Force Pos Class Colon|Trail Pos Class Colon|Trail Break Pos Class Colon|Trail Force Pos Class Colon" ValueDefault=0 [Code Width] @@ -3129,7 +3219,7 @@ [Mod Add Long Ifdef Endif Comment] Category=8 -Description="<html>If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after<BR>the #else, a comment will be added.</html>" +Description="<html>If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after<BR>the #endif, a comment will be added.</html>" Enabled=false EditorType=numeric CallName="mod_add_long_ifdef_endif_comment=" @@ -3139,7 +3229,7 @@ [Mod Add Long Ifdef Else Comment] Category=8 -Description="<html>If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after<BR>the #endif, a comment will be added.</html>" +Description="<html>If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after<BR>the #else, a comment will be added.</html>" Enabled=false EditorType=numeric CallName="mod_add_long_ifdef_else_comment="