From bd575c39dd2b6611c526a9ff54045648f87f2c40 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 27 Nov 2014 18:03:27 +0300
Subject: [PATCH] Fix calling toString() on ProtoContainer

---
 .../AbstractBinaryClassAnnotationAndConstantLoader.kt    | 4 ++--
 .../serialization/descriptors/ProtoContainer.kt          | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
index 77cc9860b5c..8f0777deb7e 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
@@ -92,7 +92,7 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C
     ): List<A> {
         val kotlinClass = findClassWithAnnotationsAndInitializers(container, proto, nameResolver, kind)
         if (kotlinClass == null) {
-            errorReporter.reportLoadingError("Kotlin class for loading member annotations is not found: $container", null)
+            errorReporter.reportLoadingError("Kotlin class for loading member annotations is not found: ${container.getFqName(nameResolver)}", null)
             return listOf()
         }
 
@@ -127,7 +127,7 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C
 
         val kotlinClass = findClassWithAnnotationsAndInitializers(container, proto, nameResolver, kind)
         if (kotlinClass == null) {
-            errorReporter.reportLoadingError("Kotlin class for loading property constant is not found: $container", null)
+            errorReporter.reportLoadingError("Kotlin class for loading property constant is not found: ${container.getFqName(nameResolver)}", null)
             return null
         }
 
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ProtoContainer.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ProtoContainer.kt
index 3da1f849e8b..1bdf6a94a59 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ProtoContainer.kt
+++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ProtoContainer.kt
@@ -18,9 +18,18 @@ package org.jetbrains.jet.descriptors.serialization.descriptors
 
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe
 
 public data class ProtoContainer(val classProto: ProtoBuf.Class?, val packageFqName: FqName?) {
     {
         assert(classProto != null || packageFqName != null)
+        assert(classProto == null || packageFqName == null)
+    }
+
+    fun getFqName(nameResolver: NameResolver): FqNameUnsafe {
+        if (packageFqName != null) return packageFqName.toUnsafe()
+
+        return nameResolver.getClassId(classProto!!.getFqName()).asSingleFqName()
     }
 }
\ No newline at end of file