Add validation that oneofs don't contain no_box message fields.

See #858
scalapb · Jun 22, 2020 · 2c16d1d · 2c16d1d
1 parent 0680d41
commit 2c16d1d
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 9 deletions.
diff --git a/compiler-plugin/src/main/scala/scalapb/compiler/ProtoValidation.scala b/compiler-plugin/src/main/scala/scalapb/compiler/ProtoValidation.scala
@@ -134,6 +134,11 @@ class ProtoValidation(implicits: DescriptorImplicits) {
         s"${fd.getFullName}: Sealed oneofs can not be type mapped. Use regular oneofs instead."
       )
     }
+    if (fd.isMessage && fd.isInOneof && fd.getMessageType().messageOptions.getNoBox()) {
+      throw new GeneratorException(
+        s"${fd.getFullName}: message fields in oneofs are not allowed to have no_box set."
+      )
+    }
   }
 }
 

diff --git a/compiler-plugin/src/main/scala/scalapb/gen.scala b/compiler-plugin/src/main/scala/scalapb/gen.scala
@@ -5,15 +5,15 @@ import scalapb.GeneratorOption._
 
 object gen {
   val SandboxedGenerator = SandboxedJvmGenerator.forModule(
-        "scala",
-        Artifact(
-          "com.thesamet.scalapb",
-          "compilerplugin_2.12",
-          scalapb.compiler.Version.scalapbVersion
-        ),
-        "scalapb.ScalaPbCodeGenerator$",
-        scalapb.ScalaPbCodeGenerator.suggestedDependencies
-      )
+    "scala",
+    Artifact(
+      "com.thesamet.scalapb",
+      "compilerplugin_2.12",
+      scalapb.compiler.Version.scalapbVersion
+    ),
+    "scalapb.ScalaPbCodeGenerator$",
+    scalapb.ScalaPbCodeGenerator.suggestedDependencies
+  )
 
   def apply(options: Set[GeneratorOption]): (SandboxedJvmGenerator, Seq[String]) =
     (

diff --git a/compiler-plugin/src/test/scala/scalapb/compiler/ProtoValidationSpec.scala b/compiler-plugin/src/test/scala/scalapb/compiler/ProtoValidationSpec.scala
@@ -364,4 +364,31 @@ class ProtoValidationSpec extends AnyFlatSpec with Matchers {
       "file1.proto: object_name is not allowed in package-scoped options."
     )
   }
+
+  it should "fail when oneof contains a no_box message" in {
+    intercept[GeneratorException] {
+      runValidation(
+        "file1.proto" ->
+          """
+            |syntax = "proto3";
+            |
+            |package a.b;
+            |
+            |import "scalapb/scalapb.proto";
+            |
+            |message NoBox {
+            |  option (scalapb.message).no_box = true;
+            |}
+            |
+            |message Msg {
+            |  oneof foo {
+            |    NoBox field = 1;
+            |  }
+            |}
+            """.stripMargin
+      )
+    }.message must be(
+      "a.b.Msg.field: message fields in oneofs are not allowed to have no_box set."
+    )
+  }
 }