Codemod CKAnalyticsListener to CKSystraceListener

Summary: Pass the correct protocol to the relevant life cycle calls. Reviewed By: cuva Differential Revision: D13956457 fbshipit-source-id: b9ea5f170513204343fb40312a31e2a2a1c76867
nutshellcrm · Feb 5, 2019 · 4ccc5a7 · 4ccc5a7
1 parent f1bcc1b
commit 4ccc5a7
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/ComponentKit/Core/CKComponent.mm b/ComponentKit/Core/CKComponent.mm
@@ -165,12 +165,12 @@ - (void)buildComponentTree:(id<CKTreeNodeWithChildrenProtocol>)parent
                                         size:(const CGSize)size
                                     children:(std::shared_ptr<const std::vector<CKComponentLayoutChild>>)children
                               supercomponent:(CKComponent *)supercomponent
-                           analyticsListener:(id<CKAnalyticsListener>)analyticsListener
+                            systraceListener:(id<CKSystraceListener>)systraceListener
 {
   CKCAssertWithCategory([NSThread isMainThread], [self class], @"This method must be called on the main thread");
-  if (analyticsListener) {
-    [analyticsListener willMountComponent:self];
-  }
+
+  [systraceListener willMountComponent:self];
+
   // Taking a const ref to a temporary extends the lifetime of the temporary to the lifetime of the const ref
   const CKComponentViewConfiguration &viewConfiguration = CK::Component::Accessibility::IsAccessibilityEnabled() ? CK::Component::Accessibility::AccessibleViewConfiguration(_viewConfiguration) : _viewConfiguration;
 
@@ -252,10 +252,10 @@ - (void)_relinquishMountedView
   }
 }
 
-- (void)childrenDidMount:(id<CKAnalyticsListener>)analyticsListener
+- (void)childrenDidMount:(id<CKSystraceListener>)systraceListener
 {
   [_scopeHandle.controller componentDidMount:self];
-  [analyticsListener didMountComponent:self];
+  [systraceListener didMountComponent:self];
 }
 
 #pragma mark - Animation

diff --git a/ComponentKit/Core/CKComponentInternal.h b/ComponentKit/Core/CKComponentInternal.h
@@ -17,7 +17,7 @@
 #import <ComponentKit/CKComponentScopeEnumeratorProvider.h>
 #import <ComponentKit/CKTreeNodeProtocol.h>
 
-@protocol CKAnalyticsListener;
+@protocol CKSystraceListener;
 
 @interface CKComponent () <CKTreeNodeComponentProtocol>
 
@@ -38,15 +38,15 @@
  @param size The size for this component
  @param children The positioned children for this component. Normally this parameter is ignored.
  @param supercomponent This component's parent component
- @param analyticsListener The current analytics listener - can be nil.
+ @param systraceListener The current systrace listener - will be nil if systrace is not enabled.
  @return An updated mount context. In most cases, this is just be the passed-in context. If a view was created, this is
  used to specify that subcomponents should be mounted inside the view.
  */
 - (CK::Component::MountResult)mountInContext:(const CK::Component::MountContext &)context
                                         size:(const CGSize)size
                                     children:(std::shared_ptr<const std::vector<CKComponentLayoutChild>>)children
                               supercomponent:(CKComponent *)supercomponent
-                           analyticsListener:(id<CKAnalyticsListener>)analyticsListener NS_REQUIRES_SUPER;
+                            systraceListener:(id<CKSystraceListener>)systraceListener NS_REQUIRES_SUPER;
 
 /**
  For internal use only; don't use this initializer.
@@ -75,9 +75,9 @@
 /**
  Called when the component and all its children have been mounted.
 
- @param analyticsListener The current analytics listener - can be nil.
+ @param systraceListener The current systrace listener - will be nil if systrace is not enabled.
  */
-- (void)childrenDidMount:(id<CKAnalyticsListener>)analyticsListener;
+- (void)childrenDidMount:(id<CKSystraceListener>)systraceListener;
 
 /** Used to get the root component in the responder chain; don't touch this. */
 @property (nonatomic, weak) UIView *rootComponentMountedView;

diff --git a/ComponentKit/Core/CKComponentLayout.mm b/ComponentKit/Core/CKComponentLayout.mm
@@ -80,7 +80,7 @@ CKMountComponentLayoutResult CKMountComponentLayout(const CKComponentLayout &lay
   };
 
   [analyticsListener willMountComponentTreeWithRootComponent:layout.component];
-  auto const analyticsListenerForMount = [analyticsListener isSystraceEnabled] ? analyticsListener : nil;
+  auto const systraceListener = [analyticsListener isSystraceEnabled] ? analyticsListener : nil;
   // Using a stack to mount ensures that the components are mounted
   // in a DFS fashion which is handy if you want to animate a subpart
   // of the tree
@@ -93,7 +93,7 @@ CKMountComponentLayoutResult CKMountComponentLayout(const CKComponentLayout &lay
   while (!stack.empty()) {
     MountItem &item = stack.top();
     if (item.visited) {
-      [item.layout.component childrenDidMount:analyticsListenerForMount];
+      [item.layout.component childrenDidMount:systraceListener];
       stack.pop();
     } else {
       item.visited = YES;
@@ -104,7 +104,7 @@ CKMountComponentLayoutResult CKMountComponentLayout(const CKComponentLayout &lay
                                                                        size:item.layout.size
                                                                    children:item.layout.children
                                                              supercomponent:item.supercomponent
-                                                          analyticsListener:analyticsListenerForMount];
+                                                           systraceListener:systraceListener];
       [mountedComponents addObject:item.layout.component];
 
       if (mountResult.mountChildren) {

diff --git a/ComponentKitTests/CKComponentMountContextLayoutGuideTests.mm b/ComponentKitTests/CKComponentMountContextLayoutGuideTests.mm
@@ -87,13 +87,13 @@ @implementation CKLayoutGuideTestComponent
                                         size:(const CGSize)size
                                     children:(std::shared_ptr<const std::vector<CKComponentLayoutChild>>)children
                               supercomponent:(CKComponent *)supercomponent
-                           analyticsListener:(id<CKAnalyticsListener>)analyticsListener
+                            systraceListener:(id<CKSystraceListener>)systraceListener
 {
   const CK::Component::MountResult mountResult = [super mountInContext:context
                                                                   size:size
                                                               children:children
                                                         supercomponent:supercomponent
-                                                     analyticsListener:analyticsListener];
+                                                      systraceListener:systraceListener];
   _layoutGuideUsedAtMountTime = context.layoutGuide;
   return mountResult;
 }

diff --git a/ComponentKitTests/CKComponentMountTests.mm b/ComponentKitTests/CKComponentMountTests.mm
@@ -118,9 +118,9 @@ - (CKComponentLayout)computeLayoutThatFits:(CKSizeRange)constrainedSize
 size:(const CGSize)size
 children:(std::shared_ptr<const std::vector<CKComponentLayoutChild>>)children
 supercomponent:(CKComponent *)supercomponent
-analyticsListener:(id<CKAnalyticsListener>)analyticsListener
+systraceListener:(id<CKSystraceListener>)systraceListener
 {
-  CK::Component::MountResult r = [super mountInContext:context size:size children:children supercomponent:supercomponent analyticsListener:analyticsListener];
+  CK::Component::MountResult r = [super mountInContext:context size:size children:children supercomponent:supercomponent systraceListener:systraceListener];
   return {
     .mountChildren = NO,
     .contextForChildren = r.contextForChildren

diff --git a/ComponentKitTests/CKComponentViewReuseTests.mm b/ComponentKitTests/CKComponentViewReuseTests.mm
@@ -326,9 +326,9 @@ + (instancetype)newWithComponent:(CKComponent *)component
 size:(const CGSize)size
 children:(std::shared_ptr<const std::vector<CKComponentLayoutChild>>)children
 supercomponent:(CKComponent *)supercomponent
-analyticsListener:(id<CKAnalyticsListener>)analyticsListener
+systraceListener:(id<CKSystraceListener>)systraceListener
 {
-  const auto result = [super mountInContext:context size:size children:children supercomponent:supercomponent analyticsListener:analyticsListener];
+  const auto result = [super mountInContext:context size:size children:children supercomponent:supercomponent systraceListener:systraceListener];
   CKInjectingView *injectingView = (CKInjectingView *)result.contextForChildren.viewManager->view;
   return {
     .mountChildren = YES,

diff --git a/ComponentTextKit/CKTextComponent.mm b/ComponentTextKit/CKTextComponent.mm
@@ -22,7 +22,7 @@
 
 #import "CKTextComponentView.h"
 
-@protocol CKAnalyticsListener;
+@protocol CKSystraceListener;
 
 static CK::TextKit::Renderer::Cache *sharedRendererCache()
 {
@@ -104,13 +104,13 @@ - (CKComponentLayout)computeLayoutThatFits:(CKSizeRange)constrainedSize
                                         size:(const CGSize)size
                                     children:(std::shared_ptr<const std::vector<CKComponentLayoutChild>>)children
                               supercomponent:(CKComponent *)supercomponent
-                           analyticsListener:(id<CKAnalyticsListener>)analyticsListener
+                            systraceListener:(id<CKSystraceListener>)systraceListener
 {
   CK::Component::MountResult result = [super mountInContext:context
                                                        size:size
                                                    children:children
                                              supercomponent:supercomponent
-                                          analyticsListener:analyticsListener];
+                                           systraceListener:systraceListener];
   CKTextComponentView *view = (CKTextComponentView *)result.contextForChildren.viewManager->view;
   CKTextKitRenderer *renderer = rendererForAttributes(_attributes, size);
   view.renderer = renderer;