MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Слияние ветки 'ASPR-3099' в '253'

Browse Source
This commit is contained in:
Nikita Iarychenko
2026-02-19 09:56:12 +03:00
committed by GitFlic
parent d714bb072b ee51b60eca
commit a5eed52e8e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt
View File

@@ -1,4 +1,7 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
//
// Modified by Artyom Orlov at 2026 as part of the OpenIDE project(https://openide.ru).
// Any modifications are available on the same license terms as the original source code.
package com.intellij.ide.startup.importSettings.jb
import com.intellij.configurationStore.getPerOsSettingsStorageFolderName
@@ -265,7 +268,8 @@ class JbImportServiceImpl(private val coroutineScope: CoroutineScope) : JbServic
override suspend fun warmUp() {
val parentDirs = listOf(
PathManager.getConfigDir().parent,
PathManager.getConfigDir().fileSystem.getPath(PathManager.getDefaultConfigPathFor("X")).parent
PathManager.getConfigDir().fileSystem.getPath(PathManager.getDefaultConfigPathFor("X")).parent,
PathManager.getConfigDir().fileSystem.getPath(PathManager.getDefaultConfigPathFor("X").replace("OpenIDE", "JetBrains")).parent
)
val context = PluginDescriptorLoadingContext(getBuildNumberForDefaultDescriptorVersion = { PluginManagerCore.buildNumber })
for (parentDir in parentDirs) {
@@ -331,7 +335,7 @@ class JbImportServiceImpl(private val coroutineScope: CoroutineScope) : JbServic
return null
}
val fullNameWithVersion = "$fullName $ideVersion"
val pluginsDir = Path.of(PathManager.getDefaultPluginPathFor(confDir.name))
val pluginsDir = Path.of(PathManager.getDefaultPluginPathFor(confDir.name).replace("OpenIDE", "JetBrains"))
val jbProductInfo = JbProductInfo(ideVersion, lastModified, confDir.name, fullNameWithVersion, ideName,
confDir, pluginsDir)
return jbProductInfo