From ee51b60eca8a2c69d36b7af12ed66da833d75401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9E=D1=80=D0=BB=D0=BE?= =?UTF-8?q?=D0=B2?= Date: Thu, 19 Feb 2026 09:56:12 +0300 Subject: [PATCH] ASPR-3099 Add ability to import from IDEA in standard Jetbrains import wizard --- .../startup/importSettings/jb/JbImportServiceImpl.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt index 272624d0a92c..8dff16da903c 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt @@ -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