From e8b944bfe8758a0a48ba0c0c4062c4b0b22168c3 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Fri, 31 Jan 2025 11:42:27 +0100 Subject: [PATCH] [platform test] don't report an error if the descriptor for the main plugin module is extracted to a separate 'embedded' content module This is needed to properly split the YAML plugin into modules (IJPL-176102). GitOrigin-RevId: f8211c8792c8acf6f138d81b5c4bd7710b833e4e --- .../com/intellij/ide/plugins/PluginModelValidator.kt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt index de4a781ce067..4828613a8a87 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt +++ b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginModelValidator.kt @@ -608,14 +608,10 @@ class PluginModelValidator(sourceModules: List) { return } - if (pluginDescriptor == null) { - fileInfo.moduleDescriptorFile = moduleDescriptorFile - fileInfo.moduleDescriptor = moduleDescriptor - } - else { - fileInfo.pluginDescriptorFile = pluginDescriptorFile - fileInfo.pluginDescriptor = pluginDescriptor - } + fileInfo.moduleDescriptorFile = moduleDescriptorFile + fileInfo.moduleDescriptor = moduleDescriptor + fileInfo.pluginDescriptorFile = pluginDescriptorFile + fileInfo.pluginDescriptor = pluginDescriptor } }