Extend package choosing behavior to protobuf files with Enum types

src/main/scala/higherkindness/skeuomorph/protobuf/ParseProto.scala

@@ -146,8 +146,15 @@ object ParseProto {
     // (which will return the fully-qualified name) vs accessing a type name from a file with a `java_package`
     // header (which will just return the name of the type).  This method trims the type name from a fully-
     // qualified name if necessary, which provides consistent behavior when comparing the name of a message
-    // to the name of a type
-    fullName.substring(fullName.lastIndexOf(".") + 1)
+    // to the name of a type.
+    //
+    // In addition, the reason we count '.' characters is because the value of the FQN will be different
+    // depending on whether the fullName was generated from a protobuf file that used the `package` option,
+    // vs a protobuf file that used the `java_package`, or simply had an empty option.  Therefore, we need
+    // to parse exactly as many dots as the FQN so that we extract exactly as much FQN as we need to use
+    // the type name appropriately.  A more involved example explaining why we do this can be found here:
+    // https://github.com/higherkindness/skeuomorph/pull/339#discussion_r496969857
+    fullName.substring(fullName.indexOf(".", fullName.count(_ == '.')) + 1)
 
   def fromProto[A](
       descriptorFileName: String,
@@ -473,7 +480,7 @@ object ParseProto {
     }
 
     (allTopLevel ++ allNestedInsideMessages)
-      .find(_.fullName === name)
+      .find(_.fullName.contains(getTypeNameFromQualifiedName(name)))
   }
 
   implicit class LabelOps(self: Label) {

src/test/scala/higherkindness/skeuomorph/protobuf/ProtobufProtocolSpec.scala

@@ -61,6 +61,11 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
   The generated Scala code should use the `java_package` option when both `package` and `java_package` are present in a file. $codeGenProtobufJavaPackage
 
   The generated Scala code should use the filename as a package option when neither `package` nor `java_package` are present in a file. $codegenProtobufNoPackage
+
+  The generated Scala code should handle enums when `package` is present in a file. $codeGenProtobufEnumWithPackage
+
+  The generated Scala code should handle enums when neither `package` nor `java_package` in a file. $codeGenProtobufEnumWithNoPackage
+
   """
 
   private def codegenProtobufProtocol =
@@ -457,4 +462,53 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
     |}
     |""".stripMargin
 
+  private def codeGenProtobufEnumWithPackage = {
+    val enumWithPackage: Protocol[Mu[ProtobufF]] = {
+      val path   = workingDirectory + s"$testDirectory/packages"
+      val source = ProtoSource(s"test_enum_package.proto", path, importRoot)
+      parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
+    }
+
+    check(enumWithPackage, protobufEnumWithPackageExpectation)
+  }
+
+  val protobufEnumWithPackageExpectation =
+    s"""
+    |package example
+    |import _root_.higherkindness.mu.rpc.protocol._
+    |object test_enum_package {
+    |  final case class Example(@_root_.pbdirect.pbIndex(1) enum: _root_.scala.Option[_root_.example.test_enum_package.ExampleEnum])
+    |  sealed abstract class ExampleEnum(val value: _root_.scala.Int) extends _root_.enumeratum.values.IntEnumEntry
+    |  object ExampleEnum extends _root_.enumeratum.values.IntEnum[ExampleEnum] {
+    |    case object Option1 extends ExampleEnum(0)
+    |    case object Option2 extends ExampleEnum(1)
+    |    val values = findValues
+    |  }
+    |}
+    |""".stripMargin
+
+  private def codeGenProtobufEnumWithNoPackage = {
+    val enumWithNoPackage: Protocol[Mu[ProtobufF]] = {
+      val path   = workingDirectory + s"$testDirectory/packages"
+      val source = ProtoSource(s"test_enum_no_package.proto", path, importRoot)
+      parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
+    }
+
+    check(enumWithNoPackage, protobufEnumWithoutPackageExpectation)
+  }
+
+  val protobufEnumWithoutPackageExpectation =
+    s"""
+    |package test_enum_no_package
+    |import _root_.higherkindness.mu.rpc.protocol._
+    |object test_enum_no_package {
+    |  final case class Example(@_root_.pbdirect.pbIndex(1) enum: _root_.scala.Option[_root_.test_enum_no_package.test_enum_no_package.ExampleEnum])
+    |  sealed abstract class ExampleEnum(val value: _root_.scala.Int) extends _root_.enumeratum.values.IntEnumEntry
+    |  object ExampleEnum extends _root_.enumeratum.values.IntEnum[ExampleEnum] {
+    |    case object Option1 extends ExampleEnum(0)
+    |    case object Option2 extends ExampleEnum(1)
+    |    val values = findValues
+    |  }
+    |}
+    |""".stripMargin
 }

src/test/scala/higherkindness/skeuomorph/protobuf/packages/test_enum_no_package.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+message Example {
+    ExampleEnum enum = 1;
+}
+
+enum ExampleEnum {
+    Option1 = 0;
+    Option2 = 1;
+}

src/test/scala/higherkindness/skeuomorph/protobuf/packages/test_enum_package.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+package example;
+
+message Example {
+    ExampleEnum enum = 1;
+}
+
+enum ExampleEnum {
+    Option1 = 0;
+    Option2 = 1;
+}