From 456ff6acfe5483827281121bcd2507fbe16151d3 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 27 Oct 2025 08:55:23 +0100 Subject: [PATCH] IJPL-36450 cleanup GitOrigin-RevId: b26de727c8c4f9d5f839777b7382066c9e220890 --- .../intellij/build/JarPackagerDependencyHelper.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/JarPackagerDependencyHelper.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/JarPackagerDependencyHelper.kt index 0cd9bf553bc4..9a9a98fdc794 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/JarPackagerDependencyHelper.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/JarPackagerDependencyHelper.kt @@ -5,10 +5,17 @@ package org.jetbrains.intellij.build import com.intellij.util.xml.dom.XmlElement import com.intellij.util.xml.dom.readXmlAsModel -import org.jetbrains.intellij.build.impl.* +import org.jetbrains.intellij.build.impl.ModuleItem +import org.jetbrains.intellij.build.impl.ModuleOutputPatcher +import org.jetbrains.intellij.build.impl.PluginLayout +import org.jetbrains.intellij.build.impl.findFileInModuleSources import org.jetbrains.jps.model.java.JpsJavaClasspathKind import org.jetbrains.jps.model.java.JpsJavaExtensionService -import org.jetbrains.jps.model.module.* +import org.jetbrains.jps.model.module.JpsDependencyElement +import org.jetbrains.jps.model.module.JpsLibraryDependency +import org.jetbrains.jps.model.module.JpsModule +import org.jetbrains.jps.model.module.JpsModuleDependency +import org.jetbrains.jps.model.module.JpsModuleReference import java.io.StringReader import java.util.concurrent.ConcurrentHashMap @@ -66,9 +73,9 @@ internal class JarPackagerDependencyHelper(private val context: CompilationConte suspend fun getPluginXmlContent(pluginModule: JpsModule): String { val path = "META-INF/plugin.xml" - var pluginXmlContent = context.readFileContentFromModuleOutput(pluginModule, path, forTests = false) + var pluginXmlContent = context.readFileContentFromModuleOutput(module = pluginModule, relativePath = path, forTests = false) if (useTestSourceEnabled && pluginXmlContent == null) { - pluginXmlContent = context.readFileContentFromModuleOutput(pluginModule, path, forTests = true) + pluginXmlContent = context.readFileContentFromModuleOutput(module = pluginModule, relativePath = path, forTests = true) } return pluginXmlContent?.let { String(it, Charsets.UTF_8) } ?: throw IllegalStateException("$path not found in ${pluginModule.name} module output")