Skip to content

Commit

Permalink
uncrustify UPDATE use version 0.77.1
Browse files Browse the repository at this point in the history
  • Loading branch information
michalvasko committed May 19, 2023
1 parent 91cd6d7 commit ac1786b
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ jobs:
shell: bash
working-directory: ${{ github.workspace }}
run: |
git clone --branch uncrustify-0.75.1 https://github.com/uncrustify/uncrustify
git clone --branch uncrustify-0.77.1 https://github.com/uncrustify/uncrustify
cd uncrustify
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ if(ENABLE_COVERAGE)
endif()

if ("${BUILD_TYPE_UPPER}" STREQUAL "DEBUG")
source_format_enable(0.76)
source_format_enable(0.77)
endif()

if("${BUILD_TYPE_UPPER}" STREQUAL "DOCONLY")
Expand Down
57 changes: 53 additions & 4 deletions uncrustify.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Uncrustify-0.76.0_f
# Uncrustify-0.77.1_f

#
# General options
Expand Down Expand Up @@ -210,6 +210,11 @@ sp_before_ptr_star = force # ignore/add/remove/force
# variable name. If set to ignore, sp_before_ptr_star is used instead.
sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force

# Add or remove space between a qualifier and a pointer star '*' that isn't
# followed by a variable name, as in '(char const *)'. If set to ignore,
# sp_before_ptr_star is used instead.
sp_qualifier_unnamed_ptr_star = ignore # ignore/add/remove/force/not_defined

# Add or remove space between pointer stars '*'.
sp_between_ptr_star = remove # ignore/add/remove/force

Expand Down Expand Up @@ -250,10 +255,20 @@ sp_ptr_star_paren = remove # ignore/add/remove/force
# prototype or function definition.
sp_before_ptr_star_func = force # ignore/add/remove/force

# Add or remove space between a qualifier and a pointer star '*' followed by
# the name of the function in a function prototype or definition, as in
# 'char const *foo()`. If set to ignore, sp_before_ptr_star is used instead.
sp_qualifier_ptr_star_func = ignore # ignore/add/remove/force/not_defined

# Add or remove space before a pointer star '*' in the trailing return of a
# function prototype or function definition.
sp_before_ptr_star_trailing = ignore # ignore/add/remove/force/not_defined

# Add or remove space between a qualifier and a pointer star '*' in the
# trailing return of a function prototype or function definition, as in
# 'auto foo() -> char const *'.
sp_qualifier_ptr_star_trailing = force # ignore/add/remove/force/not_defined

# Add or remove space before a reference sign '&'.
sp_before_byref = ignore # ignore/add/remove/force

Expand Down Expand Up @@ -611,6 +626,16 @@ sp_inside_fparens = remove # ignore/add/remove/force
# Add or remove space inside function '(' and ')'.
sp_inside_fparen = remove # ignore/add/remove/force

# Add or remove space inside user functor '(' and ')'.
sp_func_call_user_inside_rparen = ignore # ignore/add/remove/force/not_defined

# Add or remove space inside empty functor '()'.
# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
sp_inside_rparens = ignore # ignore/add/remove/force/not_defined

# Add or remove space inside functor '(' and ')'.
sp_inside_rparen = ignore # ignore/add/remove/force/not_defined

# Add or remove space inside the first parentheses in a function type, as in
# 'void (*x)(...)'.
sp_inside_tparen = remove # ignore/add/remove/force
Expand Down Expand Up @@ -951,6 +976,14 @@ sp_extern_paren = ignore # ignore/add/remove/force
# i.e. '// A' vs. '//A'.
sp_cmt_cpp_start = force # ignore/add/remove/force

# remove space after the '//' and the pvs command '-V1234',
# only works with sp_cmt_cpp_start set to add or force.
sp_cmt_cpp_pvs = false # true/false

# remove space after the '//' and the command 'lint',
# only works with sp_cmt_cpp_start set to add or force.
sp_cmt_cpp_lint = false # true/false

# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
# A region marker is defined as a comment which is not preceded by other text
# (i.e. the comment is the first non-whitespace on the line), and which starts
Expand Down Expand Up @@ -2804,9 +2837,19 @@ align_single_line_brace_gap = 1 # unsigned number
# 0: Don't align (default).
align_oc_msg_spec_span = 0 # unsigned number

# Whether to align macros wrapped with a backslash and a newline. This will
# not work right if the macro contains a multi-line comment.
align_nl_cont = false # true/false
# 0: Do nothing (default)
# 1: Align the backslashes in the column at the end of the longest line
# 2: Align with the backslash that is farthest to the left, or, if that
# backslash is farther left than the end of the longest line, at the end of
# the longest line
# 3: Align with the backslash that is farthest to the right
align_nl_cont = 0 # unsigned number

# The minimum number of spaces between the end of a line and its continuation
# backslash. Requires align_nl_cont.
#
# Default: 1
align_nl_cont_spaces = 1 # unsigned number

# Whether to align macro functions and variables together.
align_pp_define_together = false # true/false
Expand Down Expand Up @@ -3117,6 +3160,12 @@ mod_remove_extra_semicolon = true # true/false
# Whether to remove duplicate include.
mod_remove_duplicate_include = true # true/false

# the following options (mod_XX_closebrace_comment) use different comment,
# depending of the setting of the next option.
# false: Use the c comment (default)
# true : Use the cpp comment
mod_add_force_c_closebrace_comment = false # true/false

# If a function body exceeds the specified number of newlines and doesn't have
# a comment after the close brace, a comment will be added.
mod_add_long_function_closebrace_comment = 0 # unsigned number
Expand Down

0 comments on commit ac1786b

Please sign in to comment.