diff --git a/.idea/modules.xml b/.idea/modules.xml index 0b773228e511..0d0e0048dba7 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -1,3 +1,7 @@ + @@ -1533,9 +1537,6 @@ - - - diff --git a/community-resources/resources/META-INF/IdeaPlugin.xml b/community-resources/resources/META-INF/IdeaPlugin.xml index d660605beb18..82b7f27740cb 100644 --- a/community-resources/resources/META-INF/IdeaPlugin.xml +++ b/community-resources/resources/META-INF/IdeaPlugin.xml @@ -1,6 +1,10 @@ + diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml index bc67a726257d..1d6596a0fb49 100644 --- a/intellij.idea.community.main.iml +++ b/intellij.idea.community.main.iml @@ -1,3 +1,7 @@ + diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt index bee94727339d..da330ce52177 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt @@ -1,4 +1,8 @@ // Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Modified by Dmitrij Pochepko at 2025 as part of the OpenIDE project (https://openide.ru). +// Any modifications are available on the same license terms as the original source code. +@file:Suppress("ReplaceJavaStaticMethodWithKotlinAnalog") + package org.jetbrains.intellij.build import kotlinx.collections.immutable.PersistentList diff --git a/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt b/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt index 63f9fc1a6800..862cc640326e 100644 --- a/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt +++ b/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt @@ -1,4 +1,6 @@ -// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Modified by Dmitrij Pochepko at 2025 as part of the OpenIDE project (https://openide.ru). +// Any modifications are available on the same license terms as the original source code. @file:JvmName("ApplicationLoader") @file:Internal package com.intellij.platform.ide.bootstrap @@ -279,7 +281,6 @@ internal suspend fun loadApp( @Suppress("ReplaceJavaStaticMethodWithKotlinAnalog", "CanConvertToMultiDollarString") private val asyncAppListenerAllowListForNonCorePlugin = java.util.Set.of( "com.jetbrains.rdserver.unattendedHost.logs.BackendMessagePoolExporter\$MyAppListener", - "com.intellij.settingsSync.SettingsSynchronizerApplicationInitializedListener", "com.intellij.dataspell.ide.impl.jupyter.JupyterDSProjectLifecycleListener", "com.jetbrains.gateway.GatewayBuildDateExpirationListener", "com.intellij.ide.misc.PluginAgreementUpdateScheduler", diff --git a/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt index 892debbc6427..d6a12084534b 100644 --- a/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt @@ -1,3 +1,5 @@ +// Modified by Dmitrij Pochepko at 2025 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.settingsSync.core import com.intellij.ide.GeneralSettings @@ -22,7 +24,7 @@ internal class SettingsProviderTest : SettingsSyncRealIdeTestBase() { application.registerExtension(SettingsProvider.SETTINGS_PROVIDER_EP, settingsProvider, disposable) } - @Test +// @Test fun `settings from provider should be collected`() = timeoutRunBlockingAndStopBridge { val ideState = TestState("IDE value") settingsProvider.settings = ideState @@ -47,7 +49,7 @@ internal class SettingsProviderTest : SettingsSyncRealIdeTestBase() { } } - @Test +// @Test fun `settings from provider changed on another client should be applied`() = timeoutRunBlockingAndStopBridge { val state = TestState("Server value") remoteCommunicator.prepareFileOnServer(settingsSnapshot { @@ -63,7 +65,7 @@ internal class SettingsProviderTest : SettingsSyncRealIdeTestBase() { assertEquals("Server value", settingsProvider.settings!!.property, "Settings from server were not applied") } - @Test +// @Test fun `test merge settings provider settings`() = timeoutRunBlockingAndStopBridge { val serverState = TestState(property = "Server value") remoteCommunicator.prepareFileOnServer(settingsSnapshot { diff --git a/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt index 97638924f6d1..7df792950225 100644 --- a/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt @@ -1,3 +1,5 @@ +// Modified by Dmitrij Pochepko at 2025 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.settingsSync.core import com.intellij.configurationStore.getPerOsSettingsStorageFolderName @@ -27,7 +29,7 @@ import kotlin.time.Duration.Companion.seconds internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { - @Test +// @Test fun `settings are pushed`() = timeoutRunBlockingAndStopBridge { init(SettingsSyncSettings.getInstance()) SettingsSyncSettings.getInstance().migrationFromOldStorageChecked = true @@ -50,7 +52,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { } } - @Test +// @Test fun `scheme changes are logged`() = timeoutRunBlockingAndStopBridge { initSettingsSync(SettingsSyncBridge.InitMode.JustInit) @@ -96,7 +98,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { return keymap } - @Test + //@Test fun `quickly modified settings are pushed together`() = timeoutRunBlockingAndStopBridge { initSettingsSync(SettingsSyncBridge.InitMode.JustInit) @@ -123,7 +125,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { } } - @Test +// @Test fun `existing settings are copied on initialization`() = timeoutRunBlockingAndStopBridge { initModifyAndSave(GeneralSettings.getInstance()) { autoSaveFiles = false @@ -151,7 +153,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { } } - @Test +// @Test fun `disabled categories should be ignored when copying settings on initialization`() = timeoutRunBlockingAndStopBridge { SettingsSyncSettings.getInstance().setCategoryEnabled(SettingsCategory.KEYMAP, false) SettingsSyncSettings.getInstance().setCategoryEnabled(SettingsCategory.SYSTEM, false) @@ -186,7 +188,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { } } - @Test +// @Test fun `settings from server are applied`() = timeoutRunBlockingAndStopBridge(5.seconds) { val generalSettings = init(GeneralSettings.getInstance()) SettingsSyncSettings.getInstance().setCategoryEnabled(SettingsCategory.PLUGINS, false) @@ -207,7 +209,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { bridge.waitForAllExecuted() } - @Test +// @Test fun `enabling category should copy existing settings from that category`() = timeoutRunBlockingAndStopBridge { SettingsSyncSettings.getInstance().setCategoryEnabled(SettingsCategory.CODE, isEnabled = false) initModifyAndSave(GeneralSettings.getInstance()) { @@ -247,7 +249,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { } } - @Test +// @Test fun `not enabling cross IDE sync initially works as expected`() = timeoutRunBlockingAndStopBridge { init(SettingsSyncSettings.getInstance()) initModifyAndSave(GeneralSettings.getInstance()) { autoSaveFiles = false } @@ -268,7 +270,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { } } - @Test +// @Test fun `enabling cross IDE sync initially works as expected`() = timeoutRunBlockingAndStopBridge { init(SettingsSyncSettings.getInstance()) initModifyAndSave(GeneralSettings.getInstance()) { autoSaveFiles = false } @@ -289,7 +291,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { } } - @Test +// @Test fun `sync settings are always uploaded even if system settings are disabled`() = timeoutRunBlockingAndStopBridge { init(SettingsSyncSettings.getInstance()) SettingsSyncSettings.getInstance().setCategoryEnabled(SettingsCategory.SYSTEM, false) @@ -305,19 +307,19 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { } } - @Test +// @Test fun `exportable non-roamable settings should not be synced`() = timeoutRunBlockingAndStopBridge { testVariousComponentsShouldBeSyncedOrNot(ExportableNonRoamable(), expectedToBeSynced = false) } - @Test +// @Test fun `roamable settings should be synced`() = timeoutRunBlockingAndStopBridge { testVariousComponentsShouldBeSyncedOrNot(Roamable(), expectedToBeSynced = true) } - @Test - @TestFor(issues = ["IJPL-162877"]) +// @Test +// @TestFor(issues = ["IJPL-162877"]) fun `don't sync non-roamable files`() = timeoutRunBlockingAndStopBridge { val nonRoamable = ExportableNonRoamable() @@ -378,7 +380,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() { } } - @Test +// @Test fun `local and remote changes in different files are both applied`() = timeoutRunBlockingAndStopBridge { val generalSettings = init(GeneralSettings.getInstance()) initSettingsSync(SettingsSyncBridge.InitMode.JustInit)