Add paris style validation (#283)

airbnb · Sep 14, 2017 · 3ac610e · 3ac610e
1 parent f4cb94c
commit 3ac610e
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/epoxy-processor/src/main/java/com/airbnb/epoxy/GeneratedModelWriter.java b/epoxy-processor/src/main/java/com/airbnb/epoxy/GeneratedModelWriter.java
@@ -622,23 +622,21 @@ private MethodSpec buildPreBindMethod(GeneratedModelInfo modelInfo,
     addHashCodeValidationIfNecessary(preBindBuilder,
         "The model was changed between being added to the controller and being bound.");
 
-    // TODO: (eli_hart 9/8/17) uncomment once paris fixes its bug
-//    if (modelInfo.isStyleable() && configManager.shouldValidateModelUsage()) {
-//      preBindBuilder.beginControlFlow("try")
-//
-//          .addStatement("$T.assertSameAttributes(new $T($L), $L, $L)",
-//              ClassNames.PARIS_STYLE_UTILS, modelInfo.getStyleBuilderInfo()
-// .getStyleApplierClass(),
-//              boundObjectParam.name, PARIS_STYLE_ATTR_NAME, PARIS_DEFAULT_STYLE_CONSTANT_NAME)
-//          .endControlFlow()
-//          .beginControlFlow("catch($T e)", AssertionError.class)
-//          .addStatement(
-//              "throw new $T(\"$L model at position \" + $L + \" has an invalid style:\\n\\n\" + e"
-//                  + ".getMessage())",
-//              IllegalStateException.class, modelInfo.generatedClassName.simpleName(),
-//              positionParamName)
-//          .endControlFlow();
-//    }
+    if (modelInfo.isStyleable() && configManager.shouldValidateModelUsage()) {
+      preBindBuilder.beginControlFlow("try")
+
+          .addStatement("$T.assertSameAttributes(new $T($L), $L, $L)",
+              ClassNames.PARIS_STYLE_UTILS, modelInfo.getStyleBuilderInfo().getStyleApplierClass(),
+              boundObjectParam.name, PARIS_STYLE_ATTR_NAME, PARIS_DEFAULT_STYLE_CONSTANT_NAME)
+          .endControlFlow()
+          .beginControlFlow("catch($T e)", AssertionError.class)
+          .addStatement(
+              "throw new $T(\"$L model at position \" + $L + \" has an invalid style:\\n\\n\" + e"
+                  + ".getMessage())",
+              IllegalStateException.class, modelInfo.generatedClassName.simpleName(),
+              positionParamName)
+          .endControlFlow();
+    }
 
     ClassName clickWrapperType = getClassName(WRAPPED_LISTENER_TYPE);
     for (AttributeInfo attribute : modelInfo.getAttributeInfo()) {