diff --git a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt index e49328ccbb5..8b49856ea1a 100644 --- a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt +++ b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt @@ -83,14 +83,14 @@ class GenerateProtoBufCompare { p.println("/** This file is generated by org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare. DO NOT MODIFY MANUALLY */") p.println() - p.println("open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, public val newNameResolver: NameResolver) {") + p.println("open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameResolver: NameResolver) {") p.pushIndent() p.println("private val strings = Interner()") - p.println("public val $OLD_PREFIX${STRING_INDEXES_NANE}Map: MutableMap = hashMapOf()") - p.println("public val $NEW_PREFIX${STRING_INDEXES_NANE}Map: MutableMap = hashMapOf()") - p.println("public val $OLD_PREFIX${CLASS_ID_INDEXES_NANE}Map: MutableMap = hashMapOf()") - p.println("public val $NEW_PREFIX${CLASS_ID_INDEXES_NANE}Map: MutableMap = hashMapOf()") + p.println("val $OLD_PREFIX${STRING_INDEXES_NANE}Map: MutableMap = hashMapOf()") + p.println("val $NEW_PREFIX${STRING_INDEXES_NANE}Map: MutableMap = hashMapOf()") + p.println("val $OLD_PREFIX${CLASS_ID_INDEXES_NANE}Map: MutableMap = hashMapOf()") + p.println("val $NEW_PREFIX${CLASS_ID_INDEXES_NANE}Map: MutableMap = hashMapOf()") p.println() p.println("private val classIds = Interner()") @@ -126,11 +126,11 @@ class GenerateProtoBufCompare { } fun generateAuxiliaryMethods(p: Printer) { - p.println("public fun oldGetIndexOfString(index: Int): Int = getIndexOfString(index, oldStringIndexesMap, oldNameResolver)") - p.println("public fun newGetIndexOfString(index: Int): Int = getIndexOfString(index, newStringIndexesMap, newNameResolver)") + p.println("fun oldGetIndexOfString(index: Int): Int = getIndexOfString(index, oldStringIndexesMap, oldNameResolver)") + p.println("fun newGetIndexOfString(index: Int): Int = getIndexOfString(index, newStringIndexesMap, newNameResolver)") p.println() - p.println("public fun getIndexOfString(index: Int, map: MutableMap, nameResolver: NameResolver): Int {") + p.println("fun getIndexOfString(index: Int, map: MutableMap, nameResolver: NameResolver): Int {") p.println(" map[index]?.let { return it }") p.println() p.println(" val result = strings.intern(nameResolver.getString(index))") @@ -139,11 +139,11 @@ class GenerateProtoBufCompare { p.println("}") p.println() - p.println("public fun oldGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, oldClassIdIndexesMap, oldNameResolver)") - p.println("public fun newGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, newClassIdIndexesMap, newNameResolver)") + p.println("fun oldGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, oldClassIdIndexesMap, oldNameResolver)") + p.println("fun newGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, newClassIdIndexesMap, newNameResolver)") p.println() - p.println("public fun getIndexOfClassId(index: Int, map: MutableMap, nameResolver: NameResolver): Int {") + p.println("fun getIndexOfClassId(index: Int, map: MutableMap, nameResolver: NameResolver): Int {") p.println(" map[index]?.let { return it }") p.println() p.println(" val result = classIds.intern(nameResolver.getClassId(index))") @@ -170,7 +170,7 @@ class GenerateProtoBufCompare { val extFields = extentionsMap[descriptor]?.filter { !it.isSkip } ?: emptyList() p.println() - p.println("public fun $typeName.$HASH_CODE_NAME(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {") + p.println("fun $typeName.$HASH_CODE_NAME(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {") p.pushIndent() p.println("var $HASH_CODE_NAME = 1") @@ -237,12 +237,12 @@ class GenerateProtoBufCompare { val extFields = extentionsMap[descriptor]?.filter { !it.isSkip } ?: emptyList() val allFields = fields + extFields - p.println("public enum class ${className}Kind {") + p.println("enum class ${className}Kind {") p.println(allFields.joinToString(",\n ") { " " + it.enumName }) p.println("}") p.println() - p.println("public fun difference(old: $typeName, new: $typeName): EnumSet<${className}Kind> {") + p.println("fun difference(old: $typeName, new: $typeName): EnumSet<${className}Kind> {") p.pushIndent() p.println("val $RESULT_NAME = EnumSet.noneOf(${className}Kind::class.java)")