azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix comparing repeated proto extensions

Browse Source 
Previously ProtoCompareGenerated could
go out of bounds when comparing protos
with different number of annotations.

That happend because JsProtoBuf.parameterAnnotation
is a repeated extension, but the generated code for
comparing repeated extensions was incorrect.

JvmProtoBuf does not have repeated extensions (at least for
the class and package descriptors),
so the problem was not detected before.
This commit is contained in:
Alexey Tsvetkov
2017-07-31 22:04:33 +03:00
parent 1cce1ef1f6
commit c601890151
2 changed files with 133 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
+28 -17
View File
@@ -342,11 +342,16 @@ class GenerateProtoBufCompare {
val fullFieldName = "$outerClassName.$fieldName"
override fun printRepeatedField() {
p.println("if (old.getExtensionCount($fullFieldName) != new.getExtensionCount($fullFieldName)) $statement")
p.println()
p.println("for(i in 0..old.getExtensionCount($fullFieldName) - 1) {")
p.printlnIfWithComparisonIndent(field, "getExtension($fullFieldName, i)", statement)
p.println("}")
p.printlnMultiline("""
if (old.getExtensionCount($fullFieldName) != new.getExtensionCount($fullFieldName)) {
$statement
}
else {
for(i in 0..old.getExtensionCount($fullFieldName) - 1) {
${ifWithComparison(field, "getExtension($fullFieldName, i)", statement)}
}
}
""")
}
override fun printRequiredField() {
@@ -390,19 +395,21 @@ class GenerateProtoBufCompare {
}
}
private fun ifWithComparison(field: Descriptors.FieldDescriptor, expr: String, statement: String) =
when {
field.options.getExtension(DebugExtOptionsProtoBuf.stringIdInTable) ||
field.options.getExtension(DebugExtOptionsProtoBuf.nameIdInTable) ->
"if (!$CHECK_STRING_EQUALS_NAME(old.$expr, new.$expr)) $statement"
field.options.getExtension(DebugExtOptionsProtoBuf.fqNameIdInTable) ->
"if (!$CHECK_CLASS_ID_EQUALS_NAME(old.$expr, new.$expr)) $statement"
field.javaType in JAVA_TYPES_WITH_INLINED_EQUALS ->
"if (old.$expr != new.$expr) $statement"
else ->
"if (!$CHECK_EQUALS_NAME(old.$expr, new.$expr)) $statement"
}
private fun Printer.printlnIfWithComparison(field: Descriptors.FieldDescriptor, expr: String, statement: String = "return false") {
val line = when {
field.options.getExtension(DebugExtOptionsProtoBuf.stringIdInTable) ||
field.options.getExtension(DebugExtOptionsProtoBuf.nameIdInTable) ->
"if (!$CHECK_STRING_EQUALS_NAME(old.$expr, new.$expr)) $statement"
field.options.getExtension(DebugExtOptionsProtoBuf.fqNameIdInTable) ->
"if (!$CHECK_CLASS_ID_EQUALS_NAME(old.$expr, new.$expr)) $statement"
field.javaType in JAVA_TYPES_WITH_INLINED_EQUALS ->
"if (old.$expr != new.$expr) $statement"
else ->
"if (!$CHECK_EQUALS_NAME(old.$expr, new.$expr)) $statement"
}
this.println(line)
this.println(ifWithComparison(field, expr, statement))
}
fun Printer.printlnIfWithComparisonIndent(field: Descriptors.FieldDescriptor, expr: String, statement: String = "return false") {
@@ -458,3 +465,7 @@ class GenerateProtoBufCompare {
private val String.javaName: String
get() = this.split("_").joinToString("") { it.capitalize() }.decapitalize()
}
private fun Printer.printlnMultiline(string: String) {
string.trimIndent().split("\n").forEach { this.println(it) }
}