mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-03-22 06:50:54 +07:00
ASPR-3099 Add ability to import from IDEA in standard Jetbrains import wizard
(cherry picked from commitee51b60eca) (cherry picked from commitcf67093eac)
This commit is contained in:
committed by
Nikita Iarychenko
parent
dfcaf8b503
commit
78e0d6ad29
@@ -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
|
||||
@@ -307,7 +310,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) {
|
||||
@@ -371,7 +375,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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user