From 23e3c13432237753edee60ae321d0c0c4d248bec Mon Sep 17 00:00:00 2001 From: Vera Petrenkova Date: Tue, 2 Jul 2024 08:37:26 +0200 Subject: [PATCH] IJPL-157080 Simplified the getLanguageTagFromDescriptor method in Localization242 GitOrigin-RevId: 6a7157db5b55f34be3822b3b3cd537a2fbb7366d --- .../application/migrations/Localization242.kt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/application/migrations/Localization242.kt b/platform/platform-impl/src/com/intellij/openapi/application/migrations/Localization242.kt index adfccf22795c..051d1d662151 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/migrations/Localization242.kt +++ b/platform/platform-impl/src/com/intellij/openapi/application/migrations/Localization242.kt @@ -47,19 +47,20 @@ internal fun enableL10nIfPluginInstalled(previousVersion: String?, oldPluginsDir * @param descriptor the descriptor of the plugin to be checked * @return `true` if the plugin is a localization plugin; `false` otherwise */ - private fun isLocalizationPlugin(descriptor: IdeaPluginDescriptor): Boolean { +private fun isLocalizationPlugin(descriptor: IdeaPluginDescriptor): Boolean { if (descriptor !is IdeaPluginDescriptorImpl) return false val extensionPoints = descriptor.epNameToExtensions val epName = "com.intellij.languageBundle" return extensionPoints.containsKey(epName) } - private fun getLanguageTagFromDescriptor(descriptor: IdeaPluginDescriptor): String? { - if (descriptor !is IdeaPluginDescriptorImpl) return null - val extensionPoints = descriptor.epNameToExtensions - val epName = "com.intellij.languageBundle" - if (extensionPoints.containsKey(epName)) { - return extensionPoints[epName]?.firstOrNull()?.element?.attributes?.get("locale") +private fun getLanguageTagFromDescriptor(descriptor: IdeaPluginDescriptor): String? { + return if (isLocalizationPlugin(descriptor)) { + val extensionPoints = (descriptor as IdeaPluginDescriptorImpl).epNameToExtensions + val epName = "com.intellij.languageBundle" + extensionPoints[epName]?.firstOrNull()?.element?.attributes?.get("locale") + } + else { + null } - return null } \ No newline at end of file