diff --git a/platform/platform-impl/src/com/intellij/ide/minimap/settings/MinimapConfigurable.kt b/platform/platform-impl/src/com/intellij/ide/minimap/settings/MinimapConfigurable.kt index cd84de2d90cb..6ef33035d075 100644 --- a/platform/platform-impl/src/com/intellij/ide/minimap/settings/MinimapConfigurable.kt +++ b/platform/platform-impl/src/com/intellij/ide/minimap/settings/MinimapConfigurable.kt @@ -18,7 +18,6 @@ import javax.swing.DefaultListCellRenderer import javax.swing.JList import javax.swing.JPanel - class MinimapConfigurable : BoundConfigurable(MiniMessagesBundle.message("settings.name")) { companion object { @@ -59,6 +58,7 @@ class MinimapConfigurable : BoundConfigurable(MiniMessagesBundle.message("settin row(MiniMessagesBundle.message("settings.file.types")) { val textFileTypes = (FileTypeManager.getInstance() as FileTypeManagerImpl).registeredFileTypes .filter { !it.isBinary && it.defaultExtension.isNotBlank() }.distinctBy { it.defaultExtension } + .sortedBy { it.defaultExtension.lowercase() } .sortedBy { if (fileTypes.contains(it.defaultExtension)) 0 else 1 } fileTypeComboBox = comboBox(textFileTypes, FileTypeListCellRenderer()) @@ -110,12 +110,15 @@ class MinimapConfigurable : BoundConfigurable(MiniMessagesBundle.message("settin } private inner class FileTypeListCellRenderer : DefaultListCellRenderer() { - private val container = JPanel(null).apply { - layout = BoxLayout(this, BoxLayout.X_AXIS) - } + private val container = JPanel(null) private val checkBox = JBCheckBox() init { + isOpaque = false + container.isOpaque = false + checkBox.isOpaque = false + + container.layout = BoxLayout(container, BoxLayout.X_AXIS) container.add(checkBox) container.add(this) } diff --git a/platform/platform-impl/src/com/intellij/ide/minimap/settings/MinimapSettings.kt b/platform/platform-impl/src/com/intellij/ide/minimap/settings/MinimapSettings.kt index 72aa760d24e8..83aa3d4074eb 100644 --- a/platform/platform-impl/src/com/intellij/ide/minimap/settings/MinimapSettings.kt +++ b/platform/platform-impl/src/com/intellij/ide/minimap/settings/MinimapSettings.kt @@ -6,7 +6,6 @@ import com.intellij.openapi.components.PersistentStateComponent import com.intellij.openapi.components.State import com.intellij.openapi.components.Storage import com.intellij.openapi.components.service -import com.intellij.util.xmlb.XmlSerializerUtil @State(name = "Minimap", storages = [Storage(value = "Minimap.xml")]) class MinimapSettings : PersistentStateComponent { @@ -30,11 +29,6 @@ class MinimapSettings : PersistentStateComponent { } override fun loadState(state: MinimapSettingsState) { - try { - XmlSerializerUtil.copyBean(state, this.state) - } - catch (e: Exception) { - // - } + this.state = state.copy() } } \ No newline at end of file