diff options
| -rw-r--r-- | .clang-format | 5 | ||||
| -rwxr-xr-x | tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/.clang-format b/.clang-format index 3b2451958b..f9af7637aa 100644 --- a/.clang-format +++ b/.clang-format @@ -3,5 +3,10 @@ Language: Cpp BasedOnStyle: Google DerivePointerAlignment: false PointerAlignment: Left +--- +Language: ObjC +BasedOnStyle: Google +ColumnLimit: 100 +ObjCBlockIndentWidth: 2 ... diff --git a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh index 08c6a96f71..3b901ae4bf 100755 --- a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh +++ b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh @@ -16,10 +16,10 @@ set -e # directories to run against -DIRS="src/core/lib src/core/tsi src/core/ext src/cpp test/core test/cpp include src/compiler src/csharp src/ruby third_party/address_sorting" +DIRS="src/core/lib src/core/tsi src/core/ext src/cpp test/core test/cpp include src/compiler src/csharp src/ruby third_party/address_sorting src/objective-c" # file matching patterns to check -GLOB="*.h *.c *.cc" +GLOB="*.h *.c *.cc *.m *.mm" # clang format command CLANG_FORMAT=${CLANG_FORMAT:-clang-format-5.0} @@ -29,7 +29,7 @@ for dir in $DIRS do for glob in $GLOB do - files="$files `find ${CLANG_FORMAT_ROOT}/$dir -name $glob -and -not -name '*.generated.*' -and -not -name '*.pb.h' -and -not -name '*.pb.c' -and -not -name '*.pb.cc' -and -not -name end2end_tests.cc -and -not -name end2end_nosec_tests.cc -and -not -name public_headers_must_be_c89.c`" + files="$files `find ${CLANG_FORMAT_ROOT}/$dir -name $glob -and -not -name '*.generated.*' -and -not -name '*.pb.h' -and -not -name '*.pb.c' -and -not -name '*.pb.cc' -and -not -name '*.pbobjc.h' -and -not -name '*.pbobjc.m' -and -not -name '*.pbrpc.h' -and -not -name '*.pbrpc.m' -and -not -name end2end_tests.cc -and -not -name end2end_nosec_tests.cc -and -not -name public_headers_must_be_c89.c`" done done |