Merge branch 'mo/clang-format-for-each-update' into maint

The list of for-each like macros used by clang-format has been
updated.

* mo/clang-format-for-each-update:
  clang-format: use git grep to generate the ForEachMacros list
This commit is contained in:
Junio C Hamano 2019-07-25 14:27:14 -07:00
Родитель d7267d55ef fc7e03aace
Коммит 27e4131bdd
1 изменённых файлов: 15 добавлений и 2 удалений

Просмотреть файл

@ -148,8 +148,21 @@ SpacesInSquareBrackets: false
Cpp11BracedListStyle: false Cpp11BracedListStyle: false
# A list of macros that should be interpreted as foreach loops instead of as # A list of macros that should be interpreted as foreach loops instead of as
# function calls. # function calls. Taken from:
ForEachMacros: ['for_each_string_list_item', 'for_each_wanted_builtin', 'for_each_builtin', 'for_each_ut'] # git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' \
# | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$, - '\1'," \
# | sort | uniq
ForEachMacros:
- 'for_each_abbrev'
- 'for_each_builtin'
- 'for_each_string_list_item'
- 'for_each_ut'
- 'for_each_wanted_builtin'
- 'list_for_each'
- 'list_for_each_dir'
- 'list_for_each_prev'
- 'list_for_each_prev_safe'
- 'list_for_each_safe'
# The maximum number of consecutive empty lines to keep. # The maximum number of consecutive empty lines to keep.
MaxEmptyLinesToKeep: 1 MaxEmptyLinesToKeep: 1