Fix conditional on C headers

scoopr · kkaefer · commit 374eba960500 · 2020-12-19T18:43:55.000+01:00
diff --git a/clang-format/ClangFormatCommand.mm b/clang-format/ClangFormatCommand.mm
@@ -26,7 +26,8 @@ void updateOffsets(std::vector<size_t>& offsets, NSMutableArray<NSString*>* line
                 return clang::format::FormatStyle::LK_ObjC;
             }
         }
-    } else if (UTTypeEqual(uti, kUTTypeCPlusPlusHeader) || UTTypeEqual(uti, kUTTypeCPlusPlusSource) ||
+    }
+    if (UTTypeEqual(uti, kUTTypeCPlusPlusHeader) || UTTypeEqual(uti, kUTTypeCPlusPlusSource) ||
                UTTypeEqual(uti, kUTTypeCHeader) || UTTypeEqual(uti, kUTTypeCSource)) {
         return clang::format::FormatStyle::LK_Cpp;
     } else if (UTTypeEqual(uti, kUTTypeObjectiveCSource) ||

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ void updateOffsets(std::vector<size_t>& offsets, NSMutableArray<NSString> line`
`26`	`26`	`return clang::format::FormatStyle::LK_ObjC;`
`27`	`27`	`}`
`28`	`28`	`}`
`29`		`- } else if (UTTypeEqual(uti, kUTTypeCPlusPlusHeader) \|\| UTTypeEqual(uti, kUTTypeCPlusPlusSource) \|\|`
	`29`	`+ }`
	`30`	`+ if (UTTypeEqual(uti, kUTTypeCPlusPlusHeader) \|\| UTTypeEqual(uti, kUTTypeCPlusPlusSource) \|\|`
`30`	`31`	`UTTypeEqual(uti, kUTTypeCHeader) \|\| UTTypeEqual(uti, kUTTypeCSource)) {`
`31`	`32`	`return clang::format::FormatStyle::LK_Cpp;`
`32`	`33`	`} else if (UTTypeEqual(uti, kUTTypeObjectiveCSource) \|\|`