Support Annotation for SyntaxGraph::Enum::Value

Summary: Note, Enum::Value::operatator== doesn't consider annotations

Reviewed By: pranavtbhat

Differential Revision: D78527413

fbshipit-source-id: 044136e2ad65c09a4bec0fcac90e2cb099b6b304

Author: thedavekwon

thrift/lib/cpp2/schema/SyntaxGraph.h

@@ -698,11 +698,17 @@ class EnumNode final : folly::MoveOnly,
    * A mapping of enum name to its i32 value.
    */
   // TODO: these can also have annotations
-  class Value : detail::WithName {
+  class Value : detail::WithName, detail::WithAnnotations {
    public:
-    Value(std::string_view name, std::int32_t i32)
-        : WithName(name), i32_(i32) {}
-
+    Value(
+        std::string_view name,
+        std::int32_t i32,
+        std::vector<Annotation>&& annotations)
+        : detail::WithName(name),
+          detail::WithAnnotations(std::move(annotations)),
+          i32_(i32) {}
+
+    using detail::WithAnnotations::annotations;
     using detail::WithName::name;
     /**
      * All enums values in Thrift have underlying type of i32

thrift/lib/cpp2/schema/detail/SchemaBackedResolver.cpp

@@ -151,7 +151,8 @@ class SchemaIndex {
       const type::Field&,
       const type::Schema&);
 
-  EnumNode createEnum(const type::DefinitionKey&, const type::Enum&);
+  EnumNode createEnum(
+      const type::DefinitionKey&, const type::Enum&, const type::Schema&);
   TypedefNode createTypedef(const type::DefinitionKey&, const type::Typedef&);
   ConstantNode createConstant(const type::DefinitionKey&, const type::Const&);
 
@@ -508,7 +509,7 @@ void SchemaIndex::updateDefinitionsByKey(
           return createException(definitionKey, exceptionDef, schema);
         },
         [&](const type::Enum& enumDef) -> DefinitionNode::Alternative {
-          return createEnum(definitionKey, enumDef);
+          return createEnum(definitionKey, enumDef, schema);
         },
         [&](const type::Typedef& typedefDef) -> DefinitionNode::Alternative {
           return createTypedef(definitionKey, typedefDef);
@@ -625,10 +626,15 @@ FieldNode SchemaIndex::createField(
 }
 
 EnumNode SchemaIndex::createEnum(
-    const type::DefinitionKey& definitionKey, const type::Enum& enumDef) {
+    const type::DefinitionKey& definitionKey,
+    const type::Enum& enumDef,
+    const type::Schema& schema) {
   std::vector<EnumNode::Value> values;
   for (const type::EnumValue& enumValue : *enumDef.values()) {
-    values.emplace_back(EnumNode::Value(*enumValue.name(), *enumValue.value()));
+    values.emplace_back(
+        *enumValue.name(),
+        *enumValue.value(),
+        createAnnotations(*enumValue.annotationsByKey(), schema));
   }
   return EnumNode(resolver_, definitionKey, *enumDef.uri(), std::move(values));
 }

thrift/lib/cpp2/schema/test/SyntaxGraphTest.cpp

@@ -163,12 +163,18 @@ TEST_F(ServiceSchemaTest, Enum) {
   EXPECT_EQ(e.definition().annotations().size(), 1);
   EXPECT_EQ(e.definition().annotations()[0].value()["field1"], 3);
 
-  const std::vector<EnumNode::Value> expected = {
-      {"UNSET", 0},
-      {"VALUE_1", 1},
-      {"VALUE_2", 2},
-  };
-  EXPECT_THAT(e.values(), testing::ElementsAreArray(expected));
+  const auto& unset = e.values()[0];
+  const auto& value1 = e.values()[1];
+  const auto& value2 = e.values()[2];
+
+  EXPECT_EQ(unset.name(), "UNSET");
+  EXPECT_EQ(unset.i32(), 0);
+  EXPECT_EQ(unset.annotations().size(), 1);
+  EXPECT_EQ(unset.annotations()[0].value()["field1"], 4);
+  EXPECT_EQ(value1.name(), "VALUE_1");
+  EXPECT_EQ(value1.i32(), 1);
+  EXPECT_EQ(value2.name(), "VALUE_2");
+  EXPECT_EQ(value2.i32(), 2);
 
   EXPECT_EQ(
       e.toDebugString(),

thrift/lib/cpp2/schema/test/syntax_graph.thrift

@@ -29,6 +29,7 @@ struct TestRecursiveStruct {
 @scope.Definition
 @scope.Field
 @scope.Enum
+@scope.EnumValue
 struct TestStructuredAnnotation {
   1: i64 field1;
   2: TestInnerStructuredAnnotation field2;
@@ -37,6 +38,7 @@ struct TestStructuredAnnotation {
 @thrift.Uri{value = "meta.com/thrift_test/TestEnum"}
 @TestStructuredAnnotation{field1 = 3}
 enum TestEnum {
+  @TestStructuredAnnotation{field1 = 4}
   UNSET = 0,
   VALUE_1 = 1,
   VALUE_2 = 2,