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-150222 Make function 'loadDescriptorsFromCustomPluginDir' suspending and move 'runBlocking' invocation

Browse Source 
GitOrigin-RevId: c0ad4ad027b985d2a69bfdec0fc7d72a382a8c24
This commit is contained in:
Vera Petrenkova
2024-06-21 09:43:45 +00:00
committed by intellij-monorepo-bot
parent 774c6c6d42
commit 1d3391978a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/PluginDescriptorLoader.kt
+2 -2
View File
@@ -1129,14 +1129,14 @@ fun loadDescriptorsFromOtherIde(
}
}
fun loadDescriptorsFromCustomPluginDir(customPluginDir: Path, ignoreCompatibility: Boolean = false) : PluginLoadingResult{
suspend fun loadDescriptorsFromCustomPluginDir(customPluginDir: Path, ignoreCompatibility: Boolean = false) : PluginLoadingResult{
return DescriptorListLoadingContext(
isMissingIncludeIgnored = true,
isMissingSubDescriptorIgnored = true
).use { context ->
val result = PluginLoadingResult()
result.addAll(
descriptors = toSequence(runBlocking {
descriptors = toSequence( coroutineScope {
loadDescriptorsFromDir(
dir = customPluginDir,
context = context,
platform/platform-impl/src/com/intellij/openapi/application/migrations/Localization242.kt
+5 -2
View File
@@ -1,17 +1,20 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.application.migrations
import com.intellij.ide.plugins.loadDescriptorsFromCustomPluginDir
import com.intellij.l10n.LocalizationUtil
import com.intellij.openapi.util.registry.EarlyAccessRegistryManager
import com.intellij.openapi.util.text.StringUtil
import kotlinx.coroutines.runBlocking
import java.nio.file.Path
internal fun enableL10nIfPluginInstalled(previousVersion: String?, oldPluginsDir: Path) {
if (previousVersion == null || StringUtil.compareVersionNumbers(previousVersion, "2024.2") != -1) return
val loadedDescriptors = loadDescriptorsFromCustomPluginDir(oldPluginsDir, true)
@Suppress("SSBasedInspection")
val loadedDescriptors = runBlocking { loadDescriptorsFromCustomPluginDir (oldPluginsDir, true) }
val bundledL10nPluginsIds = LocalizationUtil.l10nPluginIdToLanguageTag.keys
loadedDescriptors.enabledPluginsById.keys