MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +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

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

@@ -571,8 +571,12 @@ internal fun CoroutineScope.loadPluginDescriptorsImpl(
result = result, result = result,
)) ))
result.addAll(loadDescriptorsFromDir(dir = customPluginDir, context = context, isBundled = false, pool = zipFilePool)) result.addAll(loadDescriptorsFromDir(dir = customPluginDir, context = context, isBundled = false, pool = zipFilePool))
bundledPluginDir?.let {
result.addAll(loadDescriptorsFromDir(dir = it, context = context, isBundled = true, pool = zipFilePool))
} }
else { return result
}
val effectiveBundledPluginDir = bundledPluginDir ?: Paths.get(PathManager.getPreInstalledPluginsPath()) val effectiveBundledPluginDir = bundledPluginDir ?: Paths.get(PathManager.getPreInstalledPluginsPath())
val data = try { val data = try {
// use only if the format is supported (first byte it is a version) // use only if the format is supported (first byte it is a version)
@@ -624,7 +628,6 @@ internal fun CoroutineScope.loadPluginDescriptorsImpl(
result = result, result = result,
) )
} }
}
return result return result
} }