build: Split Swift and Clang format for pre-commit (#2380)

Split formatting swift and clang files for pre-commit.

.pre-commit-config.yaml

@@ -16,10 +16,18 @@ repos:
 
   - repo: local
     hooks:
-      - id: clang-format
-        name: Clang Format
+      - id: format-clang
+        name: Format ObjC, ObjC++, C, and C++
         entry: make
         language: system
-        types_or: ["objective-c", "objective-c++", "c", "c++", "swift" ]
+        types_or: ["objective-c", "objective-c++", "c", "c++"]
         args:
-          - "format"
+          - "format-clang"
+
+      - id: format-swift
+        name: Format Swift
+        entry: make
+        language: system
+        types_or: ["swift" ]
+        args:
+          - "format-swift"

Makefile

@@ -22,14 +22,17 @@ lint:
 	swiftlint
 .PHONY: lint
 
-# Format all h,c,cpp and m files
-format:
+format: format-clang format-swift
+
+# Format ObjC, ObjC++, C, and C++
+format-clang:
 	@find . -type f \( -name "*.h" -or -name "*.hpp" -or -name "*.c" -or -name "*.cpp" -or -name "*.m" -or -name "*.mm" \) -and \
 		! \( -path "**.build/*" -or -path "**Build/*" -or -path "**/Carthage/Checkouts/*"  -or -path "**/libs/**" \) \
 		| xargs clang-format -i -style=file
 
+# Format Swift
+format-swift:
 	swiftlint --fix
-.PHONY: format
 
 test:
 	@echo "--> Running all tests"