Minor: clean up and reformat

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt

@@ -178,8 +178,7 @@ open class KtLightClassForExplicitDeclaration(
     }
 
     private val _containingFile: PsiFile by lazy(LazyThreadSafetyMode.PUBLICATION) {
-        val virtualFile = classOrObject.containingFile.virtualFile
+        classOrObject.containingFile.virtualFile ?: error("No virtual file for " + classOrObject.text)
-        assert(virtualFile != null) { "No virtual file for " + classOrObject.text }
 
         object : FakeFileForLightClass(
                 classOrObject.getContainingKtFile(),
@@ -211,18 +210,18 @@ open class KtLightClassForExplicitDeclaration(
     override fun getNavigationElement(): PsiElement = classOrObject
 
     override fun isEquivalentTo(another: PsiElement?): Boolean {
-        return another is PsiClass && Comparing.equal(another.getQualifiedName(), qualifiedName)
+        return another is PsiClass && Comparing.equal(another.qualifiedName, qualifiedName)
     }
 
     override fun getElementIcon(flags: Int): Icon? {
-        throw UnsupportedOperationException("This should be done byt JetIconProvider")
+        throw UnsupportedOperationException("This should be done by JetIconProvider")
     }
 
-    override fun equals(o: Any?): Boolean {
+    override fun equals(other: Any?): Boolean {
-        if (this === o) return true
+        if (this === other) return true
-        if (o == null || javaClass != o.javaClass) return false
+        if (other == null || javaClass != other.javaClass) return false
 
-        val aClass = o as KtLightClassForExplicitDeclaration
+        val aClass = other as KtLightClassForExplicitDeclaration
 
         if (classFqName != aClass.classFqName) return false
 
@@ -260,7 +259,7 @@ open class KtLightClassForExplicitDeclaration(
     private val _modifierList : PsiModifierList by lazy(LazyThreadSafetyMode.PUBLICATION) {
         object : KtLightModifierListWithExplicitModifiers(this@KtLightClassForExplicitDeclaration, computeModifiers()) {
             override val delegate: PsiAnnotationOwner
-                get() = this@KtLightClassForExplicitDeclaration.getDelegate().modifierList!!
+                get() = this@KtLightClassForExplicitDeclaration.delegate.modifierList!!
         }
     }
 
@@ -307,7 +306,7 @@ open class KtLightClassForExplicitDeclaration(
 
     private fun isSealed(): Boolean = classOrObject.hasModifier(SEALED_KEYWORD)
 
-    override fun hasModifierProperty(@NonNls name: String): Boolean = getModifierList().hasModifierProperty(name)
+    override fun hasModifierProperty(@NonNls name: String): Boolean = modifierList.hasModifierProperty(name)
 
     override fun isDeprecated(): Boolean {
         val jetModifierList = classOrObject.modifierList ?: return false
@@ -435,7 +434,7 @@ open class KtLightClassForExplicitDeclaration(
             if (value == null) {
                 value = CachedValuesManager.getManager(classOrObject.project).createCachedValue(
                         LightClassDataProviderForClassOrObject(outermostClassOrObject), false)
-                value = outermostClassOrObject.putUserDataIfAbsent(JAVA_API_STUB, value)!!
+                value = outermostClassOrObject.putUserDataIfAbsent(JAVA_API_STUB, value)
             }
             return value
         }

idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt

@@ -16,16 +16,15 @@
 
 package org.jetbrains.kotlin.idea.search.ideaExtensions
 
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.QueryExecutorBase
 import com.intellij.psi.PsiClass
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.searches.DirectClassInheritorsSearch
 import com.intellij.util.Processor
 import org.jetbrains.kotlin.idea.decompiler.navigation.SourceNavigationHelper
-import org.jetbrains.kotlin.idea.stubindex.KotlinSuperClassIndex
 import org.jetbrains.kotlin.idea.search.fileScope
 import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
+import org.jetbrains.kotlin.idea.stubindex.KotlinSuperClassIndex
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 
 open class KotlinDirectInheritorsSearcher() : QueryExecutorBase<PsiClass, DirectClassInheritorsSearch.SearchParameters>(true) {
@@ -46,8 +45,9 @@ open class KotlinDirectInheritorsSearcher() : QueryExecutorBase<PsiClass, Direct
 
         runReadAction {
             val noLibrarySourceScope = KotlinSourceFilterScope.sourceAndClassFiles(scope, baseClass.project)
-            KotlinSuperClassIndex.getInstance().get(name, baseClass.project, noLibrarySourceScope).asSequence()
+            KotlinSuperClassIndex.getInstance()
-                    .mapNotNull { candidate -> SourceNavigationHelper.getOriginalPsiClassOrCreateLightClass(candidate)}
+                    .get(name, baseClass.project, noLibrarySourceScope).asSequence()
+                    .mapNotNull { candidate -> SourceNavigationHelper.getOriginalPsiClassOrCreateLightClass(candidate) }
                     .filter { candidate -> candidate.isInheritor(baseClass, false) }
                     .forEach { candidate -> consumer.process(candidate) }
         }