From 81d78949c3e29a1029947441e36a25fce683c499 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 28 Oct 2019 04:25:18 +0300 Subject: [PATCH] Fix proto comparison for fields mapped to type table Original commit: 28e6219b0bed5ccf96e5101d590d2350795f8b6b --- .../jps/incremental/AbstractProtoComparisonTest.kt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 9e1c15e1268..4065354f67c 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -58,10 +58,20 @@ abstract class AbstractProtoComparisonTest : TestWithWorkingDir() { val rawProtoDifference = when { oldData is ClassProtoData && newData is ClassProtoData -> { - ProtoCompareGenerated(oldData.nameResolver, newData.nameResolver).difference(oldData.proto, newData.proto) + ProtoCompareGenerated( + oldNameResolver = oldData.nameResolver, + newNameResolver = newData.nameResolver, + oldTypeTable = oldData.proto.typeTableOrNull, + newTypeTable = newData.proto.typeTableOrNull + ).difference(oldData.proto, newData.proto) } oldData is PackagePartProtoData && newData is PackagePartProtoData -> { - ProtoCompareGenerated(oldData.nameResolver, newData.nameResolver).difference(oldData.proto, newData.proto) + ProtoCompareGenerated( + oldNameResolver = oldData.nameResolver, + newNameResolver = newData.nameResolver, + oldTypeTable = oldData.proto.typeTableOrNull, + newTypeTable = newData.proto.typeTableOrNull + ).difference(oldData.proto, newData.proto) } else -> null }