Merge pull request #16411 from dundargoc/refactor/upgrade-uncrustify

refactor: upgrade uncrustify config version to 0.74.0
This commit is contained in:
Björn Linse 2021-12-04 12:31:42 +01:00 committed by GitHub
commit 76af219e3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 293 additions and 188 deletions

View File

@ -1,3 +1,5 @@
// uncrustify:off
#ifndef NVIM_ASSERT_H #ifndef NVIM_ASSERT_H
#define NVIM_ASSERT_H #define NVIM_ASSERT_H

View File

@ -3926,7 +3926,8 @@ static buf_T *ins_compl_next_buf(buf_T *buf, int flag)
/// Get the user-defined completion function name for completion 'type' /// Get the user-defined completion function name for completion 'type'
static char_u *get_complete_funcname(int type) { static char_u *get_complete_funcname(int type)
{
switch (type) { switch (type) {
case CTRL_X_FUNCTION: case CTRL_X_FUNCTION:
return curbuf->b_p_cfu; return curbuf->b_p_cfu;
@ -6573,7 +6574,7 @@ static void spell_back_to_badword(void)
int stop_arrow(void) int stop_arrow(void)
{ {
if (arrow_used) { if (arrow_used) {
Insstart = curwin->w_cursor; //new insertion starts here Insstart = curwin->w_cursor; // new insertion starts here
if (Insstart.col > Insstart_orig.col && !ins_need_undo) { if (Insstart.col > Insstart_orig.col && !ins_need_undo) {
// Don't update the original insert position when moved to the // Don't update the original insert position when moved to the
// right, except when nothing was inserted yet. // right, except when nothing was inserted yet.
@ -7639,16 +7640,34 @@ int hkmap(int c)
KAFsofit, hKAF, LAMED, MEMsofit, MEM, NUNsofit, NUN, SAMEH, AIN, KAFsofit, hKAF, LAMED, MEMsofit, MEM, NUNsofit, NUN, SAMEH, AIN,
PEIsofit, PEI, ZADIsofit, ZADI, KOF, RESH, hSHIN, TAV, PEIsofit, PEI, ZADIsofit, ZADI, KOF, RESH, hSHIN, TAV,
}; };
static char_u map[26] = static char_u map[26] = {
{ (char_u)hALEF /*a*/, (char_u)BET /*b*/, (char_u)hKAF /*c*/, (char_u)hALEF, // a
(char_u)DALET /*d*/, (char_u)-1 /*e*/, (char_u)PEIsofit /*f*/, (char_u)BET, // b
(char_u)GIMEL /*g*/, (char_u)HEI /*h*/, (char_u)IUD /*i*/, (char_u)hKAF, // c
(char_u)HET /*j*/, (char_u)KOF /*k*/, (char_u)LAMED /*l*/, (char_u)DALET, // d
(char_u)MEM /*m*/, (char_u)NUN /*n*/, (char_u)SAMEH /*o*/, (char_u)-1, // e
(char_u)PEI /*p*/, (char_u)-1 /*q*/, (char_u)RESH /*r*/, (char_u)PEIsofit, // f
(char_u)ZAIN /*s*/, (char_u)TAV /*t*/, (char_u)TET /*u*/, (char_u)GIMEL, // g
(char_u)VAV /*v*/, (char_u)hSHIN /*w*/, (char_u)-1 /*x*/, (char_u)HEI, // h
(char_u)AIN /*y*/, (char_u)ZADI /*z*/ }; (char_u)IUD, // i
(char_u)HET, // j
(char_u)KOF, // k
(char_u)LAMED, // l
(char_u)MEM, // m
(char_u)NUN, // n
(char_u)SAMEH, // o
(char_u)PEI, // p
(char_u)-1, // q
(char_u)RESH, // r
(char_u)ZAIN, // s
(char_u)TAV, // t
(char_u)TET, // u
(char_u)VAV, // v
(char_u)hSHIN, // w
(char_u)-1, // x
(char_u)AIN, // y
(char_u)ZADI, // z
};
if (c == 'N' || c == 'M' || c == 'P' || c == 'C' || c == 'Z') { if (c == 'N' || c == 'M' || c == 'P' || c == 'C' || c == 'Z') {
return (int)(map[CharOrd(c)] - 1 + p_aleph); return (int)(map[CharOrd(c)] - 1 + p_aleph);

View File

@ -782,10 +782,10 @@ void nlua_push_Object(lua_State *lstate, const Object obj, bool special)
break; break;
} }
#define ADD_TYPE(type, data_key) \ #define ADD_TYPE(type, data_key) \
case kObjectType##type: { \ case kObjectType##type: { \
nlua_push_##type(lstate, obj.data.data_key, special); \ nlua_push_##type(lstate, obj.data.data_key, special); \
break; \ break; \
} }
ADD_TYPE(Boolean, boolean) ADD_TYPE(Boolean, boolean)
ADD_TYPE(Integer, integer) ADD_TYPE(Integer, integer)
ADD_TYPE(Float, floating) ADD_TYPE(Float, floating)
@ -794,10 +794,10 @@ case kObjectType##type: { \
ADD_TYPE(Dictionary, dictionary) ADD_TYPE(Dictionary, dictionary)
#undef ADD_TYPE #undef ADD_TYPE
#define ADD_REMOTE_TYPE(type) \ #define ADD_REMOTE_TYPE(type) \
case kObjectType##type: { \ case kObjectType##type: { \
nlua_push_##type(lstate, (type)obj.data.integer, special); \ nlua_push_##type(lstate, (type)obj.data.integer, special); \
break; \ break; \
} }
ADD_REMOTE_TYPE(Buffer) ADD_REMOTE_TYPE(Buffer)
ADD_REMOTE_TYPE(Window) ADD_REMOTE_TYPE(Window)
ADD_REMOTE_TYPE(Tabpage) ADD_REMOTE_TYPE(Tabpage)

View File

@ -92,7 +92,7 @@ bool msgpack_rpc_to_object(const msgpack_object *const obj, Object *const arg)
break; break;
} }
#define STR_CASE(type, attr, obj, dest, conv) \ #define STR_CASE(type, attr, obj, dest, conv) \
case type: { \ case type: { \
dest = conv(((String) { \ dest = conv(((String) { \
.size = obj->via.attr.size, \ .size = obj->via.attr.size, \
.data = (obj->via.attr.ptr == NULL || obj->via.attr.size == 0 \ .data = (obj->via.attr.ptr == NULL || obj->via.attr.size == 0 \
@ -100,7 +100,7 @@ case type: { \
: xmemdupz(obj->via.attr.ptr, obj->via.attr.size)), \ : xmemdupz(obj->via.attr.ptr, obj->via.attr.size)), \
})); \ })); \
break; \ break; \
} }
STR_CASE(MSGPACK_OBJECT_STR, str, cur.mobj, *cur.aobj, STRING_OBJ) STR_CASE(MSGPACK_OBJECT_STR, str, cur.mobj, *cur.aobj, STRING_OBJ)
STR_CASE(MSGPACK_OBJECT_BIN, bin, cur.mobj, *cur.aobj, STRING_OBJ) STR_CASE(MSGPACK_OBJECT_BIN, bin, cur.mobj, *cur.aobj, STRING_OBJ)
case MSGPACK_OBJECT_ARRAY: { case MSGPACK_OBJECT_ARRAY: {

View File

@ -206,12 +206,12 @@ LexExprToken viml_pexpr_next_token(ParserState *const pstate, const int flags)
switch (schar) { switch (schar) {
// Paired brackets. // Paired brackets.
#define BRACKET(typ, opning, clsing) \ #define BRACKET(typ, opning, clsing) \
case opning: \ case opning: \
case clsing: { \ case clsing: { \
ret.type = typ; \ ret.type = typ; \
ret.data.brc.closing = (schar == clsing); \ ret.data.brc.closing = (schar == clsing); \
break; \ break; \
} }
BRACKET(kExprLexParenthesis, '(', ')') BRACKET(kExprLexParenthesis, '(', ')')
BRACKET(kExprLexBracket, '[', ']') BRACKET(kExprLexBracket, '[', ']')
BRACKET(kExprLexFigureBrace, '{', '}') BRACKET(kExprLexFigureBrace, '{', '}')
@ -219,10 +219,10 @@ case clsing: { \
// Single character tokens without data. // Single character tokens without data.
#define CHAR(typ, ch) \ #define CHAR(typ, ch) \
case ch: { \ case ch: { \
ret.type = typ; \ ret.type = typ; \
break; \ break; \
} }
CHAR(kExprLexQuestion, '?') CHAR(kExprLexQuestion, '?')
CHAR(kExprLexColon, ':') CHAR(kExprLexColon, ':')
CHAR(kExprLexComma, ',') CHAR(kExprLexComma, ',')
@ -230,11 +230,11 @@ case ch: { \
// Multiplication/division/modulo. // Multiplication/division/modulo.
#define MUL(mul_type, ch) \ #define MUL(mul_type, ch) \
case ch: { \ case ch: { \
ret.type = kExprLexMultiplication; \ ret.type = kExprLexMultiplication; \
ret.data.mul.type = mul_type; \ ret.data.mul.type = mul_type; \
break; \ break; \
} }
MUL(kExprLexMulMul, '*') MUL(kExprLexMulMul, '*')
MUL(kExprLexMulDiv, '/') MUL(kExprLexMulDiv, '/')
MUL(kExprLexMulMod, '%') MUL(kExprLexMulMod, '%')
@ -653,7 +653,7 @@ case ch: { \
// Sign or augmented assignment. // Sign or augmented assignment.
#define CHAR_OR_ASSIGN(ch, ch_type, ass_type) \ #define CHAR_OR_ASSIGN(ch, ch_type, ass_type) \
case ch: { \ case ch: { \
if (pline.size > 1 && pline.data[1] == '=') { \ if (pline.size > 1 && pline.data[1] == '=') { \
ret.len++; \ ret.len++; \
ret.type = kExprLexAssignment; \ ret.type = kExprLexAssignment; \
@ -662,7 +662,7 @@ case ch: { \
ret.type = ch_type; \ ret.type = ch_type; \
} \ } \
break; \ break; \
} }
CHAR_OR_ASSIGN('+', kExprLexPlus, kExprAsgnAdd) CHAR_OR_ASSIGN('+', kExprLexPlus, kExprAsgnAdd)
CHAR_OR_ASSIGN('.', kExprLexDot, kExprAsgnConcat) CHAR_OR_ASSIGN('.', kExprLexDot, kExprAsgnConcat)
#undef CHAR_OR_ASSIGN #undef CHAR_OR_ASSIGN
@ -811,10 +811,10 @@ const char *viml_pexpr_repr_token(const ParserState *const pstate, const LexExpr
eltkn_type_tab[token.type]); eltkn_type_tab[token.type]);
switch (token.type) { switch (token.type) {
#define TKNARGS(tkn_type, ...) \ #define TKNARGS(tkn_type, ...) \
case tkn_type: { \ case tkn_type: { \
ADDSTR(__VA_ARGS__); \ ADDSTR(__VA_ARGS__); \
break; \ break; \
} }
TKNARGS(kExprLexComparison, "(type=%s,ccs=%s,inv=%i)", TKNARGS(kExprLexComparison, "(type=%s,ccs=%s,inv=%i)",
eltkn_cmp_type_tab[token.data.cmp.type], eltkn_cmp_type_tab[token.data.cmp.type],
ccs_tab[token.data.cmp.ccs], ccs_tab[token.data.cmp.ccs],
@ -1747,11 +1747,11 @@ static void parse_quoted_string(ParserState *const pstate, ExprASTNode *const no
const char *const v_p_start = v_p; const char *const v_p_start = v_p;
switch (*p) { switch (*p) {
#define SINGLE_CHAR_ESC(ch, real_ch) \ #define SINGLE_CHAR_ESC(ch, real_ch) \
case ch: { \ case ch: { \
*v_p++ = real_ch; \ *v_p++ = real_ch; \
p++; \ p++; \
break; \ break; \
} }
SINGLE_CHAR_ESC('b', BS) SINGLE_CHAR_ESC('b', BS)
SINGLE_CHAR_ESC('e', ESC) SINGLE_CHAR_ESC('e', ESC)
SINGLE_CHAR_ESC('f', FF) SINGLE_CHAR_ESC('f', FF)
@ -2141,7 +2141,7 @@ viml_pexpr_parse_process_token:
break; break;
} }
#define SIMPLE_UB_OP(op) \ #define SIMPLE_UB_OP(op) \
case kExprLex##op: { \ case kExprLex##op: { \
if (want_node == kENodeValue) { \ if (want_node == kENodeValue) { \
/* Value level: assume unary operator. */ \ /* Value level: assume unary operator. */ \
NEW_NODE_WITH_CUR_POS(cur_node, kExprNodeUnary##op); \ NEW_NODE_WITH_CUR_POS(cur_node, kExprNodeUnary##op); \
@ -2155,18 +2155,18 @@ case kExprLex##op: { \
} \ } \
want_node = kENodeValue; \ want_node = kENodeValue; \
break; \ break; \
} }
SIMPLE_UB_OP(Plus) SIMPLE_UB_OP(Plus)
SIMPLE_UB_OP(Minus) SIMPLE_UB_OP(Minus)
#undef SIMPLE_UB_OP #undef SIMPLE_UB_OP
#define SIMPLE_B_OP(op, msg) \ #define SIMPLE_B_OP(op, msg) \
case kExprLex##op: { \ case kExprLex##op: { \
ADD_VALUE_IF_MISSING(_("E15: Unexpected " msg ": %.*s")); \ ADD_VALUE_IF_MISSING(_("E15: Unexpected " msg ": %.*s")); \
NEW_NODE_WITH_CUR_POS(cur_node, kExprNode##op); \ NEW_NODE_WITH_CUR_POS(cur_node, kExprNode##op); \
HL_CUR_TOKEN(op); \ HL_CUR_TOKEN(op); \
ADD_OP_NODE(cur_node); \ ADD_OP_NODE(cur_node); \
break; \ break; \
} }
SIMPLE_B_OP(Or, "or operator") SIMPLE_B_OP(Or, "or operator")
SIMPLE_B_OP(And, "and operator") SIMPLE_B_OP(And, "and operator")
#undef SIMPLE_B_OP #undef SIMPLE_B_OP
@ -2174,11 +2174,11 @@ case kExprLex##op: { \
ADD_VALUE_IF_MISSING(_("E15: Unexpected multiplication-like operator: %.*s")); ADD_VALUE_IF_MISSING(_("E15: Unexpected multiplication-like operator: %.*s"));
switch (cur_token.data.mul.type) { switch (cur_token.data.mul.type) {
#define MUL_OP(lex_op_tail, node_op_tail) \ #define MUL_OP(lex_op_tail, node_op_tail) \
case kExprLexMul##lex_op_tail: { \ case kExprLexMul##lex_op_tail: { \
NEW_NODE_WITH_CUR_POS(cur_node, kExprNode##node_op_tail); \ NEW_NODE_WITH_CUR_POS(cur_node, kExprNode##node_op_tail); \
HL_CUR_TOKEN(node_op_tail); \ HL_CUR_TOKEN(node_op_tail); \
break; \ break; \
} }
MUL_OP(Mul, Multiplication) MUL_OP(Mul, Multiplication)
MUL_OP(Div, Division) MUL_OP(Div, Division)
MUL_OP(Mod, Mod) MUL_OP(Mod, Mod)
@ -2929,7 +2929,7 @@ viml_pexpr_parse_no_paren_closing_error: {}
cur_node->data.ass.type = cur_token.data.ass.type; cur_node->data.ass.type = cur_token.data.ass.type;
switch (cur_token.data.ass.type) { switch (cur_token.data.ass.type) {
#define HL_ASGN(asgn, hl) \ #define HL_ASGN(asgn, hl) \
case kExprAsgn##asgn: { HL_CUR_TOKEN(hl); break; } case kExprAsgn##asgn: { HL_CUR_TOKEN(hl); break; }
HL_ASGN(Plain, PlainAssignment) HL_ASGN(Plain, PlainAssignment)
HL_ASGN(Add, AssignmentWithAddition) HL_ASGN(Add, AssignmentWithAddition)
HL_ASGN(Subtract, AssignmentWithSubtraction) HL_ASGN(Subtract, AssignmentWithSubtraction)

View File

@ -1,4 +1,4 @@
# Uncrustify-0.73.0-199-0dfafb27 # Uncrustify-0.74.0
# #
# General options # General options
@ -214,6 +214,10 @@ sp_after_ptr_star_func = remove # ignore/add/remove/force/not_defined
# function prototype or function definition. # function prototype or function definition.
sp_after_ptr_star_trailing = ignore # ignore/add/remove/force/not_defined sp_after_ptr_star_trailing = ignore # ignore/add/remove/force/not_defined
# Add or remove space between the pointer star '*' and the name of the variable
# in a function pointer definition.
sp_ptr_star_func_var = ignore # ignore/add/remove/force/not_defined
# Add or remove space after a pointer star '*', if followed by an open # Add or remove space after a pointer star '*', if followed by an open
# parenthesis, as in 'void* (*)()'. # parenthesis, as in 'void* (*)()'.
sp_ptr_star_paren = ignore # ignore/add/remove/force/not_defined sp_ptr_star_paren = ignore # ignore/add/remove/force/not_defined
@ -311,19 +315,33 @@ sp_permit_cpp11_shift = false # true/false
# 'while', etc.). # 'while', etc.).
sp_before_sparen = force # ignore/add/remove/force/not_defined sp_before_sparen = force # ignore/add/remove/force/not_defined
# Add or remove space inside '(' and ')' of control statements. # Add or remove space inside '(' and ')' of control statements other than
# 'for'.
sp_inside_sparen = remove # ignore/add/remove/force/not_defined sp_inside_sparen = remove # ignore/add/remove/force/not_defined
# Add or remove space after '(' of control statements. # Add or remove space after '(' of control statements other than 'for'.
# #
# Overrides sp_inside_sparen. # Overrides sp_inside_sparen.
sp_inside_sparen_open = remove # ignore/add/remove/force/not_defined sp_inside_sparen_open = remove # ignore/add/remove/force/not_defined
# Add or remove space before ')' of control statements. # Add or remove space before ')' of control statements other than 'for'.
# #
# Overrides sp_inside_sparen. # Overrides sp_inside_sparen.
sp_inside_sparen_close = ignore # ignore/add/remove/force/not_defined sp_inside_sparen_close = ignore # ignore/add/remove/force/not_defined
# Add or remove space inside '(' and ')' of 'for' statements.
sp_inside_for = ignore # ignore/add/remove/force/not_defined
# Add or remove space after '(' of 'for' statements.
#
# Overrides sp_inside_for.
sp_inside_for_open = ignore # ignore/add/remove/force/not_defined
# Add or remove space before ')' of 'for' statements.
#
# Overrides sp_inside_for.
sp_inside_for_close = ignore # ignore/add/remove/force/not_defined
# Add or remove space between '((' or '))' of control statements. # Add or remove space between '((' or '))' of control statements.
sp_sparen_paren = ignore # ignore/add/remove/force/not_defined sp_sparen_paren = ignore # ignore/add/remove/force/not_defined
@ -648,6 +666,11 @@ sp_func_class_paren = ignore # ignore/add/remove/force/not_defined
# and '()'. # and '()'.
sp_func_class_paren_empty = ignore # ignore/add/remove/force/not_defined sp_func_class_paren_empty = ignore # ignore/add/remove/force/not_defined
# Add or remove space after 'return'.
#
# Default: force
sp_return = force # ignore/add/remove/force/not_defined
# Add or remove space between 'return' and '('. # Add or remove space between 'return' and '('.
sp_return_paren = force # ignore/add/remove/force/not_defined sp_return_paren = force # ignore/add/remove/force/not_defined
@ -971,11 +994,31 @@ sp_inside_newop_paren_open = ignore # ignore/add/remove/force/not_defined
# Overrides sp_inside_newop_paren. # Overrides sp_inside_newop_paren.
sp_inside_newop_paren_close = ignore # ignore/add/remove/force/not_defined sp_inside_newop_paren_close = ignore # ignore/add/remove/force/not_defined
# Add or remove space before a trailing or embedded comment. # Add or remove space before a trailing comment.
sp_before_tr_emb_cmt = add # ignore/add/remove/force/not_defined sp_before_tr_cmt = add # ignore/add/remove/force/not_defined
# Number of spaces before a trailing or embedded comment. # Number of spaces before a trailing comment.
sp_num_before_tr_emb_cmt = 2 # unsigned number sp_num_before_tr_cmt = 2 # unsigned number
# Add or remove space before an embedded comment.
#
# Default: force
sp_before_emb_cmt = force # ignore/add/remove/force/not_defined
# Number of spaces before an embedded comment.
#
# Default: 1
sp_num_before_emb_cmt = 1 # unsigned number
# Add or remove space after an embedded comment.
#
# Default: force
sp_after_emb_cmt = force # ignore/add/remove/force/not_defined
# Number of spaces after an embedded comment.
#
# Default: 1
sp_num_after_emb_cmt = 1 # unsigned number
# (Java) Add or remove space between an annotation and the open parenthesis. # (Java) Add or remove space between an annotation and the open parenthesis.
sp_annotation_paren = ignore # ignore/add/remove/force/not_defined sp_annotation_paren = ignore # ignore/add/remove/force/not_defined
@ -1216,12 +1259,16 @@ indent_sparen_extra = 0 # number
indent_relative_single_line_comments = true # true/false indent_relative_single_line_comments = true # true/false
# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns. # Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
# It might wise to choose the same value for the option indent_case_brace. # It might be wise to choose the same value for the option indent_case_brace.
indent_switch_case = 0 # unsigned number indent_switch_case = 0 # unsigned number
# Spaces to indent the body of a 'switch' before any 'case'.
# Usually the same as indent_columns or indent_switch_case.
indent_switch_body = 0 # unsigned number
# Spaces to indent '{' from 'case'. By default, the brace will appear under # Spaces to indent '{' from 'case'. By default, the brace will appear under
# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK. # the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
# It might wise to choose the same value for the option indent_switch_case. # It might be wise to choose the same value for the option indent_switch_case.
indent_case_brace = 0 # number indent_case_brace = 0 # number
# indent 'break' with 'case' from 'switch'. # indent 'break' with 'case' from 'switch'.
@ -1236,13 +1283,31 @@ indent_switch_pp = true # true/false
# Usually 0. # Usually 0.
indent_case_shift = 0 # unsigned number indent_case_shift = 0 # unsigned number
# Whether to align comments before 'case' with the 'case'.
#
# Default: true
indent_case_comment = true # true/false
# Whether to indent comments not found in first column.
#
# Default: true
indent_comment = true # true/false
# Whether to indent comments found in first column. # Whether to indent comments found in first column.
indent_col1_comment = false # true/false indent_col1_comment = false # true/false
# Whether to indent multi string literal in first column. # Whether to indent multi string literal in first column.
indent_col1_multi_string_literal = false # true/false indent_col1_multi_string_literal = false # true/false
# How to indent goto labels. # Align comments on adjacent lines that are this many columns apart or less.
#
# Default: 3
indent_comment_align_thresh = 3 # unsigned number
# Whether to ignore indent for goto labels.
indent_ignore_label = false # true/false
# How to indent goto labels. Requires indent_ignore_label=false.
# #
# >0: Absolute column where 1 is the leftmost column # >0: Absolute column where 1 is the leftmost column
# <=0: Subtract from brace indent # <=0: Subtract from brace indent
@ -1414,7 +1479,7 @@ indent_using_block = true # true/false
# 0: Off (default) # 0: Off (default)
# 1: When the `if_false` is a continuation, indent it under `if_false` # 1: When the `if_false` is a continuation, indent it under `if_false`
# 2: When the `:` is a continuation, indent it under `?` # 2: When the `:` is a continuation, indent it under `?`
indent_ternary_operator = 2 # unsigned number indent_ternary_operator = 0 # unsigned number
# Whether to indent the statements inside ternary operator. # Whether to indent the statements inside ternary operator.
indent_inside_ternary_operator = false # true/false indent_inside_ternary_operator = false # true/false
@ -2622,6 +2687,22 @@ align_right_cmt_at_col = 0 # unsigned number
# 0: Don't align (default). # 0: Don't align (default).
align_func_proto_span = 0 # unsigned number align_func_proto_span = 0 # unsigned number
# How to consider (or treat) the '*' in the alignment of function prototypes.
#
# 0: Part of the type 'void * foo();' (default)
# 1: Part of the function 'void *foo();'
# 2: Dangling 'void *foo();'
# Dangling: the '*' will not be taken into account when aligning.
align_func_proto_star_style = 0 # unsigned number
# How to consider (or treat) the '&' in the alignment of function prototypes.
#
# 0: Part of the type 'long & foo();' (default)
# 1: Part of the function 'long &foo();'
# 2: Dangling 'long &foo();'
# Dangling: the '&' will not be taken into account when aligning.
align_func_proto_amp_style = 0 # unsigned number
# The threshold for aligning function prototypes. # The threshold for aligning function prototypes.
# Use a negative number for absolute thresholds. # Use a negative number for absolute thresholds.
# #
@ -3101,6 +3182,9 @@ pp_indent_in_guard = false # true/false
# indented from column 1. # indented from column 1.
pp_define_at_level = false # true/false pp_define_at_level = false # true/false
# Whether to indent '#include' at the brace level.
pp_include_at_level = false # true/false
# Whether to ignore the '#define' body while formatting. # Whether to ignore the '#define' body while formatting.
pp_ignore_define_body = false # true/false pp_ignore_define_body = false # true/false
@ -3307,5 +3391,5 @@ set QUESTION REAL_FATTR_CONST
set QUESTION REAL_FATTR_NONNULL_ALL set QUESTION REAL_FATTR_NONNULL_ALL
set QUESTION REAL_FATTR_PURE set QUESTION REAL_FATTR_PURE
set QUESTION REAL_FATTR_WARN_UNUSED_RESULT set QUESTION REAL_FATTR_WARN_UNUSED_RESULT
# option(s) with 'not default' value: 87 # option(s) with 'not default' value: 86
# #