Code Format using clang-format's Google style defaults. (#383)

Updated codebase using clang-format's Google style basis without any further one-off customizations.

Clang-format seemingly. does some odd things to objective-c files.  Therefore directories known to contain objective-c files are ignored by defining a local .clang-format file which disables clang-format. Objective C .mm files are ignored in mixed-language directories, and Obj-C headers are detected by the format_code.py script which search for Obj-c language tags.

Author: DellaBitta

.clang-format

@@ -1,10 +1 @@
 BasedOnStyle: Google
-Standard: Cpp11
-ColumnLimit: 80
-BinPackParameters: false
-AllowAllParametersOfDeclarationOnNextLine: true
-SpacesInContainerLiterals: true
-DerivePointerAlignment: false
-PointerAlignment: Left
-AllowShortFunctionsOnASingleLine: None
-IncludeBlocks: Preserve

admob/integration_test/src/integration_test.cc

@@ -502,8 +502,8 @@ TEST_F(FirebaseAdMobTest, TestRewardedVideoAd) {
 // Test runs & compiles for phones only.
 
 struct ThreadArgs {
-      firebase::admob::BannerView* banner;
-      sem_t* semaphore;
+  firebase::admob::BannerView* banner;
+  sem_t* semaphore;
 };
 
 static void* DeleteBannerViewOnSignal(void* args) {

admob/src/android/ad_request_converter.cc

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
+#include "admob/src/android/ad_request_converter.h"
+
 #include <assert.h>
 #include <jni.h>
 
 #include <cstdarg>
 #include <cstddef>
 
 #include "admob/admob_resources.h"
-#include "admob/src/android/ad_request_converter.h"
 #include "admob/src/android/admob_android.h"
 #include "admob/src/common/admob_common.h"
 #include "admob/src/include/firebase/admob.h"
@@ -35,7 +36,8 @@ namespace admob {
 static const char* kAdMobAdapterClassName =
     "com/google/ads/mediation/admob/AdMobAdapter";
 
-METHOD_LOOKUP_DEFINITION(ad_request_builder, PROGUARD_KEEP_CLASS
+METHOD_LOOKUP_DEFINITION(ad_request_builder,
+                         PROGUARD_KEEP_CLASS
                          "com/google/android/gms/ads/AdRequest$Builder",
                          ADREQUESTBUILDER_METHODS);
 
@@ -54,18 +56,20 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
 
   builder = util::ContinueBuilder(
       env, builder,
-      env->CallObjectMethod(builder, ad_request_builder::GetMethodId(
-                                         ad_request_builder::kSetGender),
-                            static_cast<int>(request.gender)));
+      env->CallObjectMethod(
+          builder,
+          ad_request_builder::GetMethodId(ad_request_builder::kSetGender),
+          static_cast<int>(request.gender)));
 
   // Child-drected treatment.
   if (request.tagged_for_child_directed_treatment !=
       kChildDirectedTreatmentStateUnknown) {
     builder = util::ContinueBuilder(
         env, builder,
         env->CallObjectMethod(
-            builder, ad_request_builder::GetMethodId(
-                         ad_request_builder::kTagForChildDirectedTreatment),
+            builder,
+            ad_request_builder::GetMethodId(
+                ad_request_builder::kTagForChildDirectedTreatment),
             (request.tagged_for_child_directed_treatment ==
              kChildDirectedTreatmentStateTagged)));
   }
@@ -75,9 +79,10 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
     jstring test_device_str = env->NewStringUTF(request.test_device_ids[i]);
     builder = util::ContinueBuilder(
         env, builder,
-        env->CallObjectMethod(builder, ad_request_builder::GetMethodId(
-                                           ad_request_builder::kAddTestDevice),
-                              test_device_str));
+        env->CallObjectMethod(
+            builder,
+            ad_request_builder::GetMethodId(ad_request_builder::kAddTestDevice),
+            test_device_str));
     env->DeleteLocalRef(test_device_str);
   }
 
@@ -86,9 +91,10 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
     jstring keyword_str = env->NewStringUTF(request.keywords[i]);
     builder = util::ContinueBuilder(
         env, builder,
-        env->CallObjectMethod(builder, ad_request_builder::GetMethodId(
-                                           ad_request_builder::kAddKeyword),
-                              keyword_str));
+        env->CallObjectMethod(
+            builder,
+            ad_request_builder::GetMethodId(ad_request_builder::kAddKeyword),
+            keyword_str));
     env->DeleteLocalRef(keyword_str);
   }
 
@@ -109,9 +115,10 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
   if (date_ref != nullptr) {
     builder = util::ContinueBuilder(
         env, builder,
-        env->CallObjectMethod(builder, ad_request_builder::GetMethodId(
-                                           ad_request_builder::kSetBirthday),
-                              date_ref));
+        env->CallObjectMethod(
+            builder,
+            ad_request_builder::GetMethodId(ad_request_builder::kSetBirthday),
+            date_ref));
   } else {
     LogWarning(
         "Skipping invalid AdRequest birthday fields (Y: %d, M: %d, D: %d).",
@@ -164,9 +171,10 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
       env->NewStringUTF(firebase::admob::GetRequestAgentString());
   builder = util::ContinueBuilder(
       env, builder,
-      env->CallObjectMethod(builder, ad_request_builder::GetMethodId(
-                                         ad_request_builder::kSetRequestAgent),
-                            agent_str));
+      env->CallObjectMethod(
+          builder,
+          ad_request_builder::GetMethodId(ad_request_builder::kSetRequestAgent),
+          agent_str));
   env->DeleteLocalRef(agent_str);
 
   // Build request and load ad.

admob/src/android/banner_view_internal_android.cc

@@ -58,11 +58,9 @@ BannerViewInternalAndroid::BannerViewInternalAndroid(BannerView* base)
   env->DeleteLocalRef(helper_ref);
 }
 
-
-void DestroyOnDeleteCallback(const Future<void>& result,
-                          void* sem_data) {
+void DestroyOnDeleteCallback(const Future<void>& result, void* sem_data) {
   if (sem_data != nullptr) {
-    Semaphore* semaphore =  static_cast<Semaphore*>(sem_data);
+    Semaphore* semaphore = static_cast<Semaphore*>(sem_data);
     semaphore->Post();
   }
 }

admob/src/android/interstitial_ad_internal_android.cc

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "admob/src/android/interstitial_ad_internal_android.h"
+
 #include <assert.h>
 #include <jni.h>
 
@@ -23,7 +25,6 @@
 #include "admob/admob_resources.h"
 #include "admob/src/android/ad_request_converter.h"
 #include "admob/src/android/admob_android.h"
-#include "admob/src/android/interstitial_ad_internal_android.h"
 #include "admob/src/common/admob_common.h"
 #include "admob/src/include/firebase/admob.h"
 #include "admob/src/include/firebase/admob/interstitial_ad.h"

admob/src/android/native_express_ad_view_internal_android.cc

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "admob/src/android/native_express_ad_view_internal_android.h"
+
 #include <assert.h>
 #include <jni.h>
 
@@ -23,7 +25,6 @@
 #include "admob/admob_resources.h"
 #include "admob/src/android/ad_request_converter.h"
 #include "admob/src/android/admob_android.h"
-#include "admob/src/android/native_express_ad_view_internal_android.h"
 #include "admob/src/common/admob_common.h"
 #include "admob/src/include/firebase/admob.h"
 #include "admob/src/include/firebase/admob/native_express_ad_view.h"
@@ -91,8 +92,9 @@ Future<void> NativeExpressAdViewInternalAndroid::Initialize(
 
   jstring ad_unit_id_str = env->NewStringUTF(ad_unit_id);
 
-  env->CallVoidMethod(helper_, native_express_ad_view_helper::GetMethodId(
-                                   native_express_ad_view_helper::kInitialize),
+  env->CallVoidMethod(helper_,
+                      native_express_ad_view_helper::GetMethodId(
+                          native_express_ad_view_helper::kInitialize),
                       reinterpret_cast<jlong>(callback_data), activity,
                       ad_unit_id_str, static_cast<jint>(size.ad_size_type),
                       static_cast<jint>(size.width),
@@ -112,8 +114,9 @@ Future<void> NativeExpressAdViewInternalAndroid::LoadAd(
   jobject request_ref = converter.GetJavaRequestObject();
 
   ::firebase::admob::GetJNI()->CallVoidMethod(
-      helper_, native_express_ad_view_helper::GetMethodId(
-                   native_express_ad_view_helper::kLoadAd),
+      helper_,
+      native_express_ad_view_helper::GetMethodId(
+          native_express_ad_view_helper::kLoadAd),
       reinterpret_cast<jlong>(callback_data), request_ref);
 
   return GetLastResult(kNativeExpressAdViewFnLoadAd);
@@ -151,8 +154,9 @@ Future<void> NativeExpressAdViewInternalAndroid::MoveTo(int x, int y) {
       CreateFutureCallbackData(&future_data_, kNativeExpressAdViewFnMoveTo);
 
   ::firebase::admob::GetJNI()->CallVoidMethod(
-      helper_, native_express_ad_view_helper::GetMethodId(
-                   native_express_ad_view_helper::kMoveToXY),
+      helper_,
+      native_express_ad_view_helper::GetMethodId(
+          native_express_ad_view_helper::kMoveToXY),
       reinterpret_cast<jlong>(callback_data), x, y);
 
   return GetLastResult(kNativeExpressAdViewFnMoveTo);
@@ -164,8 +168,9 @@ Future<void> NativeExpressAdViewInternalAndroid::MoveTo(
       CreateFutureCallbackData(&future_data_, kNativeExpressAdViewFnMoveTo);
 
   ::firebase::admob::GetJNI()->CallVoidMethod(
-      helper_, native_express_ad_view_helper::GetMethodId(
-                   native_express_ad_view_helper::kMoveToPosition),
+      helper_,
+      native_express_ad_view_helper::GetMethodId(
+          native_express_ad_view_helper::kMoveToPosition),
       reinterpret_cast<jlong>(callback_data), static_cast<int>(position));
 
   return GetLastResult(kNativeExpressAdViewFnMoveTo);

admob/src/android/rewarded_video_internal_android.cc

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
+#include "admob/src/android/rewarded_video_internal_android.h"
+
 #include <assert.h>
 #include <jni.h>
 
 #include "admob/admob_resources.h"
 #include "admob/src/android/ad_request_converter.h"
 #include "admob/src/android/admob_android.h"
-#include "admob/src/android/rewarded_video_internal_android.h"
 #include "admob/src/common/rewarded_video_internal.h"
 #include "admob/src/include/firebase/admob/rewarded_video.h"
 #include "admob/src/include/firebase/admob/types.h"
@@ -66,9 +67,10 @@ Future<void> RewardedVideoInternalAndroid::Initialize() {
 
   JNIEnv* env = ::firebase::admob::GetJNI();
 
-  env->CallVoidMethod(helper_, rewarded_video_helper::GetMethodId(
-                                   rewarded_video_helper::kInitialize),
-                      reinterpret_cast<jlong>(callback_data));
+  env->CallVoidMethod(
+      helper_,
+      rewarded_video_helper::GetMethodId(rewarded_video_helper::kInitialize),
+      reinterpret_cast<jlong>(callback_data));
 
   return GetLastResult(kRewardedVideoFnInitialize);
 }

admob/src/common/admob_common.cc

@@ -17,6 +17,7 @@
 #include "admob/src/common/admob_common.h"
 
 #include <assert.h>
+
 #include <vector>
 
 #include "admob/src/include/firebase/admob.h"
@@ -28,18 +29,19 @@
 #include "app/src/include/firebase/version.h"
 #include "app/src/util.h"
 
-FIREBASE_APP_REGISTER_CALLBACKS(admob,
-                                {
-                                  if (app == ::firebase::App::GetInstance()) {
-                                    return firebase::admob::Initialize(*app);
-                                  }
-                                  return kInitResultSuccess;
-                                },
-                                {
-                                  if (app == ::firebase::App::GetInstance()) {
-                                    firebase::admob::Terminate();
-                                  }
-                                });
+FIREBASE_APP_REGISTER_CALLBACKS(
+    admob,
+    {
+      if (app == ::firebase::App::GetInstance()) {
+        return firebase::admob::Initialize(*app);
+      }
+      return kInitResultSuccess;
+    },
+    {
+      if (app == ::firebase::App::GetInstance()) {
+        firebase::admob::Terminate();
+      }
+    });
 
 namespace firebase {
 namespace admob {

admob/src/common/admob_common.h

@@ -18,6 +18,7 @@
 #define FIREBASE_ADMOB_CLIENT_CPP_SRC_COMMON_ADMOB_COMMON_H_
 
 #include <stdarg.h>
+
 #include <vector>
 
 #include "app/src/cleanup_notifier.h"

admob/src/common/banner_view.cc

@@ -15,6 +15,7 @@
  */
 
 #include "admob/src/include/firebase/admob/banner_view.h"
+
 #include "admob/src/common/admob_common.h"
 #include "admob/src/common/banner_view_internal.h"
 #include "app/src/assert.h"

admob/src/common/interstitial_ad.cc

@@ -15,6 +15,7 @@
  */
 
 #include "admob/src/include/firebase/admob/interstitial_ad.h"
+
 #include "admob/src/common/admob_common.h"
 #include "admob/src/common/interstitial_ad_internal.h"
 #include "app/src/assert.h"

admob/src/common/native_express_ad_view.cc

@@ -15,6 +15,7 @@
  */
 
 #include "admob/src/include/firebase/admob/native_express_ad_view.h"
+
 #include "admob/src/common/admob_common.h"
 #include "admob/src/common/native_express_ad_view_internal.h"
 #include "app/src/include/firebase/future.h"

admob/src/common/rewarded_video.cc

@@ -15,6 +15,7 @@
  */
 
 #include "admob/src/include/firebase/admob/rewarded_video.h"
+
 #include "admob/src/common/admob_common.h"
 #include "admob/src/common/rewarded_video_internal.h"
 #include "app/src/assert.h"

admob/src/ios/.clang-format

@@ -0,0 +1,2 @@
+DisableFormat: true
+SortIncludes: false

admob/src/stub/banner_view_internal_stub.h

@@ -74,9 +74,7 @@ class BannerViewInternalStub : public BannerViewInternal {
     return BannerView::PresentationState::kPresentationStateHidden;
   }
 
-  BoundingBox GetBoundingBox() const override {
-    return BoundingBox();
-  }
+  BoundingBox GetBoundingBox() const override { return BoundingBox(); }
 
  private:
   Future<void> CreateAndCompleteFutureStub(BannerViewFn fn) {

analytics/ios_headers/.clang-format

@@ -0,0 +1,2 @@
+DisableFormat: true
+SortIncludes: false

analytics/src/analytics_android.cc

@@ -401,9 +401,9 @@ Future<std::string> GetAnalyticsInstanceId() {
             FutureHandle handle(future_id);
             future_data->api()->CompleteWithResult(
                 handle, success ? 0 : -1,
-                success ? ""
-                        : status_message ? status_message
-                                         : "Unknown error occurred",
+                success          ? ""
+                : status_message ? status_message
+                                 : "Unknown error occurred",
                 // Both JStringToString and GetMessageFromException are
                 // able to handle a nullptr being passed in, and neither
                 // deletes the object passed in (so delete it below).