MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-14 18:05:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-149476 fix 'com.intellij.openapi.application.ConfigImportHelperTest#skip bundled plugins'

Browse Source 
GitOrigin-RevId: 71b3ad7faf4803f0c010adcfd0b01717fca8fa56
This commit is contained in:
Vladimir Krivosheev
2024-05-13 20:42:50 +02:00
committed by intellij-monorepo-bot
parent 1ef047a4b5
commit a267b69dea
1 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
platform/core-impl/src/com/intellij/ide/plugins/PluginDescriptorLoader.kt
View File

@@ -571,59 +571,62 @@ internal fun CoroutineScope.loadPluginDescriptorsImpl(
result = result,
))
result.addAll(loadDescriptorsFromDir(dir = customPluginDir, context = context, isBundled = false, pool = zipFilePool))
bundledPluginDir?.let {
result.addAll(loadDescriptorsFromDir(dir = it, context = context, isBundled = true, pool = zipFilePool))
}
return result
}
val effectiveBundledPluginDir = bundledPluginDir ?: Paths.get(PathManager.getPreInstalledPluginsPath())
val data = try {
// use only if the format is supported (first byte it is a version)
Files.readAllBytes(effectiveBundledPluginDir.resolve("plugin-classpath.txt")).takeIf { it[0] == 2.toByte() }
}
catch (ignored: NoSuchFileException) {
null
}
if (data == null) {
result.addAll(loadCoreModules(
context = context,
platformPrefix = platformPrefix,
isUnitTestMode = false,
isInDevServerMode = AppMode.isDevServer(),
isRunningFromSources = isRunningFromSources,
classLoader = mainClassLoader,
pool = zipFilePool,
result = result,
))
result.addAll(loadDescriptorsFromDir(dir = customPluginDir, context = context, isBundled = false, pool = zipFilePool))
result.addAll(loadDescriptorsFromDir(dir = effectiveBundledPluginDir, context = context, isBundled = true, pool = zipFilePool))
}
else {
val effectiveBundledPluginDir = bundledPluginDir ?: Paths.get(PathManager.getPreInstalledPluginsPath())
val data = try {
// use only if the format is supported (first byte it is a version)
Files.readAllBytes(effectiveBundledPluginDir.resolve("plugin-classpath.txt")).takeIf { it[0] == 2.toByte() }
}
catch (ignored: NoSuchFileException) {
null
}
if (data == null) {
result.addAll(loadCoreModules(
val byteInput = ByteArrayInputStream(data, 2, data.size)
val input = DataInputStream(byteInput)
val descriptorSize = input.readInt()
val descriptorStart = data.size - byteInput.available()
input.skipBytes(descriptorSize)
result.add(async {
loadCoreProductPlugin(
path = PluginManagerCore.PLUGIN_XML_PATH,
context = context,
platformPrefix = platformPrefix,
isUnitTestMode = false,
isInDevServerMode = AppMode.isDevServer(),
isRunningFromSources = isRunningFromSources,
classLoader = mainClassLoader,
pool = zipFilePool,
result = result,
))
result.addAll(loadDescriptorsFromDir(dir = customPluginDir, context = context, isBundled = false, pool = zipFilePool))
result.addAll(loadDescriptorsFromDir(dir = effectiveBundledPluginDir, context = context, isBundled = true, pool = zipFilePool))
}
else {
val byteInput = ByteArrayInputStream(data, 2, data.size)
val input = DataInputStream(byteInput)
val descriptorSize = input.readInt()
val descriptorStart = data.size - byteInput.available()
input.skipBytes(descriptorSize)
result.add(async {
loadCoreProductPlugin(
path = PluginManagerCore.PLUGIN_XML_PATH,
context = context,
pathResolver = ClassPathXmlPathResolver(classLoader = mainClassLoader, isRunningFromSources = false),
useCoreClassLoader = platformPrefix.startsWith("CodeServer") || java.lang.Boolean.getBoolean("idea.force.use.core.classloader"),
reader = createXmlStreamReader(data, descriptorStart, descriptorSize),
)
})
result.addAll(loadDescriptorsFromDir(dir = customPluginDir, context = context, isBundled = false, pool = zipFilePool))
loadFromPluginClasspathDescriptor(
input = input,
jarOnly = data[1] == 1.toByte(),
context = context,
zipFilePool = zipFilePool,
bundledPluginDir = effectiveBundledPluginDir,
scope = this,
result = result,
pathResolver = ClassPathXmlPathResolver(classLoader = mainClassLoader, isRunningFromSources = false),
useCoreClassLoader = platformPrefix.startsWith("CodeServer") || java.lang.Boolean.getBoolean("idea.force.use.core.classloader"),
reader = createXmlStreamReader(data, descriptorStart, descriptorSize),
)
}
})
result.addAll(loadDescriptorsFromDir(dir = customPluginDir, context = context, isBundled = false, pool = zipFilePool))
loadFromPluginClasspathDescriptor(
input = input,
jarOnly = data[1] == 1.toByte(),
context = context,
zipFilePool = zipFilePool,
bundledPluginDir = effectiveBundledPluginDir,
scope = this,
result = result,
)
}
return result
}