clang-format cpp

Summary: Ran `arc f` against some CPP files to be modified with the next diff to reduce the churn on it. ## Changelog [Android] [Changed] - Formatted cpp/h code with clang-format Reviewed By: javache Differential Revision: D19371785 fbshipit-source-id: b7f7b92c4cb9ec7f8da728bb577db29cf11fbb39
facebook · Jan 14, 2020 · d5ba113 · d5ba113
1 parent 8d57691
commit d5ba113
Show file tree

Hide file tree

Showing 44 changed files with 924 additions and 658 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h
@@ -76,17 +76,17 @@ class Binding : public jni::HybridClass<Binding>, public SchedulerDelegate {
       const ShadowView &shadowView);
 
   void schedulerDidDispatchCommand(
-    const ShadowView &shadowView,
-    std::string const &commandName,
-    folly::dynamic const args);
+      const ShadowView &shadowView,
+      std::string const &commandName,
+      folly::dynamic const args);
 
   void setPixelDensity(float pointScaleFactor);
 
   void schedulerDidSetJSResponder(
-     SurfaceId surfaceId,
-     const ShadowView &shadowView,
-     const ShadowView &initialShadowView,
-     bool blockNativeResponder);
+      SurfaceId surfaceId,
+      const ShadowView &shadowView,
+      const ShadowView &initialShadowView,
+      bool blockNativeResponder);
 
   void schedulerDidClearJSResponder();
 

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h
@@ -10,8 +10,8 @@
 #include <fb/fbjni.h>
 #include <jsi/jsi.h>
 #include <react/uimanager/ComponentDescriptorRegistry.h>
-#include <react/utils/ContextContainer.h>
 #include <react/uimanager/Scheduler.h>
+#include <react/utils/ContextContainer.h>
 #include <mutex>
 #include <unordered_set>
 
@@ -25,7 +25,7 @@ class Instance;
 class ComponentFactoryDelegate
     : public jni::HybridClass<ComponentFactoryDelegate> {
  public:
-  constexpr static const char* const kJavaDescriptor =
+  constexpr static const char *const kJavaDescriptor =
       "Lcom/facebook/react/fabric/ComponentFactoryDelegate;";
 
   static void registerNatives();

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.cpp
@@ -13,8 +13,8 @@ namespace facebook {
 namespace react {
 
 EventBeatManager::EventBeatManager(
-  jni::alias_ref<EventBeatManager::jhybriddata> jhybridobject)
-  : jhybridobject_(jhybridobject) {}
+    jni::alias_ref<EventBeatManager::jhybriddata> jhybridobject)
+    : jhybridobject_(jhybridobject) {}
 
 jni::local_ref<EventBeatManager::jhybriddata> EventBeatManager::initHybrid(
     jni::alias_ref<EventBeatManager::jhybriddata> jhybridobject) {

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp
@@ -20,7 +20,7 @@ EventEmitterWrapper::initHybrid(jni::alias_ref<jclass>) {
 
 void EventEmitterWrapper::invokeEvent(
     std::string eventName,
-    NativeMap* payload) {
+    NativeMap *payload) {
   eventEmitter->dispatchEvent(
       eventName, payload->consume(), EventPriority::AsynchronousBatched);
 }
@@ -33,4 +33,4 @@ void EventEmitterWrapper::registerNatives() {
 }
 
 } // namespace react
-} // namespace facebook
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h
@@ -18,14 +18,14 @@ class Instance;
 
 class EventEmitterWrapper : public jni::HybridClass<EventEmitterWrapper> {
  public:
-  constexpr static const char* const kJavaDescriptor =
+  constexpr static const char *const kJavaDescriptor =
       "Lcom/facebook/react/fabric/events/EventEmitterWrapper;";
 
   static void registerNatives();
 
   SharedEventEmitter eventEmitter;
 
-  void invokeEvent(std::string eventName, NativeMap* params);
+  void invokeEvent(std::string eventName, NativeMap *params);
 
  private:
   static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.cpp
@@ -14,8 +14,8 @@ using namespace facebook::jni;
 namespace facebook {
 namespace react {
 
-jni::local_ref<NodeStateWrapper::jhybriddata>
-NodeStateWrapper::initHybrid(jni::alias_ref<jclass>) {
+jni::local_ref<NodeStateWrapper::jhybriddata> NodeStateWrapper::initHybrid(
+    jni::alias_ref<jclass>) {
   return makeCxxInstance();
 }
 
@@ -26,7 +26,7 @@ jni::local_ref<ReadableNativeMap::jhybridobject> NodeStateWrapper::getState() {
   return readableNativeMap;
 }
 
-void NodeStateWrapper::updateState(ReadableNativeMap* map) {
+void NodeStateWrapper::updateState(ReadableNativeMap *map) {
   // Get folly::dynamic from map
   auto dynamicMap = map->consume();
   // Set state

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.h
@@ -16,17 +16,18 @@ namespace react {
 
 class NodeStateWrapper : public jni::HybridClass<NodeStateWrapper> {
  public:
-  constexpr static const char* const kJavaDescriptor =
+  constexpr static const char *const kJavaDescriptor =
       "Lcom/facebook/react/fabric/NodeStateWrapper;";
 
   NodeStateWrapper() {}
 
   static void registerNatives();
 
   jni::local_ref<ReadableNativeMap::jhybridobject> getState();
-  void updateState(ReadableNativeMap* map);
+  void updateState(ReadableNativeMap *map);
+
+  const State *state_;
 
-  const State* state_;
  private:
   static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
 };

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp
@@ -13,7 +13,7 @@
 #include "EventEmitterWrapper.h"
 #include "StateWrapperImpl.h"
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::xplat::initialize(vm, [] {
     facebook::react::Binding::registerNatives();
     facebook::react::EventBeatManager::registerNatives();

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.cpp
@@ -11,29 +11,29 @@
 
 using namespace facebook::react;
 
-bool ReactNativeConfigHolder::getBool(const std::string& param) const {
+bool ReactNativeConfigHolder::getBool(const std::string &param) const {
   static const auto method = facebook::jni::findClassStatic(
                                  "com/facebook/react/fabric/ReactNativeConfig")
                                  ->getMethod<jboolean(jstring)>("getBool");
   return method(reactNativeConfig_, facebook::jni::make_jstring(param).get());
 }
 
-std::string ReactNativeConfigHolder::getString(const std::string& param) const {
+std::string ReactNativeConfigHolder::getString(const std::string &param) const {
   static const auto method = facebook::jni::findClassStatic(
                                  "com/facebook/react/fabric/ReactNativeConfig")
                                  ->getMethod<jstring(jstring)>("getString");
   return method(reactNativeConfig_, facebook::jni::make_jstring(param).get())
       ->toString();
 }
 
-int64_t ReactNativeConfigHolder::getInt64(const std::string& param) const {
+int64_t ReactNativeConfigHolder::getInt64(const std::string &param) const {
   static const auto method = facebook::jni::findClassStatic(
                                  "com/facebook/react/fabric/ReactNativeConfig")
                                  ->getMethod<jint(jstring)>("getInt64");
   return method(reactNativeConfig_, facebook::jni::make_jstring(param).get());
 }
 
-double ReactNativeConfigHolder::getDouble(const std::string& param) const {
+double ReactNativeConfigHolder::getDouble(const std::string &param) const {
   static const auto method = facebook::jni::findClassStatic(
                                  "com/facebook/react/fabric/ReactNativeConfig")
                                  ->getMethod<jdouble(jstring)>("getDouble");

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.h
@@ -25,10 +25,10 @@ class ReactNativeConfigHolder : public ReactNativeConfig {
   ReactNativeConfigHolder(jni::alias_ref<jobject> reactNativeConfig)
       : reactNativeConfig_(make_global(reactNativeConfig)){};
 
-  bool getBool(const std::string& param) const override;
-  std::string getString(const std::string& param) const override;
-  int64_t getInt64(const std::string& param) const override;
-  double getDouble(const std::string& param) const override;
+  bool getBool(const std::string &param) const override;
+  std::string getString(const std::string &param) const override;
+  int64_t getInt64(const std::string &param) const override;
+  double getDouble(const std::string &param) const override;
 
  private:
   jni::global_ref<jobject> reactNativeConfig_;

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp
@@ -17,8 +17,8 @@ namespace react {
 /**
  * Called from Java constructor through the JNI.
  */
-jni::local_ref<StateWrapperImpl::jhybriddata>
-StateWrapperImpl::initHybrid(jni::alias_ref<jclass>) {
+jni::local_ref<StateWrapperImpl::jhybriddata> StateWrapperImpl::initHybrid(
+    jni::alias_ref<jclass>) {
   return makeCxxInstance();
 }
 
@@ -29,7 +29,7 @@ jni::local_ref<ReadableNativeMap::jhybridobject> StateWrapperImpl::getState() {
   return readableNativeMap;
 }
 
-void StateWrapperImpl::updateStateImpl(NativeMap* map) {
+void StateWrapperImpl::updateStateImpl(NativeMap *map) {
   // Get folly::dynamic from map
   auto dynamicMap = map->consume();
   // Set state
@@ -38,8 +38,8 @@ void StateWrapperImpl::updateStateImpl(NativeMap* map) {
 
 void StateWrapperImpl::registerNatives() {
   registerHybrid({
-      makeNativeMethod("initHybrid",      StateWrapperImpl::initHybrid),
-      makeNativeMethod("getState",        StateWrapperImpl::getState),
+      makeNativeMethod("initHybrid", StateWrapperImpl::initHybrid),
+      makeNativeMethod("getState", StateWrapperImpl::getState),
       makeNativeMethod("updateStateImpl", StateWrapperImpl::updateStateImpl),
   });
 }

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h
@@ -18,7 +18,7 @@ class Instance;
 
 class StateWrapperImpl : public jni::HybridClass<StateWrapperImpl> {
  public:
-  constexpr static const char* const kJavaDescriptor =
+  constexpr static const char *const kJavaDescriptor =
       "Lcom/facebook/react/fabric/StateWrapperImpl;";
 
   static void registerNatives();
@@ -27,6 +27,7 @@ class StateWrapperImpl : public jni::HybridClass<StateWrapperImpl> {
   void updateStateImpl(NativeMap *map);
 
   State::Shared state_;
+
  private:
   jni::alias_ref<StateWrapperImpl::jhybriddata> jhybridobject_;
 

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BlobCollector.cpp b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BlobCollector.cpp
@@ -27,7 +27,7 @@ BlobCollector::BlobCollector(
 BlobCollector::~BlobCollector() {
   jni::ThreadScope::WithClassLoader([&] {
     static auto removeMethod = jni::findClassStatic(kBlobModuleJavaDescriptor)
-        ->getMethod<void(jstring)>("remove");
+                                   ->getMethod<void(jstring)>("remove");
     removeMethod(blobModule_, jni::make_jstring(blobId_).get());
   });
 }
@@ -36,7 +36,7 @@ void BlobCollector::nativeInstall(
     jni::alias_ref<jhybridobject> jThis,
     jni::alias_ref<jobject> blobModule,
     jlong jsContextNativePointer) {
-  auto &runtime = *((jsi::Runtime *) jsContextNativePointer);
+  auto &runtime = *((jsi::Runtime *)jsContextNativePointer);
   auto blobModuleRef = jni::make_global(blobModule);
   runtime.global().setProperty(
       runtime,

diff --git a/...oid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.h b/...oid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.h
@@ -7,15 +7,14 @@
 
 #pragma once
 
-#include <fb/fbjni.h>
 #include <ReactCommon/CallInvoker.h>
+#include <fb/fbjni.h>
 #include <memory>
 
 namespace facebook {
 namespace react {
 
-class CallInvokerHolder
-    : public jni::HybridClass<CallInvokerHolder> {
+class CallInvokerHolder : public jni::HybridClass<CallInvokerHolder> {
  public:
   static auto constexpr kJavaDescriptor =
       "Lcom/facebook/react/turbomodule/core/CallInvokerHolderImpl;";

diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp
@@ -12,7 +12,8 @@
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::xplat::initialize(vm, [] {
-    // TODO: dvacca ramanpreet unify this with the way "ComponentDescriptorFactory" is defined in Fabric
+    // TODO: dvacca ramanpreet unify this with the way
+    // "ComponentDescriptorFactory" is defined in Fabric
     facebook::react::TurboModuleManager::registerNatives();
   });
 }