From 573535990d8846331bdc95f4f18dd5f650d10c0c Mon Sep 17 00:00:00 2001
From: Thanabodee Charoenpiriyakij <thanabodee.c@linecorp.com>
Date: Wed, 23 Dec 2020 20:32:28 +0700
Subject: [PATCH 1/2] Fix repeated enum field generate [[]] into typespec

Removing [] out of Protobuf.Protoc.Generator.Message.fmt_type/1 and
add [] into Protobuf.TypeUtil.enum_to_spec/3 when TYPE_MESSAGE is match
alongs with repeated true.

Fixes #132
---
 lib/protobuf/protoc/generator/message.ex      |  3 ++-
 lib/protobuf/type_util.ex                     |  2 +-
 .../protoc/generator/message_test.exs         | 27 +++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/lib/protobuf/protoc/generator/message.ex b/lib/protobuf/protoc/generator/message.ex
index a53cb185..072d51a8 100644
--- a/lib/protobuf/protoc/generator/message.ex
+++ b/lib/protobuf/protoc/generator/message.ex
@@ -115,6 +115,7 @@ defmodule Protobuf.Protoc.Generator.Message do
         {fmt_type_name(f.name, longest_width), "{atom, any}"}
       end)
 
+
     types =
       types ++
         Enum.map(fields, fn f ->
@@ -153,7 +154,7 @@ defmodule Protobuf.Protoc.Generator.Message do
   end
 
   defp fmt_type(%{label: "repeated", type_enum: type_enum, type: type}) do
-    "[#{type_to_spec(type_enum, type, true)}]"
+    "#{type_to_spec(type_enum, type, true)}"
   end
 
   defp fmt_type(%{type_enum: type_enum, type: type}) do
diff --git a/lib/protobuf/type_util.ex b/lib/protobuf/type_util.ex
index d6db5f21..8057623b 100644
--- a/lib/protobuf/type_util.ex
+++ b/lib/protobuf/type_util.ex
@@ -36,7 +36,7 @@ defmodule Protobuf.TypeUtil do
   def enum_to_spec(:TYPE_SINT32), do: "integer"
   def enum_to_spec(:TYPE_SINT64), do: "integer"
   def enum_to_spec(_), do: "any"
-  def enum_to_spec(:TYPE_MESSAGE, type, true = _repeated), do: "#{type}.t"
+  def enum_to_spec(:TYPE_MESSAGE, type, true = _repeated), do: "[#{type}.t]"
   def enum_to_spec(:TYPE_MESSAGE, type, false = _repeated), do: "#{type}.t | nil"
   def enum_to_spec(:TYPE_ENUM, type, true = _repeated), do: "[#{type}.t]"
   def enum_to_spec(:TYPE_ENUM, type, false = _repeated), do: "#{type}.t"
diff --git a/test/protobuf/protoc/generator/message_test.exs b/test/protobuf/protoc/generator/message_test.exs
index 079e0f10..c4e9e8c9 100644
--- a/test/protobuf/protoc/generator/message_test.exs
+++ b/test/protobuf/protoc/generator/message_test.exs
@@ -515,4 +515,31 @@ defmodule Protobuf.Protoc.Generator.MessageTest do
       assert msg =~ "field :the_field_name, 1, required: true, type: :string\n"
     end
   end
+
+  test "generate/2 repeated enum field in typespec" do
+    ctx = %Context{
+      package: "foo_bar.ab_cd",
+      dep_type_mapping: %{
+        ".foo_bar.ab_cd.EnumFoo" => %{type_name: "FooBar.AbCd.EnumFoo"}
+      }
+    }
+
+    desc =
+      Google.Protobuf.DescriptorProto.new(
+        name: "Foo",
+        field: [
+          Google.Protobuf.FieldDescriptorProto.new(
+            name: "a",
+            json_name: "a",
+            number: 1,
+            type: :TYPE_ENUM,
+            label: :LABEL_REPEATED,
+            type_name: ".foo_bar.ab_cd.EnumFoo"
+          )
+        ]
+      )
+
+    {[], [msg]} = Generator.generate(ctx, desc)
+    assert msg =~ "a: [FooBar.AbCd.EnumFoo.t]"
+  end
 end

From 61e50f9cb1e33041f81132a94ea16fa7bf0ba1ca Mon Sep 17 00:00:00 2001
From: Thanabodee Charoenpiriyakij <thanabodee.c@linecorp.com>
Date: Sat, 17 Apr 2021 20:06:19 +0700
Subject: [PATCH 2/2] Remove string interpolation in fmt_type/1

---
 lib/protobuf/protoc/generator/message.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/protobuf/protoc/generator/message.ex b/lib/protobuf/protoc/generator/message.ex
index 072d51a8..821bea1c 100644
--- a/lib/protobuf/protoc/generator/message.ex
+++ b/lib/protobuf/protoc/generator/message.ex
@@ -154,7 +154,7 @@ defmodule Protobuf.Protoc.Generator.Message do
   end
 
   defp fmt_type(%{label: "repeated", type_enum: type_enum, type: type}) do
-    "#{type_to_spec(type_enum, type, true)}"
+    type_to_spec(type_enum, type, true)
   end
 
   defp fmt_type(%{type_enum: type_enum, type: type}) do