Skip to content

Commit

Permalink
Merge pull request #48 from xuwei-k/remove-unused-val
Browse files Browse the repository at this point in the history
remove unused local variables
  • Loading branch information
thesamet committed Oct 29, 2015
2 parents c2c590e + 7a92359 commit 452bdb5
Showing 1 changed file with 0 additions and 8 deletions.
Expand Up @@ -615,7 +615,6 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
field =>
val typeName = if (field.isEnum) "com.google.protobuf.Descriptors.EnumValueDescriptor" else field.baseSingleScalaTypeName
val e = s"__fieldsMap.getOrElse(__fields(${field.getIndex}), None).asInstanceOf[Option[$typeName]]"
val t = field.oneOfTypeName
(transform(field) andThen FunctionApplication(field.oneOfTypeName)).apply(e, isCollection = true)
} mkString (" orElse\n")
s"${oneOf.scalaName.asSymbol} = $elems getOrElse ${oneOf.empty}"
Expand All @@ -638,7 +637,6 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
}

def generateDescriptor(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = {
val myFullScalaName = message.scalaTypeName
printer
.when(message.isTopLevel)(_.add(s"def descriptor: com.google.protobuf.Descriptors.Descriptor = ${message.getFile.fileDescriptorObjectName}.descriptor.getMessageTypes.get(${message.getIndex})"))
.when(!message.isTopLevel)(_.add(s"def descriptor: com.google.protobuf.Descriptors.Descriptor = ${message.getContainingType.scalaTypeName}.descriptor.getNestedTypes.get(${message.getIndex})"))
Expand All @@ -659,7 +657,6 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
}

def generateMessageLens(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = {
val myFullScalaName = message.scalaTypeName
val className = message.scalaName
val classNameSymbol = className.asSymbol
def lensType(s: String) = s"com.trueaccord.lenses.Lens[UpperPB, $s]"
Expand Down Expand Up @@ -699,7 +696,6 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
printer
.print(message.getFields) {
case (field, printer) =>
val fieldName = field.scalaName.asSymbol
printer.add(s"final val ${field.fieldNumberConstantName} = ${field.getNumber}")
}
}
Expand All @@ -713,7 +709,6 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
printer
.print(customizedFields) {
case ((field, customType), printer) =>
val fieldName = field.scalaName.asSymbol
printer.add(s"private val ${field.typeMapperValName}: com.trueaccord.scalapb.TypeMapper[${field.baseSingleScalaTypeName}, ${customType}] = implicitly[com.trueaccord.scalapb.TypeMapper[${field.baseSingleScalaTypeName}, ${customType}]]")
}
}
Expand Down Expand Up @@ -779,7 +774,6 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
}

def generateMessageCompanion(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = {
val myFullScalaName = message.scalaTypeName
val className = message.nameSymbol
val mixins = if (message.javaConversions)
s"with com.trueaccord.scalapb.JavaProtoSupport[$className, ${message.javaTypeName}] " else ""
Expand Down Expand Up @@ -839,7 +833,6 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
|def $withMethod(__v: ${singleType}): ${message.nameSymbol} = copy(${field.scalaName.asSymbol} = Some(__v))""")
}.when(field.isInOneof) {
p =>
val default = defaultValueForGet(field)
p.add(
s"""def $withMethod(__v: ${singleType}): ${message.nameSymbol} = copy(${field.getContainingOneof.scalaName.asSymbol} = ${field.oneOfTypeName}(__v))""")
}.when(field.isRepeated) { p =>
Expand Down Expand Up @@ -999,7 +992,6 @@ object ProtobufGenerator {
parseParameters(request.getParameter) match {
case Right(params) =>
val generator = new ProtobufGenerator(params)
val fileProtosByName = request.getProtoFileList.map(n => n.getName -> n).toMap
val filesByName: Map[String, FileDescriptor] =
request.getProtoFileList.foldLeft[Map[String, FileDescriptor]](Map.empty) {
case (acc, fp) =>
Expand Down

0 comments on commit 452bdb5

Please sign in to comment.