KT-10974 - small fixes

2020-04-25 19:14:07 +02:00
parent 8849a66c00
commit a2dc2fe5bb
2 changed files with 10 additions and 8 deletions
@@ -7,10 +7,12 @@ package org.jetbrains.kotlin.idea.core.formatter

 import org.jetbrains.kotlin.resolve.ImportPath

-data class KotlinPackageEntry(
-    val packageName: String,
+class KotlinPackageEntry(
+    packageName: String,
    val withSubpackages: Boolean
 ) {
+    val packageName = packageName.removeSuffix(".*")
+
    companion object {
        @JvmField
        val ALL_OTHER_IMPORTS_ENTRY = KotlinPackageEntry("<all other imports>", withSubpackages = true)
@@ -45,9 +47,10 @@ data class KotlinPackageEntry(
        return entry.packageName.count { it == '.' } < packageName.count { it == '.' }
    }

-    val isSpecial: Boolean get() {
-        return (this == ALL_OTHER_IMPORTS_ENTRY || this == ALL_OTHER_ALIAS_IMPORTS_ENTRY)
-    }
+    val isSpecial: Boolean
+        get() {
+            return (this == ALL_OTHER_IMPORTS_ENTRY || this == ALL_OTHER_ALIAS_IMPORTS_ENTRY)
+        }

    override fun toString(): String {
        return packageName