jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-16 08:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

KT-10974 - small fixes

Browse Source
This commit is contained in:
gcx11
2020-04-25 19:14:07 +02:00
committed by Roman Golyshev
parent 8849a66c00
commit a2dc2fe5bb
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinPackageEntry.kt
View File

@@ -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

5
idea/src/org/jetbrains/kotlin/idea/formatter/BaseKotlinImportLayoutPanel.kt
View File

@@ -12,7 +12,6 @@ import com.intellij.openapi.application.ApplicationBundle
import com.intellij.openapi.wm.IdeFocusManager
import com.intellij.ui.*
import com.intellij.ui.components.JBCheckBox
import com.intellij.ui.layout.selected
import com.intellij.ui.table.JBTable
import com.intellij.util.IconUtil
import com.intellij.util.ui.JBUI
@@ -292,7 +291,7 @@ fun createTableForPackageEntries(packageTable: KotlinPackageEntryTable): JBTable
override fun getColumnClass(columnIndex: Int): Class<*> {
return when (columnIndex) {
0 -> String::class.java
1 -> Boolean::class.java
1 -> Boolean::class.javaObjectType
else -> throw IllegalArgumentException(columnIndex.toString())
}
}
@@ -302,7 +301,7 @@ fun createTableForPackageEntries(packageTable: KotlinPackageEntryTable): JBTable
val newEntry = when (columnIndex) {
0 -> KotlinPackageEntry((value as String).trim(), entry.withSubpackages)
1 -> KotlinPackageEntry(entry.packageName, (value as Boolean))
1 -> KotlinPackageEntry(entry.packageName, value.toString().toBoolean())
else -> throw IllegalArgumentException(columnIndex.toString())
}