From 8fc94ddb8cb3dede1d3772ae105d819a7fe56b2a Mon Sep 17 00:00:00 2001
From: Igor Yakovlev <igor.yakovlev@jetbrains.com>
Date: Fri, 4 Sep 2020 14:17:02 +0300
Subject: [PATCH] [UCL] Minor fixes

---
 .../kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt | 4 +---
 .../org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
index 29ec1bab149..9e616eb4490 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
@@ -11,7 +11,6 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Comparing
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.TextRange
-import com.intellij.openapi.util.registry.Registry
 import com.intellij.psi.*
 import com.intellij.psi.impl.InheritanceImplUtil
 import com.intellij.psi.impl.java.stubs.PsiJavaFileStub
@@ -55,7 +54,6 @@ import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import java.util.*
 import javax.swing.Icon
-import kotlin.jvm.Throws
 
 private class KtLightClassModifierList(containingClass: KtLightClassForSourceDeclaration, computeModifiers: () -> Set<String>) :
     KtLightModifierList<KtLightClassForSourceDeclaration>(containingClass) {
@@ -360,7 +358,7 @@ abstract class KtLightClassForSourceDeclaration(
                 LightClassGenerationSupport.getInstance(classOrObject.project).run {
                     if (useUltraLightClasses) {
                         return createUltraLightClass(classOrObject)
-                            ?: error { "Unable to create UL class for ${classOrObject::javaClass.name}" }
+                            ?: error { "Unable to create UL class for ${classOrObject.javaClass.name}" }
                     }
                 }
             }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
index 5de12f511b4..ec94f8b6faf 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
@@ -296,7 +296,7 @@ open class KtLightNullabilityAnnotation<D : KtLightElement<*, PsiModifierListOwn
         // all data-class generated members are not-null
         if (annotatedElement is KtClass && annotatedElement.isData()) return NotNull::class.java.name
 
-        // objects and companion objects are not null but ctor that does not annotated
+        // objects and companion objects have NotNull annotation (if annotated element is implicit ctor then skip annotation)
         if (annotatedElement is KtObjectDeclaration) {
             if ((parent.parent as? PsiMethod)?.isConstructor == true) return null
             return NotNull::class.java.name