Mercurial > hg > forks > UniversalIndentGUI
changeset 707:87ead304355a
[chg] Feature Request ID 2793216: Updated to Uncrustify 0.53.
git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@976 59b1889a-e5ac-428c-b0c7-476e01d41282
| author | thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282> |
|---|---|
| date | Tue, 14 Jul 2009 19:55:17 +0000 |
| parents | b75fbb488da6 |
| children | 80144dc972a1 |
| files | indenters/uigui_uncrustify.ini |
| diffstat | 1 files changed, 265 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/indenters/uigui_uncrustify.ini Tue Jul 14 14:51:13 2009 +0000 +++ b/indenters/uigui_uncrustify.ini Tue Jul 14 19:55:17 2009 +0000 @@ -2,7 +2,7 @@ categories=General options|Indenting|Spacing options|Code alignment (not left column spaces/tabs)|Newline adding and removing options|Positioning options|Line Splitting options|Blank line options|Code modifying options (non-whitespace)|Comment modifications|Preprocessor options cfgFileParameterEnding=cr configFilename=uncrustify.cfg -fileTypes=*.c|*.cpp|*.d|*.cs|*.vala|*.java|*.pawn|*.p|*.sma|*.inl|*.h|*.cxx|*.hpp|*.hxx|*.cc|*.di|*.m|*.mm|*.sqc +fileTypes=*.c|*.cpp|*.d|*.cs|*.vala|*.java|*.pawn|*.p|*.sma|*.inl|*.h|*.cxx|*.hpp|*.hxx|*.cc|*.di|*.m|*.mm|*.sqc|*.es indenterFileName=uncrustify indenterName=Uncrustify (C, C++, C#, ObjectiveC, D, Java, Pawn, VALA) inputFileName=indentinput @@ -15,7 +15,7 @@ showHelpParameter=-h stringparaminquotes=false useCfgFileParameter="-c " -version=0.49+svn +version=0.53 [Newlines] Category=0 @@ -177,6 +177,16 @@ TrueFalse=indent_else_if=true|indent_else_if=false ValueDefault=0 +[Indent Var Def Blk] +Category=1 +Description="<html>Amount to indent variable declarations after a open brace. neg=relative, pos=absolute</html>" +Enabled=false +EditorType=numeric +CallName="indent_var_def_blk=" +MinVal=0 +MaxVal=16 +ValueDefault=0 + [Indent Func Call Param] Category=1 Description="<html>True: indent continued function call parameters one indent level<BR>False: align parameters under the open paren</html>" @@ -397,6 +407,14 @@ TrueFalse=indent_preserve_sql=true|indent_preserve_sql=false ValueDefault=0 +[Indent Align Assign] +Category=1 +Description="<html>Align continued statements at the '='. Default=True<BR>If FALSE or the '=' is followed by a newline, the next line is indent one tab.</html>" +Enabled=false +EditorType=boolean +TrueFalse=indent_align_assign=true|indent_align_assign=false +ValueDefault=1 + [Sp Arith] Category=2 Description="<html>Add or remove space around arithmetic operator '+', '-', '/', '*', etc</html>" @@ -415,6 +433,24 @@ ChoicesReadable="Ignore Sp Assign|Add Sp Assign|Remove Sp Assign|Force Sp Assign" ValueDefault=0 +[Sp Before Assign] +Category=2 +Description="<html>Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign.</html>" +Enabled=false +EditorType=multiple +Choices="sp_before_assign=ignore|sp_before_assign=add|sp_before_assign=remove|sp_before_assign=force" +ChoicesReadable="Ignore Sp Before Assign|Add Sp Before Assign|Remove Sp Before Assign|Force Sp Before Assign" +ValueDefault=0 + +[Sp After Assign] +Category=2 +Description="<html>Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign.</html>" +Enabled=false +EditorType=multiple +Choices="sp_after_assign=ignore|sp_after_assign=add|sp_after_assign=remove|sp_after_assign=force" +ChoicesReadable="Ignore Sp After Assign|Add Sp After Assign|Remove Sp After Assign|Force Sp After Assign" +ValueDefault=0 + [Sp Enum Assign] Category=2 Description="<html>Add or remove space around assignment '=' in enum</html>" @@ -424,6 +460,42 @@ ChoicesReadable="Ignore Sp Enum Assign|Add Sp Enum Assign|Remove Sp Enum Assign|Force Sp Enum Assign" ValueDefault=0 +[Sp Enum Before Assign] +Category=2 +Description="<html>Add or remove space before assignment '=' in enum. Overrides sp_enum_assign.</html>" +Enabled=false +EditorType=multiple +Choices="sp_enum_before_assign=ignore|sp_enum_before_assign=add|sp_enum_before_assign=remove|sp_enum_before_assign=force" +ChoicesReadable="Ignore Sp Enum Before Assign|Add Sp Enum Before Assign|Remove Sp Enum Before Assign|Force Sp Enum Before Assign" +ValueDefault=0 + +[Sp Enum After Assign] +Category=2 +Description="<html>Add or remove space after assignment '=' in enum. Overrides sp_enum_assign.</html>" +Enabled=false +EditorType=multiple +Choices="sp_enum_after_assign=ignore|sp_enum_after_assign=add|sp_enum_after_assign=remove|sp_enum_after_assign=force" +ChoicesReadable="Ignore Sp Enum After Assign|Add Sp Enum After Assign|Remove Sp Enum After Assign|Force Sp Enum After Assign" +ValueDefault=0 + +[Sp Pp Concat] +Category=2 +Description="<html>Add or remove space around preprocessor '##' concatenation operator</html>" +Enabled=false +EditorType=multiple +Choices="sp_pp_concat=ignore|sp_pp_concat=add|sp_pp_concat=remove|sp_pp_concat=force" +ChoicesReadable="Ignore Sp Pp Concat|Add Sp Pp Concat|Remove Sp Pp Concat|Force Sp Pp Concat" +ValueDefault=1 + +[Sp Pp Stringify] +Category=2 +Description="<html>Add or remove space after preprocessor '#' stringify operator</html>" +Enabled=false +EditorType=multiple +Choices="sp_pp_stringify=ignore|sp_pp_stringify=add|sp_pp_stringify=remove|sp_pp_stringify=force" +ChoicesReadable="Ignore Sp Pp Stringify|Add Sp Pp Stringify|Remove Sp Pp Stringify|Force Sp Pp Stringify" +ValueDefault=1 + [Sp Bool] Category=2 Description="<html>Add or remove space around boolean operators '&&' and '||'</html>" @@ -657,6 +729,15 @@ ChoicesReadable="Ignore Sp Inside Sparen|Add Sp Inside Sparen|Remove Sp Inside Sparen|Force Sp Inside Sparen" ValueDefault=0 +[Sp Inside Sparen Close] +Category=2 +Description="<html>Add or remove space before if-condition ')'. Overrides sp_inside_sparen.</html>" +Enabled=false +EditorType=multiple +Choices="sp_inside_sparen_close=ignore|sp_inside_sparen_close=add|sp_inside_sparen_close=remove|sp_inside_sparen_close=force" +ChoicesReadable="Ignore Sp Inside Sparen Close|Add Sp Inside Sparen Close|Remove Sp Inside Sparen Close|Force Sp Inside Sparen Close" +ValueDefault=0 + [Sp After Sparen] Category=2 Description="<html>Add or remove space after ')' of 'if', 'for', 'switch', and 'while'</html>" @@ -675,6 +756,24 @@ ChoicesReadable="Ignore Sp Sparen Brace|Add Sp Sparen Brace|Remove Sp Sparen Brace|Force Sp Sparen Brace" ValueDefault=0 +[Sp Invariant Paren] +Category=2 +Description="<html>Add or remove space between 'invariant' and '(' in the D language.</html>" +Enabled=false +EditorType=multiple +Choices="sp_invariant_paren=ignore|sp_invariant_paren=add|sp_invariant_paren=remove|sp_invariant_paren=force" +ChoicesReadable="Ignore Sp Invariant Paren|Add Sp Invariant Paren|Remove Sp Invariant Paren|Force Sp Invariant Paren" +ValueDefault=0 + +[Sp After Invariant Paren] +Category=2 +Description="<html>Add or remove space after the ')' in 'invariant (C) c' in the D language.</html>" +Enabled=false +EditorType=multiple +Choices="sp_after_invariant_paren=ignore|sp_after_invariant_paren=add|sp_after_invariant_paren=remove|sp_after_invariant_paren=force" +ChoicesReadable="Ignore Sp After Invariant Paren|Add Sp After Invariant Paren|Remove Sp After Invariant Paren|Force Sp After Invariant Paren" +ValueDefault=0 + [Sp Special Semi] Category=2 Description="<html>Add or remove space before empty statement ';' on 'if', 'for' and 'while'</html>" @@ -783,6 +882,15 @@ ChoicesReadable="Ignore Sp Before Class Colon|Add Sp Before Class Colon|Remove Sp Before Class Colon|Force Sp Before Class Colon" ValueDefault=0 +[Sp Before Case Colon] +Category=2 +Description="<html>Add or remove space before case ':'</html>" +Enabled=false +EditorType=multiple +Choices="sp_before_case_colon=ignore|sp_before_case_colon=add|sp_before_case_colon=remove|sp_before_case_colon=force" +ChoicesReadable="Ignore Sp Before Case Colon|Add Sp Before Case Colon|Remove Sp Before Case Colon|Force Sp Before Case Colon" +ValueDefault=2 + [Sp After Operator] Category=2 Description="<html>Add or remove space between 'operator' and operator sign</html>" @@ -999,6 +1107,15 @@ ChoicesReadable="Ignore Sp Defined Paren|Add Sp Defined Paren|Remove Sp Defined Paren|Force Sp Defined Paren" ValueDefault=0 +[Sp Throw Paren] +Category=2 +Description="<html>Add or remove space between 'throw' and '(' in 'throw (something)'</html>" +Enabled=false +EditorType=multiple +Choices="sp_throw_paren=ignore|sp_throw_paren=add|sp_throw_paren=remove|sp_throw_paren=force" +ChoicesReadable="Ignore Sp Throw Paren|Add Sp Throw Paren|Remove Sp Throw Paren|Force Sp Throw Paren" +ValueDefault=0 + [Sp Macro] Category=2 Description="<html>Add or remove space between macro and value</html>" @@ -1278,6 +1395,24 @@ ChoicesReadable="Ignore Sp Case Label|Add Sp Case Label|Remove Sp Case Label|Force Sp Case Label" ValueDefault=0 +[Sp Range] +Category=2 +Description="<html>Control the space around the D '..' operator.</html>" +Enabled=false +EditorType=multiple +Choices="sp_range=ignore|sp_range=add|sp_range=remove|sp_range=force" +ChoicesReadable="Ignore Sp Range|Add Sp Range|Remove Sp Range|Force Sp Range" +ValueDefault=0 + +[Sp Cmt Cpp Start] +Category=2 +Description="<html>Control the space after the opening of a C++ comment '// A' vs '//A'</html>" +Enabled=false +EditorType=multiple +Choices="sp_cmt_cpp_start=ignore|sp_cmt_cpp_start=add|sp_cmt_cpp_start=remove|sp_cmt_cpp_start=force" +ChoicesReadable="Ignore Sp Cmt Cpp Start|Add Sp Cmt Cpp Start|Remove Sp Cmt Cpp Start|Force Sp Cmt Cpp Start" +ValueDefault=0 + [Align Keep Tabs] Category=3 Description="<html>Whether to keep non-indenting tabs</html>" @@ -1384,6 +1519,14 @@ TrueFalse=align_var_def_colon=true|align_var_def_colon=false ValueDefault=0 +[Align Var Def Attribute] +Category=3 +Description="<html>Whether to align any attribute after the variable name</html>" +Enabled=false +EditorType=boolean +TrueFalse=align_var_def_attribute=true|align_var_def_attribute=false +ValueDefault=0 + [Align Var Def Inline] Category=3 Description="<html>Whether to align inline struct/enum/union variable definitions</html>" @@ -1550,6 +1693,16 @@ MaxVal=16 ValueDefault=0 +[Align Right Cmt At Col] +Category=3 +Description="<html>Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore)</html>" +Enabled=false +EditorType=numeric +CallName="align_right_cmt_at_col=" +MinVal=0 +MaxVal=200 +ValueDefault=0 + [Align Func Proto Span] Category=3 Description="<html>The span for aligning function prototypes (0=don't align)</html>" @@ -1570,6 +1723,14 @@ MaxVal=16 ValueDefault=0 +[Align On Operator] +Category=3 +Description="<html>Align function protos on the 'operator' keyword instead of what follows</html>" +Enabled=false +EditorType=boolean +TrueFalse=align_on_operator=true|align_on_operator=false +ValueDefault=0 + [Align Mix Var Proto] Category=3 Description="<html>Whether to mix aligning prototype and variable declarations.<BR>If true, align_var_def_XXX options are used instead of align_func_proto_XXX options.</html>" @@ -1963,7 +2124,7 @@ [Nl Multi Line Cond] Category=4 -Description="<html>Add or remove newline when condition spans two or more lines</html>" +Description="<html>Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc.<BR>Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace.</html>" Enabled=false EditorType=boolean TrueFalse=nl_multi_line_cond=true|nl_multi_line_cond=false @@ -2047,6 +2208,15 @@ ChoicesReadable="Ignore Nl Func Type Name|Add Nl Func Type Name|Remove Nl Func Type Name|Force Nl Func Type Name" ValueDefault=0 +[Nl Func Scope Name] +Category=4 +Description="<html>Add or remove newline between function scope and name in a definition<BR>Controls the newline after '::' in 'void A::f() { }'</html>" +Enabled=false +EditorType=multiple +Choices="nl_func_scope_name=ignore|nl_func_scope_name=add|nl_func_scope_name=remove|nl_func_scope_name=force" +ChoicesReadable="Ignore Nl Func Scope Name|Add Nl Func Scope Name|Remove Nl Func Scope Name|Force Nl Func Scope Name" +ValueDefault=0 + [Nl Func Proto Type Name] Category=4 Description="<html>Add or remove newline between return type and function name in a prototype</html>" @@ -2150,6 +2320,14 @@ TrueFalse=nl_after_vbrace_open=true|nl_after_vbrace_open=false ValueDefault=0 +[Nl After Brace Close] +Category=4 +Description="<html>Whether to put a newline after a brace close.<BR>Does not apply if followed by a necessary ';'.</html>" +Enabled=false +EditorType=boolean +TrueFalse=nl_after_brace_close=true|nl_after_brace_close=false +ValueDefault=0 + [Nl Define Macro] Category=4 Description="<html>Whether to alter newlines in '#define' macros</html>" @@ -2493,6 +2671,46 @@ MaxVal=16 ValueDefault=0 +[Nl Comment Func Def] +Category=7 +Description="<html>The number of newlines between a function def and the function comment.<BR>0 = No change.</html>" +Enabled=false +EditorType=numeric +CallName="nl_comment_func_def=" +MinVal=0 +MaxVal=16 +ValueDefault=0 + +[Nl After Try Catch Finally] +Category=7 +Description="<html>The number of newlines after a try-catch-finally block that isn't followed by a brace close.<BR>0 = No change.</html>" +Enabled=false +EditorType=numeric +CallName="nl_after_try_catch_finally=" +MinVal=0 +MaxVal=16 +ValueDefault=0 + +[Nl Around Cs Property] +Category=7 +Description="<html>The number of newlines before and after a property, indexer or event decl.<BR>0 = No change.</html>" +Enabled=false +EditorType=numeric +CallName="nl_around_cs_property=" +MinVal=0 +MaxVal=16 +ValueDefault=0 + +[Nl Between Get Set] +Category=7 +Description="<html>The number of newlines between the get/set/add/remove handlers in C#.<BR>0 = No change.</html>" +Enabled=false +EditorType=numeric +CallName="nl_between_get_set=" +MinVal=0 +MaxVal=16 +ValueDefault=0 + [Eat Blanks After Open Brace] Category=7 Description="<html>Whether to remove blank lines after '{'</html>" @@ -2617,6 +2835,26 @@ MaxVal=16 ValueDefault=0 +[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>" +Enabled=false +EditorType=numeric +CallName="mod_add_long_ifdef_endif_comment=" +MinVal=0 +MaxVal=16 +ValueDefault=0 + +[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>" +Enabled=false +EditorType=numeric +CallName="mod_add_long_ifdef_else_comment=" +MinVal=0 +MaxVal=16 +ValueDefault=0 + [Mod Sort Import] Category=8 Description="<html>If TRUE, will sort consecutive single-line 'import' statements [Java, D]</html>" @@ -2649,6 +2887,14 @@ TrueFalse=mod_move_case_break=true|mod_move_case_break=false ValueDefault=0 +[Mod Remove Empty Return] +Category=8 +Description="<html>If TRUE, it will remove a void 'return;' that appears as the last statement in a function.</html>" +Enabled=false +EditorType=boolean +TrueFalse=mod_remove_empty_return=true|mod_remove_empty_return=false +ValueDefault=0 + [Cmt Width] Category=9 Description="<html>Try to wrap comments at cmt_width columns</html>" @@ -2767,6 +3013,14 @@ EditorType=string ValueDefault= +[Cmt Insert File Footer] +Category=9 +Description="<html>The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment.<BR>Will substitue $(filename) with the current file's name.</html>" +Enabled=false +CallName=cmt_insert_file_footer= +EditorType=string +ValueDefault= + [Cmt Insert Func Header] Category=9 Description="<html>The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment.<BR>Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.<BR>Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }</html>" @@ -2783,6 +3037,14 @@ EditorType=string ValueDefault= +[Cmt Insert Before Preproc] +Category=9 +Description="<html>If a preprocessor is encountered when stepping backwards from a function name, then<BR>this option decides whether the comment should be inserted.<BR>Affects cmt_insert_func_header and cmt_insert_class_header.</html>" +Enabled=false +EditorType=boolean +TrueFalse=cmt_insert_before_preproc=true|cmt_insert_before_preproc=false +ValueDefault=0 + [Pp Indent] Category=10 Description="<html>Control indent of preprocessors inside #if blocks at brace level 0</html>"