Mercurial > hg > forks > UniversalIndentGUI
changeset 284:2f5b62bfdb24
[change] Feature Request ID 1836486 : Update to latest version of Uncrustify. http://universalindent.sf.net/issue/1836486
git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@502 59b1889a-e5ac-428c-b0c7-476e01d41282
| author | thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282> |
|---|---|
| date | Thu, 22 Nov 2007 15:23:53 +0000 |
| parents | 620505a89b17 |
| children | b5608fbe4a53 |
| files | data/uigui_uncrustify.ini |
| diffstat | 1 files changed, 517 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/data/uigui_uncrustify.ini Sun Nov 11 14:50:27 2007 +0000 +++ b/data/uigui_uncrustify.ini Thu Nov 22 15:23:53 2007 +0000 @@ -1,8 +1,8 @@ [%20header] -categories=General options|Indenting|Spacing options|Code alignment (not left column spaces/tabs)|Newline adding and removing options|Positioning options|Blank line options|Code modifying options (non-whitespace)|Comment modifications|Preprocessor options +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|*.java|*.pawn|*.p|*.sma|*.inl|*.h|*.cxx|*.hpp|*.hxx|*.cc|*.di|*.m|*.sqc +fileTypes=*.c|*.cpp|*.d|*.cs|*.vala|*.java|*.pawn|*.p|*.sma|*.inl|*.h|*.cxx|*.hpp|*.hxx|*.cc|*.di|*.m|*.sqc indenterFileName=uncrustify indenterName=Uncrustify inputFileName=indentinput @@ -12,7 +12,7 @@ parameterOrder=ipo stringparaminquotes=false useCfgFileParameter="-c " -version=0.34 +version=0.41 [align_assign_span] CallName="align_assign_span=" @@ -158,6 +158,28 @@ Value=0 ValueDefault=0 +[align_typedef_amp_style] +CallName="align_typedef_amp_style=" +Category=3 +Description="<html>Controls the positioning of the '&' in typedefs. Just try it.<BR>0: Align on typdef type, ignore '&'<BR>1: The '&' is part of type name: typedef int &pint;<BR>2: The '&' is part of the type, but dangling: typedef int &pint;</html>" +EditorType=numeric +Enabled=false +MaxVal=2 +MinVal=0 +Value=0 +ValueDefault=0 + +[align_typedef_func] +CallName="align_typedef_func=" +Category=3 +Description=<html>How to align typedef'd functions with other typedefs<BR>0: Don't mix them at all<BR>1: align the open paren with the types<BR>2: align the function type name with the other type names</html> +EditorType=numeric +Enabled=false +MaxVal=16 +MinVal=0 +Value=0 +ValueDefault=0 + [align_typedef_gap] CallName="align_typedef_gap=" Category=3 @@ -191,6 +213,17 @@ Value=0 ValueDefault=0 +[align_var_def_amp_style] +CallName="align_var_def_amp_style=" +Category=3 +Description="<html>How to align the '&' in variable definitions.<BR> 0=Part of the type<BR> 1=Part of the variable<BR> 2=Dangling</html>" +EditorType=numeric +Enabled=false +MaxVal=2 +MinVal=0 +Value=0 +ValueDefault=0 + [align_var_def_colon] Category=3 Description=<html>Whether to align the colon in struct bit fields</html> @@ -253,6 +286,17 @@ Value=0 ValueDefault=0 +[align_var_struct_thresh] +CallName="align_var_struct_thresh=" +Category=3 +Description="<html>The threshold for aligning struct/union member definitions (0=no limit)</html>" +EditorType=numeric +Enabled=false +MaxVal=5000 +MinVal=0 +Value=0 +ValueDefault=0 + [align_with_tabs] Category=3 Description=<html>Whether to use tabs for alinging</html> @@ -262,8 +306,35 @@ Value=0 ValueDefault=0 +[cmt_c_group] +Category=9 +Description=<html>Whether to group c-comments that look like they are in a block</html> +EditorType=boolean +Enabled=false +TrueFalse="cmt_c_group=true|cmt_c_group=false" +Value=0 +ValueDefault=0 + +[cmt_c_nl_end] +Category=9 +Description=<html>Whether to put a newline before the closing '*/' of the combined c-comment</html> +EditorType=boolean +Enabled=false +TrueFalse="cmt_c_nl_end=true|cmt_c_nl_end=false" +Value=0 +ValueDefault=0 + +[cmt_c_nl_start] +Category=9 +Description=<html>Whether to put an empty '/*' on the first line of the combined c-comment</html> +EditorType=boolean +Enabled=false +TrueFalse="cmt_c_nl_start=true|cmt_c_nl_start=false" +Value=0 +ValueDefault=0 + [cmt_cpp_group] -Category=8 +Category=9 Description=<html>Whether to group cpp-comments that look like they are in a block</html> EditorType=boolean Enabled=false @@ -272,7 +343,7 @@ ValueDefault=0 [cmt_cpp_nl_end] -Category=8 +Category=9 Description=<html>Whether to put a newline before the closing '*/' of the combined cpp-comment</html> EditorType=boolean Enabled=false @@ -281,7 +352,7 @@ ValueDefault=0 [cmt_cpp_nl_start] -Category=8 +Category=9 Description=<html>Whether to put an empty '/*' on the first line of the combined cpp-comment</html> EditorType=boolean Enabled=false @@ -290,7 +361,7 @@ ValueDefault=0 [cmt_cpp_to_c] -Category=8 +Category=9 Description=<html>Whether to change cpp-comments into c-comments</html> EditorType=boolean Enabled=false @@ -298,9 +369,30 @@ Value=0 ValueDefault=0 +[cmt_insert_class_header] +Category=9 +Description=<html>The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment.<BR>Will substitue $(class) with the class name.</html> +Enabled=false +Value=0 +ValueDefault=0 + +[cmt_insert_file_header] +Category=9 +Description=<html>The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment.<BR>Will substitue $(filename) with the current file's name.</html> +Enabled=false +Value=0 +ValueDefault=0 + +[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> +Enabled=false +Value=0 +ValueDefault=0 + [cmt_sp_after_star_cont] CallName="cmt_sp_after_star_cont=" -Category=8 +Category=9 Description=<html>The number of spaces to insert after the star on subsequent comment lines</html> EditorType=numeric Enabled=false @@ -311,7 +403,7 @@ [cmt_sp_before_star_cont] CallName="cmt_sp_before_star_cont=" -Category=8 +Category=9 Description=<html>The number of spaces to insert at the start of subsequent comment lines</html> EditorType=numeric Enabled=false @@ -321,7 +413,7 @@ ValueDefault=0 [cmt_star_cont] -Category=8 +Category=9 Description=<html>Whether to put a star on subsequent comment lines</html> EditorType=boolean Enabled=false @@ -329,9 +421,20 @@ Value=0 ValueDefault=0 +[cmt_width] +CallName="cmt_width=" +Category=9 +Description=<html>Try to wrap comments at cmt_witdth columns</html> +EditorType=numeric +Enabled=false +MaxVal=256 +MinVal=16 +Value=16 +ValueDefault=0 + [code_width] CallName="code_width=" -Category=4 +Category=6 Description=<html>Try to limit code width to N number of columns</html> EditorType=numeric Enabled=false @@ -341,7 +444,7 @@ ValueDefault=0 [eat_blanks_after_open_brace] -Category=6 +Category=7 Description=<html>Whether to remove blank lines after '{'</html> EditorType=boolean Enabled=false @@ -350,7 +453,7 @@ ValueDefault=0 [eat_blanks_before_close_brace] -Category=6 +Category=7 Description=<html>Whether to remove blank lines before '}'</html> EditorType=boolean Enabled=false @@ -378,6 +481,15 @@ Value=0 ValueDefault=0 +[indent_bool_paren] +Category=1 +Description="<html>Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren</html>" +EditorType=boolean +Enabled=false +TrueFalse="indent_bool_paren=true|indent_bool_paren=false" +Value=0 +ValueDefault=0 + [indent_brace] CallName="indent_brace=" Category=1 @@ -476,6 +588,15 @@ Value=4 ValueDefault=8 +[indent_comma_paren] +Category=1 +Description="<html>Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren</html>" +EditorType=boolean +Enabled=false +TrueFalse="indent_comma_paren=true|indent_comma_paren=false" +Value=0 +ValueDefault=0 + [indent_func_call_param] Category=1 Description=<html>Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false)</html> @@ -516,6 +637,17 @@ Value=0 ValueDefault=0 +[indent_paren_close] +CallName="indent_paren_close=" +Category=1 +Description=<html>Controls the indent of a close paren after a newline.<BR>0: Indent to body level<BR>1: Align under the open paren<BR>2: Indent to the brace level</html> +EditorType=numeric +Enabled=false +MaxVal=16 +MinVal=0 +Value=0 +ValueDefault=0 + [indent_paren_nl] Category=1 Description="<html>If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended)</html>" @@ -525,6 +657,15 @@ Value=0 ValueDefault=0 +[indent_preserve_sql] +Category=1 +Description=<html>Don't change the relative indent of ESQL/C 'EXEC SQL' bodies</html> +EditorType=boolean +Enabled=false +TrueFalse="indent_preserve_sql=true|indent_preserve_sql=false" +Value=0 +ValueDefault=0 + [indent_sing_line_comments] CallName="indent_sing_line_comments=" Category=1 @@ -590,7 +731,7 @@ ValueDefault=8 [ls_for_split_full] -Category=5 +Category=6 Description=<html>Whether to fully split long 'for' statements at semi-colons</html> EditorType=boolean Enabled=false @@ -599,7 +740,7 @@ ValueDefault=0 [ls_func_split_full] -Category=5 +Category=6 Description=<html>Whether to fully split long function protos/calls at commas</html> EditorType=boolean Enabled=false @@ -608,7 +749,7 @@ ValueDefault=0 [mod_full_brace_do] -Category=7 +Category=8 Choices="mod_full_brace_do=ignore|mod_full_brace_do=add|mod_full_brace_do=remove|mod_full_brace_do=force" Description=<html>Add or remove braces on single-line 'do' statement</html> EditorType=multiple @@ -617,7 +758,7 @@ ValueDefault=0 [mod_full_brace_for] -Category=7 +Category=8 Choices="mod_full_brace_for=ignore|mod_full_brace_for=add|mod_full_brace_for=remove|mod_full_brace_for=force" Description=<html>Add or remove braces on single-line 'for' statement</html> EditorType=multiple @@ -626,7 +767,7 @@ ValueDefault=0 [mod_full_brace_function] -Category=7 +Category=8 Choices="mod_full_brace_function=ignore|mod_full_brace_function=add|mod_full_brace_function=remove|mod_full_brace_function=force" Description=<html>Add or remove braces on single-line function defintions. (Pawn)</html> EditorType=multiple @@ -635,7 +776,7 @@ ValueDefault=0 [mod_full_brace_if] -Category=7 +Category=8 Choices="mod_full_brace_if=ignore|mod_full_brace_if=add|mod_full_brace_if=remove|mod_full_brace_if=force" Description=<html>Add or remove braces on single-line 'if' statement</html> EditorType=multiple @@ -645,7 +786,7 @@ [mod_full_brace_nl] CallName="mod_full_brace_nl=" -Category=7 +Category=8 Description=<html>Don't remove braces around statements that span N newlines</html> EditorType=numeric Enabled=false @@ -655,7 +796,7 @@ ValueDefault=0 [mod_full_brace_while] -Category=7 +Category=8 Choices="mod_full_brace_while=ignore|mod_full_brace_while=add|mod_full_brace_while=remove|mod_full_brace_while=force" Description=<html>Add or remove braces on single-line 'while' statement</html> EditorType=multiple @@ -664,7 +805,7 @@ ValueDefault=0 [mod_full_paren_if_bool] -Category=7 +Category=8 Description=<html>Add parens on 'while' and 'if' statement around bools</html> EditorType=boolean Enabled=false @@ -673,7 +814,7 @@ ValueDefault=0 [mod_paren_on_return] -Category=7 +Category=8 Choices="mod_paren_on_return=ignore|mod_paren_on_return=add|mod_paren_on_return=remove|mod_paren_on_return=force" Description=<html>Add or remove unnecessary paren on 'return' statement</html> EditorType=multiple @@ -682,7 +823,7 @@ ValueDefault=0 [mod_pawn_semicolon] -Category=7 +Category=8 Description=<html>Whether to change optional semicolons to real semicolons</html> EditorType=boolean Enabled=false @@ -690,6 +831,15 @@ Value=0 ValueDefault=0 +[mod_remove_extra_semicolon] +Category=8 +Description=<html>Whether to remove superfluous semicolons</html> +EditorType=boolean +Enabled=false +TrueFalse="mod_remove_extra_semicolon=true|mod_remove_extra_semicolon=false" +Value=0 +ValueDefault=0 + [newlines] Category=0 Choices="newlines=lf|newlines=crlf|newlines=cr|newlines=auto" @@ -699,15 +849,35 @@ Value=3 ValueDefault=3 +[nl_after_access_spec] +CallName="nl_after_access_spec=" +Category=7 +Description="<html>The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.<BR>0 = No change.</html>" +EditorType=numeric +Enabled=false +MaxVal=16 +MinVal=0 +Value=0 +ValueDefault=0 + [nl_after_brace_open] Category=4 -Description=<html>Whether to put a newline after brace open</html> +Description=<html>Whether to put a newline after brace open.<BR>This also adds a newline before the matching brace close.</html> EditorType=boolean Enabled=false TrueFalse="nl_after_brace_open=true|nl_after_brace_open=false" Value=0 ValueDefault=0 +[nl_after_brace_open_cmt] +Category=4 +Description="<html>If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is<BR>placed between the open brace and a trailing single-line comment.</html>" +EditorType=boolean +Enabled=false +TrueFalse="nl_after_brace_open_cmt=true|nl_after_brace_open_cmt=false" +Value=0 +ValueDefault=0 + [nl_after_case] Category=4 Description=<html>Whether to put a newline after 'case' statement</html> @@ -737,7 +907,7 @@ [nl_after_func_body] CallName="nl_after_func_body=" -Category=6 +Category=7 Description=<html>The number of newlines after '}' of a multi-line function body</html> EditorType=numeric Enabled=false @@ -748,7 +918,7 @@ [nl_after_func_body_one_liner] CallName="nl_after_func_body_one_liner=" -Category=6 +Category=7 Description=<html>The number of newlines after '}' of a single line function body</html> EditorType=numeric Enabled=false @@ -759,7 +929,7 @@ [nl_after_func_proto] CallName="nl_after_func_proto=" -Category=6 +Category=7 Description="<html>The number of newlines after a function prototype, if followed by another function prototype</html>" EditorType=numeric Enabled=false @@ -770,7 +940,7 @@ [nl_after_func_proto_group] CallName="nl_after_func_proto_group=" -Category=6 +Category=7 Description="<html>The number of newlines after a function prototype, if not followed by another function prototype</html>" EditorType=numeric Enabled=false @@ -788,6 +958,15 @@ Value=0 ValueDefault=0 +[nl_after_multiline_comment] +Category=7 +Description=<html>Whether to force a newline after a mulit-line comment.</html> +EditorType=boolean +Enabled=false +TrueFalse="nl_after_multiline_comment=true|nl_after_multiline_comment=false" +Value=0 +ValueDefault=0 + [nl_after_return] Category=4 Description=<html>Whether to put a newline after 'return' statement</html> @@ -806,6 +985,15 @@ Value=0 ValueDefault=0 +[nl_after_square_assign] +Category=4 +Choices="nl_after_square_assign=ignore|nl_after_square_assign=add|nl_after_square_assign=remove|nl_after_square_assign=force" +Description="<html>Add or remove newline after '= [' (D only). Will also affect the newline before the ']'</html>" +EditorType=multiple +Enabled=false +Value=0 +ValueDefault=0 + [nl_after_switch] Category=4 Choices="nl_after_switch=ignore|nl_after_switch=add|nl_after_switch=remove|nl_after_switch=force" @@ -815,6 +1003,15 @@ Value=0 ValueDefault=0 +[nl_after_vbrace_open] +Category=4 +Description=<html>Whether to put a newline after a virtual brace open.<BR>These occur in un-braced if/while/do/for statement bodies.</html> +EditorType=boolean +Enabled=false +TrueFalse="nl_after_vbrace_open=true|nl_after_vbrace_open=false" +Value=0 +ValueDefault=0 + [nl_after_while] Category=4 Choices="nl_after_while=ignore|nl_after_while=add|nl_after_while=remove|nl_after_while=force" @@ -835,16 +1032,36 @@ [nl_assign_leave_one_liners] Category=4 -Description="<html>Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };'</html>" +Description="<html>Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'</html>" EditorType=boolean Enabled=false TrueFalse="nl_assign_leave_one_liners=true|nl_assign_leave_one_liners=false" Value=0 ValueDefault=0 +[nl_assign_square] +Category=4 +Choices="nl_assign_square=ignore|nl_assign_square=add|nl_assign_square=remove|nl_assign_square=force" +Description="<html>Add or remove newline between '=' and '[' (D only)</html>" +EditorType=multiple +Enabled=false +Value=0 +ValueDefault=0 + +[nl_before_access_spec] +CallName="nl_before_access_spec=" +Category=7 +Description="<html>The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.<BR>Will not change the newline count if after a brace open.<BR>0 = No change.</html>" +EditorType=numeric +Enabled=false +MaxVal=16 +MinVal=0 +Value=0 +ValueDefault=0 + [nl_before_block_comment] CallName="nl_before_block_comment=" -Category=6 +Category=7 Description=<html>The minimum number of newlines before a multi-line comment.<BR>Doesn't apply if after a brace open or another multi-line comment.</html> EditorType=numeric Enabled=false @@ -855,7 +1072,7 @@ [nl_before_c_comment] CallName="nl_before_c_comment=" -Category=6 +Category=7 Description=<html>The minimum number of newlines before a single-line C comment.<BR>Doesn't apply if after a brace open or other single-line C comments.</html> EditorType=numeric Enabled=false @@ -875,7 +1092,7 @@ [nl_before_cpp_comment] CallName="nl_before_cpp_comment=" -Category=6 +Category=7 Description=<html>The minimum number of newlines before a CPP comment.<BR>Doesn't apply if after a brace open or other CPP comments.</html> EditorType=numeric Enabled=false @@ -983,6 +1200,15 @@ Value=0 ValueDefault=0 +[nl_class_colon] +Category=4 +Choices="nl_class_colon=ignore|nl_class_colon=add|nl_class_colon=remove|nl_class_colon=force" +Description="<html>Add or remove a newline around a class colon.<BR>Related to pos_class_colon, nl_class_init_args, and pos_comma.</html>" +EditorType=multiple +Enabled=false +Value=0 +ValueDefault=0 + [nl_class_init_args] Category=4 Choices="nl_class_init_args=ignore|nl_class_init_args=add|nl_class_init_args=remove|nl_class_init_args=force" @@ -994,7 +1220,7 @@ [nl_class_leave_one_liners] Category=4 -Description=<html>Don't touch one-line function bodies inside a class xx { } body</html> +Description=<html>Don't split one-line braced statements inside a class xx { } body</html> EditorType=boolean Enabled=false TrueFalse="nl_class_leave_one_liners=true|nl_class_leave_one_liners=false" @@ -1010,6 +1236,33 @@ Value=0 ValueDefault=0 +[nl_create_for_one_liner] +Category=4 +Description="<html>Change simple unbraced for statements into a one-liner<BR>'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'</html>" +EditorType=boolean +Enabled=false +TrueFalse="nl_create_for_one_liner=true|nl_create_for_one_liner=false" +Value=0 +ValueDefault=0 + +[nl_create_if_one_liner] +Category=4 +Description="<html>Change simple unbraced if statements into a one-liner<BR>'if(b)\n i++;' => 'if(b) i++;'</html>" +EditorType=boolean +Enabled=false +TrueFalse="nl_create_if_one_liner=true|nl_create_if_one_liner=false" +Value=0 +ValueDefault=0 + +[nl_create_while_one_liner] +Category=4 +Description="<html>Change simple unbraced while statements into a one-liner<BR>'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'</html>" +EditorType=boolean +Enabled=false +TrueFalse="nl_create_while_one_liner=true|nl_create_while_one_liner=false" +Value=0 +ValueDefault=0 + [nl_define_macro] Category=4 Description=<html>Whether to alter newlines in '#define' macros</html> @@ -1028,6 +1281,15 @@ Value=0 ValueDefault=0 +[nl_ds_struct_enum_close_brace] +Category=4 +Description=<html>Whether to double-space before the close brace of a struct/union/enum</html> +EditorType=boolean +Enabled=false +TrueFalse="nl_ds_struct_enum_close_brace=true|nl_ds_struct_enum_close_brace=false" +Value=0 +ValueDefault=0 + [nl_ds_struct_enum_cmt] Category=4 Description=<html>Whether to double-space commented-entries in struct/enum</html> @@ -1084,10 +1346,19 @@ Value=0 ValueDefault=0 +[nl_enum_leave_one_liners] +Category=4 +Description="<html>Don't split one-line enums: 'enum foo { BAR = 15 };'</html>" +EditorType=boolean +Enabled=false +TrueFalse="nl_enum_leave_one_liners=true|nl_enum_leave_one_liners=false" +Value=0 +ValueDefault=0 + [nl_fcall_brace] Category=4 Choices="nl_fcall_brace=ignore|nl_fcall_brace=add|nl_fcall_brace=remove|nl_fcall_brace=force" -Description=<html>Add or remove newline between function call and '('</html> +Description="<html>Add or remove newline between a function call's ')' and '{', as in:<BR>list_for_each(item, &list) { }</html>" EditorType=multiple Enabled=false Value=0 @@ -1147,6 +1418,24 @@ Value=0 ValueDefault=0 +[nl_func_leave_one_liners] +Category=4 +Description="<html>Don't split one-line function definitions - 'int foo() { return 0; }'</html>" +EditorType=boolean +Enabled=false +TrueFalse="nl_func_leave_one_liners=true|nl_func_leave_one_liners=false" +Value=0 +ValueDefault=0 + +[nl_func_paren] +Category=4 +Choices="nl_func_paren=ignore|nl_func_paren=add|nl_func_paren=remove|nl_func_paren=force" +Description=<html>Add or remove newline between a function name and the opening '('</html> +EditorType=multiple +Enabled=false +Value=0 +ValueDefault=0 + [nl_func_type_name] Category=4 Choices="nl_func_type_name=ignore|nl_func_type_name=add|nl_func_type_name=remove|nl_func_type_name=force" @@ -1176,6 +1465,15 @@ Value=0 ValueDefault=0 +[nl_getset_leave_one_liners] +Category=4 +Description=<html>Don't split one-line get or set functions</html> +EditorType=boolean +Enabled=false +TrueFalse="nl_getset_leave_one_liners=true|nl_getset_leave_one_liners=false" +Value=0 +ValueDefault=0 + [nl_if_brace] Category=4 Choices="nl_if_brace=ignore|nl_if_brace=add|nl_if_brace=remove|nl_if_brace=force" @@ -1185,9 +1483,18 @@ Value=0 ValueDefault=0 +[nl_if_leave_one_liners] +Category=4 +Description="<html>Don't split one-line if/else statements - 'if(a) b++;'</html>" +EditorType=boolean +Enabled=false +TrueFalse="nl_if_leave_one_liners=true|nl_if_leave_one_liners=false" +Value=0 +ValueDefault=0 + [nl_max] CallName="nl_max=" -Category=6 +Category=7 Description=<html>The maximum consecutive newlines</html> EditorType=numeric Enabled=false @@ -1196,6 +1503,15 @@ Value=0 ValueDefault=0 +[nl_multi_line_cond] +Category=4 +Description=<html>Add or remove newline when condition spans two or more lines</html> +EditorType=boolean +Enabled=false +TrueFalse="nl_multi_line_cond=true|nl_multi_line_cond=false" +Value=0 +ValueDefault=0 + [nl_namespace_brace] Category=4 Choices="nl_namespace_brace=ignore|nl_namespace_brace=add|nl_namespace_brace=remove|nl_namespace_brace=force" @@ -1317,6 +1633,15 @@ Value=0 ValueDefault=0 +[pos_class_comma] +Category=5 +Choices="pos_class_comma=ignore|pos_class_comma=lead|pos_class_comma=trail" +Description=<html>The position of the comma in the constructor initialization list</html> +EditorType=multiple +Enabled=false +Value=0 +ValueDefault=0 + [pos_comma] Category=5 Choices="pos_comma=ignore|pos_comma=lead|pos_comma=trail" @@ -1326,24 +1651,102 @@ Value=0 ValueDefault=0 +[pp_define_at_level] +Category=10 +Description=<html>Whether to indent '#define' at the brace level (true) or from column 1 (false)</html> +EditorType=boolean +Enabled=false +TrueFalse="pp_define_at_level=true|pp_define_at_level=false" +Value=0 +ValueDefault=0 + +[pp_if_indent_code] +Category=10 +Description="<html>Control whether to indent the code between #if, #else and #endif when not at file-level</html>" +EditorType=boolean +Enabled=false +TrueFalse="pp_if_indent_code=true|pp_if_indent_code=false" +Value=0 +ValueDefault=0 + [pp_indent] -Category=9 +Category=10 Choices="pp_indent=ignore|pp_indent=add|pp_indent=remove|pp_indent=force" -Description=<html>Add or remove indent of preprocessor directives</html> +Description=<html>Control indent of preprocessors inside #if blocks at brace level 0</html> EditorType=multiple Enabled=false Value=0 ValueDefault=0 +[pp_indent_at_level] +Category=10 +Description=<html>Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false)</html> +EditorType=boolean +Enabled=false +TrueFalse="pp_indent_at_level=true|pp_indent_at_level=false" +Value=0 +ValueDefault=0 + +[pp_indent_if] +CallName="pp_indent_if=" +Category=10 +Description="<html>If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level</html>" +EditorType=numeric +Enabled=false +MaxVal=16 +MinVal=0 +Value=0 +ValueDefault=0 + +[pp_indent_region] +CallName="pp_indent_region=" +Category=10 +Description=<html>The indent for #region and #endregion in C# and '#pragma region' in C/C++</html> +EditorType=numeric +Enabled=false +MaxVal=16 +MinVal=0 +Value=0 +ValueDefault=0 + +[pp_region_indent_code] +Category=10 +Description=<html>Whether to indent the code between #region and #endregion</html> +EditorType=boolean +Enabled=false +TrueFalse="pp_region_indent_code=true|pp_region_indent_code=false" +Value=0 +ValueDefault=0 + [pp_space] -Category=9 +Category=10 Choices="pp_space=ignore|pp_space=add|pp_space=remove|pp_space=force" -Description="<html>Add or remove space between # and, say, define</html>" +Description=<html>Add or remove space after # based on pp_level of #if blocks</html> EditorType=multiple Enabled=false Value=0 ValueDefault=0 +[pp_space_count] +CallName="pp_space_count=" +Category=10 +Description=<html>Sets the number of spaces added with pp_space</html> +EditorType=numeric +Enabled=false +MaxVal=16 +MinVal=0 +Value=0 +ValueDefault=0 + +[sp_addr] +Category=2 +Choices="sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force" +Description="<html>Add or remove space after the '&' (address-of) operator.<BR>This does not affect the spacing after a '&' that is part of a type.</html>" +EditorType=multiple +Enabled=false +Value=2 +ValueDefault=2 + [sp_after_angle] Category=2 Choices="sp_after_angle=ignore|sp_after_angle=add|sp_after_angle=remove|sp_after_angle=force" @@ -1356,7 +1759,7 @@ [sp_after_byref] Category=2 Choices="sp_after_byref=ignore|sp_after_byref=add|sp_after_byref=remove|sp_after_byref=force" -Description="<html>Add or remove space after reference sign '&'</html>" +Description="<html>Add or remove space after reference sign '&', if followed by a word.</html>" EditorType=multiple Enabled=false Value=0 @@ -1380,6 +1783,15 @@ Value=0 ValueDefault=0 +[sp_after_dc] +Category=2 +Choices="sp_after_dc=ignore|sp_after_dc=add|sp_after_dc=remove|sp_after_dc=force" +Description=<html>Add or remove space after the '::' operator</html> +EditorType=multiple +Enabled=false +Value=0 +ValueDefault=0 + [sp_after_operator] Category=2 Choices="sp_after_operator=ignore|sp_after_operator=add|sp_after_operator=remove|sp_after_operator=force" @@ -1392,7 +1804,16 @@ [sp_after_ptr_star] Category=2 Choices="sp_after_ptr_star=ignore|sp_after_ptr_star=add|sp_after_ptr_star=remove|sp_after_ptr_star=force" -Description=<html>Add or remove space after pointer star '*'</html> +Description="<html>Add or remove space after pointer star '*', if followed by a word.</html>" +EditorType=multiple +Enabled=false +Value=0 +ValueDefault=0 + +[sp_after_semi_for_empty] +Category=2 +Choices="sp_after_semi_for_empty=ignore|sp_after_semi_for_empty=add|sp_after_semi_for_empty=remove|sp_after_semi_for_empty=force" +Description="<html>Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; <here> ).</html>" EditorType=multiple Enabled=false Value=0 @@ -1452,6 +1873,15 @@ Value=0 ValueDefault=0 +[sp_attribute_paren] +Category=2 +Choices="sp_attribute_paren=ignore|sp_attribute_paren=add|sp_attribute_paren=remove|sp_attribute_paren=force" +Description=<html>Add or remove space between '__attribute__' and '('</html> +EditorType=multiple +Enabled=false +Value=0 +ValueDefault=0 + [sp_balance_nested_parens] Category=2 Description=<html>Whether to balance spaces inside nested parens</html> @@ -1488,6 +1918,15 @@ Value=2 ValueDefault=2 +[sp_before_dc] +Category=2 +Choices="sp_before_dc=ignore|sp_before_dc=add|sp_before_dc=remove|sp_before_dc=force" +Description=<html>Add or remove space before the '::' operator</html> +EditorType=multiple +Enabled=false +Value=0 +ValueDefault=0 + [sp_before_ptr_star] Category=2 Choices="sp_before_ptr_star=ignore|sp_before_ptr_star=add|sp_before_ptr_star=remove|sp_before_ptr_star=force" @@ -1614,6 +2053,24 @@ Value=0 ValueDefault=0 +[sp_d_array_colon] +Category=2 +Choices="sp_d_array_colon=ignore|sp_d_array_colon=add|sp_d_array_colon=remove|sp_d_array_colon=force" +Description=<html>Add or remove around the D named array initializer ':' operator</html> +EditorType=multiple +Enabled=false +Value=0 +ValueDefault=0 + +[sp_deref] +Category=2 +Choices="sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force" +Description=<html>Add or remove space after the '*' (dereference) operator.<BR>This does not affect the spacing after a '*' that is part of a type.</html> +EditorType=multiple +Enabled=false +Value=2 +ValueDefault=2 + [sp_else_brace] Category=2 Choices="sp_else_brace=ignore|sp_else_brace=add|sp_else_brace=remove|sp_else_brace=force" @@ -1776,6 +2233,15 @@ Value=0 ValueDefault=0 +[sp_inv] +Category=2 +Choices="sp_inv=ignore|sp_inv=add|sp_inv=remove|sp_inv=force" +Description=<html>Add or remove space after the '~' (invert) operator.</html> +EditorType=multiple +Enabled=false +Value=2 +ValueDefault=2 + [sp_macro] Category=2 Choices="sp_macro=ignore|sp_macro=add|sp_macro=remove|sp_macro=force" @@ -1794,6 +2260,15 @@ Value=0 ValueDefault=0 +[sp_not] +Category=2 +Choices="sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force" +Description=<html>Add or remove space after the '!' (not) operator.</html> +EditorType=multiple +Enabled=false +Value=2 +ValueDefault=2 + [sp_paren_brace] Category=2 Choices="sp_paren_brace=ignore|sp_paren_brace=add|sp_paren_brace=remove|sp_paren_brace=force"