Better escaping for lens, disallow the name Map in property testing.

scalapb · Jan 15, 2015 · 83398e7 · 83398e7
1 parent 04cbd2a
commit 83398e7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/ProtobufGenerator.scala b/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/ProtobufGenerator.scala
@@ -375,11 +375,11 @@ class ProtobufGenerator(params: GeneratorParams) {
       printer.add(s"var __${oneof.scalaName} = this.${oneof.scalaName.asSymbol}")
       )
       .addM(
-        s"""var done__ = false
-           |while (!done__) {
-           |  val tag__ = __input.readTag()
-           |  tag__ match {
-           |    case 0 => done__ = true""")
+        s"""var _done__ = false
+           |while (!_done__) {
+           |  val _tag__ = __input.readTag()
+           |  _tag__ match {
+           |    case 0 => _done__ = true""")
       .print(message.getFields) {
       (field, printer) =>
         if (!field.isPacked) {
@@ -550,11 +550,12 @@ class ProtobufGenerator(params: GeneratorParams) {
 
   def generateMessageLens(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = {
     val myFullScalaName = message.scalaTypeName
-    val className = message.getName.asSymbol
+    val className = message.getName
+    val classNameSymbol = className.asSymbol
     def lensType(s: String) = s"com.trueaccord.lenses.Lens[UpperPB, $s]"
 
     printer.add(
-      s"implicit class ${className}Lens[UpperPB](_l: com.trueaccord.lenses.Lens[UpperPB, $className]) extends com.trueaccord.lenses.ObjectLens[UpperPB, $className](_l) {")
+      s"implicit class ${className}Lens[UpperPB](_l: com.trueaccord.lenses.Lens[UpperPB, $classNameSymbol]) extends com.trueaccord.lenses.ObjectLens[UpperPB, $classNameSymbol](_l) {")
       .indent
       .print(message.getFields) {
       case (field, printer) =>

diff --git a/proptest/src/test/scala/SchemaGenerators.scala b/proptest/src/test/scala/SchemaGenerators.scala
@@ -43,7 +43,7 @@ object SchemaGenerators {
     "java", "com", "google",
 
     // Scala
-    "ne", "eq", "val", "var", "def", "any", "nil", "seq",
+    "ne", "eq", "val", "var", "def", "any", "map", "nil", "seq",
 
     // Words that are not allowed by the Java protocol buffer compiler:
     "tag",