From 8d22eafe3fb48bd4598445919425acc671aea712 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Mon, 11 Jan 2016 16:33:20 +0300
Subject: [PATCH] Minor: prettify code

---
 .../kotlin/asJava/LightClassDataProvider.kt         | 13 +++----------
 .../resolve/IDELightClassGenerationSupport.kt       | 13 +++----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassDataProvider.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassDataProvider.kt
index 16679066986..9f9fe45025d 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassDataProvider.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassDataProvider.kt
@@ -31,7 +31,6 @@ import com.intellij.psi.impl.compiled.ClsFileImpl
 import com.intellij.psi.impl.java.stubs.PsiJavaFileStub
 import com.intellij.psi.impl.java.stubs.impl.PsiJavaFileStubImpl
 import com.intellij.psi.search.GlobalSearchScope
-import com.intellij.psi.stubs.PsiClassHolderFileStub
 import com.intellij.psi.stubs.StubElement
 import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.util.PsiModificationTracker
@@ -136,17 +135,11 @@ abstract class LightClassDataProvider<T : WithFileStubAndExtraDiagnostics>(
 
         val virtualFile = getRepresentativeVirtualFile(files)
         val fakeFile = object : ClsFileImpl(ClassFileViewProvider(manager, virtualFile)) {
-            override fun getStub(): PsiClassHolderFileStub<*> {
-                return javaFileStub
-            }
+            override fun getStub() = javaFileStub
 
-            override fun getPackageName(): String {
-                return packageFqName.asString()
-            }
+            override fun getPackageName() = packageFqName.asString()
 
-            override fun isPhysical(): Boolean {
-                return false
-            }
+            override fun isPhysical() = false
         }
 
         javaFileStub.psi = fakeFile
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
index 15a9ab4f741..8b9004b5f3f 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
@@ -26,7 +26,6 @@ import com.intellij.psi.PsiManager
 import com.intellij.psi.impl.compiled.ClsClassImpl
 import com.intellij.psi.impl.compiled.ClsFileImpl
 import com.intellij.psi.search.GlobalSearchScope
-import com.intellij.psi.stubs.PsiClassHolderFileStub
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.asJava.*
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
@@ -338,17 +337,11 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
                 return super.getNavigationElement()
             }
 
-            override fun getStub(): PsiClassHolderFileStub<*> {
-                return javaFileStub
-            }
+            override fun getStub() = javaFileStub
 
-            override fun getMirror(): PsiElement {
-                return mirrorFile
-            }
+            override fun getMirror() = mirrorFile
 
-            override fun isPhysical(): Boolean {
-                return false
-            }
+            override fun isPhysical() = false
         }
         javaFileStub.psi = fakeFile
         return fakeFile.classes.single() as ClsClassImpl