From 49e838781c191a2a5128fc8f6c6ffa093f0757bb Mon Sep 17 00:00:00 2001
From: Victor Petukhov <victor.petukhov@jetbrains.com>
Date: Sat, 3 Apr 2021 09:53:40 +0300
Subject: [PATCH] Clean-up JavaModuleInfo.kt

---
 .../resolve/jvm/modules/JavaModuleInfo.kt     | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
index d93bcb1da2e..e25b5a47a0f 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
@@ -29,33 +29,30 @@ import org.jetbrains.org.objectweb.asm.Opcodes.ACC_TRANSITIVE
 import java.io.IOException
 
 class JavaModuleInfo(
-        val moduleName: String,
-        val requires: List<Requires>,
-        val exports: List<Exports>
+    val moduleName: String,
+    val requires: List<Requires>,
+    val exports: List<Exports>
 ) {
     data class Requires(val moduleName: String, val isTransitive: Boolean)
 
     data class Exports(val packageFqName: FqName, val toModules: List<String>)
 
-    override fun toString(): String =
-            "Module $moduleName (${requires.size} requires, ${exports.size} exports)"
+    override fun toString() = "Module $moduleName (${requires.size} requires, ${exports.size} exports)"
 
     companion object {
-        fun create(psiJavaModule: PsiJavaModule): JavaModuleInfo {
-            return JavaModuleInfo(
-                    psiJavaModule.name,
-                    psiJavaModule.requires.mapNotNull { statement ->
-                        statement.moduleName?.let { moduleName ->
-                            JavaModuleInfo.Requires(moduleName, statement.hasModifierProperty(PsiModifier.TRANSITIVE))
-                        }
-                    },
-                    psiJavaModule.exports.mapNotNull { statement ->
-                        statement.packageName?.let { packageName ->
-                            JavaModuleInfo.Exports(FqName(packageName), statement.moduleNames)
-                        }
-                    }
-            )
-        }
+        fun create(psiJavaModule: PsiJavaModule) = JavaModuleInfo(
+            psiJavaModule.name,
+            psiJavaModule.requires.mapNotNull { statement ->
+                statement.moduleName?.let { moduleName ->
+                    Requires(moduleName, statement.hasModifierProperty(PsiModifier.TRANSITIVE))
+                }
+            },
+            psiJavaModule.exports.mapNotNull { statement ->
+                statement.packageName?.let { packageName ->
+                    Exports(FqName(packageName), statement.moduleNames)
+                }
+            }
+        )
 
         fun read(file: VirtualFile): JavaModuleInfo? {
             val contents = try { file.contentsToByteArray() } catch (e: IOException) { return null }