From 33b3ea8b109e429eb4674421a35d1cbb2a83db77 Mon Sep 17 00:00:00 2001
From: Kfir Schindelhaim <kfirs@fb.com>
Date: Fri, 10 Jan 2020 07:47:52 -0800
Subject: [PATCH] Update CK linter for subclasses

Reviewed By: cuva

Differential Revision: D19345410

fbshipit-source-id: 3aa4ef362
---
 infer/src/al/ComponentKit.ml                         |  4 +---
 .../linters/componentkit/FakeComponentKitHeader.h    | 12 ++----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/infer/src/al/ComponentKit.ml b/infer/src/al/ComponentKit.ml
index 3b6202c4b..8523ed5ae 100644
--- a/infer/src/al/ComponentKit.ml
+++ b/infer/src/al/ComponentKit.ml
@@ -224,10 +224,8 @@ let component_with_unconventional_superclass_advice context an =
                      [ ckcomponent_cl
                      ; ckcomponentcontroller_cl
                      ; "CKCompositeComponent"
+                     ; "CKLayoutComponent"
                      ; "CKRenderComponent"
-                     ; "CKRenderLayoutComponent"
-                     ; "CKRenderLayoutWithChildrenComponent"
-                     ; "CKRenderWithChildrenComponent"
                      ; "CKStatefulViewComponent"
                      ; "CKStatefulViewComponentController"
                      ; "NTNativeTemplateComponent" ]
diff --git a/infer/tests/codetoanalyze/objcpp/linters/componentkit/FakeComponentKitHeader.h b/infer/tests/codetoanalyze/objcpp/linters/componentkit/FakeComponentKitHeader.h
index bc386634a..82e0132d9 100644
--- a/infer/tests/codetoanalyze/objcpp/linters/componentkit/FakeComponentKitHeader.h
+++ b/infer/tests/codetoanalyze/objcpp/linters/componentkit/FakeComponentKitHeader.h
@@ -63,14 +63,6 @@ class CKComponentScope {
 @interface CKRenderComponent : CKComponent
 @end
 
-// Mimic importing CKRenderWithChildrenComponent
-@interface CKRenderWithChildrenComponent : CKComponent
-@end
-
-// Mimic importing CKRenderLayoutComponent
-@interface CKRenderLayoutComponent : CKComponent
-@end
-
-// Mimic importing CKRenderLayoutWithChildrenComponent
-@interface CKRenderLayoutWithChildrenComponent : CKComponent
+// Mimic importing CKLayoutComponent
+@interface CKLayoutComponent : CKComponent
 @end