mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[plugins] refactor PluginSetBuilder: rename method for clarity
GitOrigin-RevId: d055c92cbd243c21665ebe49706af045a8eca280
This commit is contained in:
committed by
intellij-monorepo-bot
parent
238b4927fb
commit
e28d143c65
@@ -109,7 +109,7 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set<PluginMainDescriptor>)
|
||||
val usedPackagePrefixes = HashMap<String, IdeaPluginDescriptorImpl>()
|
||||
val isDisabledDueToPackagePrefixConflict = HashMap<PluginModuleId, IdeaPluginDescriptorImpl>()
|
||||
|
||||
fun registerLoadingError(plugin: IdeaPluginDescriptorImpl, disabledModule: ContentModuleDescriptor) {
|
||||
fun registerDependencyIsNotInstalledError(plugin: IdeaPluginDescriptorImpl, disabledModule: ContentModuleDescriptor) {
|
||||
loadingErrors.add(PluginDependencyIsNotInstalled(
|
||||
plugin = plugin,
|
||||
dependencyNameOrId = (disabledModuleToProblematicPlugin.get(disabledModule.moduleId)
|
||||
@@ -201,7 +201,7 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set<PluginMainDescriptor>)
|
||||
val alreadyRegistered = isDisabledDueToPackagePrefixConflict[contentModule.moduleId]!!
|
||||
loadingErrors.add(PluginPackagePrefixConflict(module, contentModule, alreadyRegistered))
|
||||
} else {
|
||||
registerLoadingError(module, contentModule)
|
||||
registerDependencyIsNotInstalledError(module, contentModule)
|
||||
}
|
||||
markRequiredModulesAsDisabled(module)
|
||||
continue@m
|
||||
@@ -238,7 +238,7 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set<PluginMainDescriptor>)
|
||||
for (moduleItem in corePlugin.contentModules) {
|
||||
if (moduleItem.moduleLoadingRule.required && !enabledModuleV2Ids.containsKey(moduleItem.moduleId)) {
|
||||
moduleItem.isMarkedForLoading = false
|
||||
registerLoadingError(corePlugin, moduleItem)
|
||||
registerDependencyIsNotInstalledError(corePlugin, moduleItem)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user