MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-866 readPluginId - use HashMapZipFile

Browse Source 
GitOrigin-RevId: 537d2ae70b36acd2f77bf7bb89150a38d7587bcb
This commit is contained in:
Vladimir Krivosheev
2024-03-25 10:17:56 +00:00
committed by intellij-monorepo-bot
parent 16414d49d5
commit 517a524566
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildHelper.kt
+4 -6
View File
@@ -4,6 +4,7 @@ package org.jetbrains.intellij.build.impl
import com.intellij.platform.diagnostic.telemetry.helpers.use
import com.intellij.platform.diagnostic.telemetry.helpers.useWithScope
import com.intellij.util.JavaModuleOptions
import com.intellij.util.lang.HashMapZipFile
import com.intellij.util.system.OS
import com.intellij.util.xml.dom.readXmlAsModel
import io.opentelemetry.api.trace.Span
@@ -19,7 +20,6 @@ import org.jetbrains.intellij.build.TraceManager.spanBuilder
import org.jetbrains.intellij.build.io.DEFAULT_TIMEOUT
import org.jetbrains.intellij.build.io.copyDir
import org.jetbrains.intellij.build.io.runJava
import java.nio.file.FileSystems
import java.nio.file.Files
import java.nio.file.NoSuchFileException
import java.nio.file.Path
@@ -142,8 +142,8 @@ private fun readPluginId(pluginJar: Path): String? {
}
try {
FileSystems.newFileSystem(pluginJar, null as ClassLoader?).use {
return readXmlAsModel(Files.newInputStream(it.getPath("META-INF/plugin.xml"))).getChild("id")?.content
HashMapZipFile.load(pluginJar).use { zip ->
return readXmlAsModel(zip.getInputStream("META-INF/plugin.xml") ?: return null).getChild("id")?.content
}
}
catch (ignore: NoSuchFileException) {
@@ -151,9 +151,7 @@ private fun readPluginId(pluginJar: Path): String? {
}
}
private fun disableCompatibleIgnoredPlugins(context: BuildContext,
configDir: Path,
explicitlyEnabledPlugins: Set<String?>) {
private fun disableCompatibleIgnoredPlugins(context: BuildContext, configDir: Path, explicitlyEnabledPlugins: Set<String?>) {
val toDisable = LinkedHashSet<String>()
for (moduleName in context.productProperties.productLayout.compatiblePluginsToIgnore) {
val pluginXml = context.findFileInModuleSources(moduleName, "META-INF/plugin.xml")!!