diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginLoadingResult.kt b/platform/core-impl/src/com/intellij/ide/plugins/PluginLoadingResult.kt index 02c61d3525e7..ffc06d262431 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginLoadingResult.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginLoadingResult.kt @@ -1,5 +1,4 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -@file:Suppress("ReplaceGetOrSet", "ReplacePutWithAssignment") package com.intellij.ide.plugins import com.intellij.core.CoreBundle @@ -45,17 +44,17 @@ class PluginLoadingResult { private fun addIncompletePlugin(plugin: PluginMainDescriptor, error: PluginNonLoadReason?) { // do not report if some compatible plugin were already added - // no race condition here: plugins from classpath are loaded before and not in parallel to loading from plugin dir + // no race condition here: plugins from classpath are loaded before and not in parallel to loading from the plugin dir if (idMap.containsKey(plugin.pluginId)) { return } val existingIncompletePlugin = incompletePlugins.putIfAbsent(plugin.pluginId, plugin) if (existingIncompletePlugin != null && VersionComparatorUtil.compare(plugin.version, existingIncompletePlugin.version) > 0) { - incompletePlugins.put(plugin.pluginId, plugin) + incompletePlugins[plugin.pluginId] = plugin if (error != null) { // force put - pluginErrors.put(plugin.pluginId, error) + pluginErrors[plugin.pluginId] = error } } else if (error != null) { @@ -92,13 +91,13 @@ class PluginLoadingResult { return } - // remove any error that occurred for plugin with the same `id` + // remove any error that occurred for a plugin with the same `id` val pluginId = descriptor.pluginId pluginErrors.remove(pluginId) incompletePlugins.remove(pluginId) val prevDescriptor = enabledPluginsById.put(pluginId, descriptor) if (prevDescriptor == null) { - idMap.put(pluginId, descriptor) + idMap[pluginId] = descriptor for (pluginAlias in descriptor.pluginAliases) { checkAndAdd(descriptor, pluginAlias) } @@ -112,11 +111,11 @@ class PluginLoadingResult { if (PluginManagerCore.checkBuildNumberCompatibility(descriptor, initContext.productBuildNumber) == null && (overrideUseIfCompatible || VersionComparatorUtil.compare(descriptor.version, prevDescriptor.version) > 0)) { PluginManagerCore.logger.info("$descriptor overrides $prevDescriptor") - idMap.put(pluginId, descriptor) + idMap[pluginId] = descriptor return } else { - enabledPluginsById.put(pluginId, prevDescriptor) + enabledPluginsById[pluginId] = prevDescriptor return } } @@ -188,6 +187,6 @@ class PluginLoadingResult { val list = ArrayList(2) list.add(existingDescriptor) list.add(descriptor) - duplicateModuleMap!!.put(id, list) + duplicateModuleMap!![id] = list } } \ No newline at end of file