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

Exclude some proto messages from proto comparison in IC

Browse Source
This commit is contained in:
Alexey Tsvetkov
2019-10-28 07:51:45 +03:00
committed by romanart
parent ac9b7fa268
commit 6e9cd85b54
9 changed files with 304 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
+12 -8
View File
@@ -215,8 +215,8 @@ class GenerateProtoBufCompare {
fun generateHashCodeFun(descriptor: Descriptors.Descriptor, p: Printer) {
val typeName = descriptor.typeName
val fields = descriptor.fields.filter { !it.isSkip }
val extFields = extensions[descriptor]?.filter { !it.isSkip } ?: emptyList()
val fields = descriptor.fields.filter { !it.shouldSkip }
val extFields = extensions[descriptor]?.filter { !it.shouldSkip } ?: emptyList()
p.println()
p.println("fun $typeName.$HASH_CODE_NAME(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int, typeById: (Int) -> ProtoBuf.Type): Int {")
@@ -261,8 +261,8 @@ class GenerateProtoBufCompare {
fun generateForMessage(descriptor: Descriptors.Descriptor, p: Printer) {
val typeName = descriptor.typeName
val fields = descriptor.fields.filter { !it.isSkip }
val extFields = extensions[descriptor]?.filter { !it.isSkip } ?: emptyList()
val fields = descriptor.fields.filter { !it.shouldSkip }
val extFields = extensions[descriptor]?.filter { !it.shouldSkip } ?: emptyList()
p.println("open fun $CHECK_EQUALS_NAME(old: $typeName, new: $typeName): Boolean {")
p.pushIndent()
@@ -280,8 +280,8 @@ class GenerateProtoBufCompare {
val typeName = descriptor.typeName
val className = typeName.replace(".", "")
val fields = descriptor.fields.filter { !it.isSkip }
val extFields = extensions[descriptor]?.filter { !it.isSkip } ?: emptyList()
val fields = descriptor.fields.filter { !it.shouldSkip }
val extFields = extensions[descriptor]?.filter { !it.shouldSkip } ?: emptyList()
val allFields = fields + extFields
p.println("enum class ${className}Kind {")
@@ -421,8 +421,12 @@ class GenerateProtoBufCompare {
private val Descriptors.FieldDescriptor.statementForDiff: String
get() = "$RESULT_NAME.add(${containingType.typeName.replace(".", "")}Kind.${extensions.getEnumName(this)})"
private val Descriptors.FieldDescriptor.isSkip: Boolean
private val Descriptors.Descriptor.shouldSkip: Boolean
get() = options.getExtension(DebugExtOptionsProtoBuf.skipMessageInComparison)
private val Descriptors.FieldDescriptor.shouldSkip: Boolean
get() = options.getExtension(DebugExtOptionsProtoBuf.skipInComparison)
|| (type == Descriptors.FieldDescriptor.Type.MESSAGE && messageType.shouldSkip)
private fun addMessageTypeToProcessIfNeeded(field: Descriptors.FieldDescriptor) {
if (field.javaType == Descriptors.FieldDescriptor.JavaType.MESSAGE) {
@@ -431,7 +435,7 @@ class GenerateProtoBufCompare {
}
private fun addMessageToProcessIfNeeded(descriptor: Descriptors.Descriptor) {
if (descriptor !in allMessages) {
if (descriptor !in allMessages && !descriptor.shouldSkip) {
allMessages.add(descriptor)
messagesToProcess.add(descriptor)
}