From b3f683b5bea38aae1be4cf4cc6e9216b44f5523c Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 30 Sep 2024 17:07:34 +0200 Subject: [PATCH] cleanup GitOrigin-RevId: 35c397e5300b141796c694343f804ff1e3b6455a --- .../com/intellij/openapi/fileTypes/impl/FileTypeAssocTable.java | 2 +- .../src/schemeManager/SchemeManagerFactoryImpl.kt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/jps/model-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeAssocTable.java b/jps/model-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeAssocTable.java index a3421f6d5874..5a524046f618 100644 --- a/jps/model-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeAssocTable.java +++ b/jps/model-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeAssocTable.java @@ -106,7 +106,7 @@ public final class FileTypeAssocTable { .replace("?", "\uFFFE") .replace("*", "\uFFFF")); - Collections.sort(myMatchingMappings, mostSpecificPatternFirstComparator); + myMatchingMappings.sort(mostSpecificPatternFirstComparator); return Pair.getSecond(previousAssociation); } diff --git a/platform/configuration-store-impl/src/schemeManager/SchemeManagerFactoryImpl.kt b/platform/configuration-store-impl/src/schemeManager/SchemeManagerFactoryImpl.kt index 3b6d81ce7c71..4546a6e6ef4c 100644 --- a/platform/configuration-store-impl/src/schemeManager/SchemeManagerFactoryImpl.kt +++ b/platform/configuration-store-impl/src/schemeManager/SchemeManagerFactoryImpl.kt @@ -3,8 +3,6 @@ package com.intellij.configurationStore.schemeManager import com.intellij.configurationStore.* import com.intellij.openapi.application.ApplicationManager -import com.intellij.openapi.application.EDT -import com.intellij.openapi.application.writeIntentReadAction import com.intellij.openapi.components.ComponentManager import com.intellij.openapi.components.RoamingType import com.intellij.openapi.components.SettingsCategory