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

OPENIDE remove backup-and-sync plugin

Browse Source 
(cherry picked from commit 675a1b5828c4b2570c386b469a440d5512713d02)

(cherry picked from commit a114659a11)

(cherry picked from commit f343db0751)
(cherry picked from commit 12147c0161)
This commit is contained in:
axiom
2026-03-12 12:40:29 +04:00
committed by Nikita Iarychenko
parent ddec07ee2c
commit 932fd1c83d
7 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+4 -3
View File
@@ -1,3 +1,7 @@
<!--
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.
-->
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
@@ -1533,9 +1537,6 @@
<module fileurl="file://$PROJECT_DIR$/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml" filepath="$PROJECT_DIR$/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" filepath="$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" filepath="$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/settings-sync/settingsSync.performanceTesting/intellij.settingsSync.performanceTesting.iml" filepath="$PROJECT_DIR$/plugins/settings-sync/settingsSync.performanceTesting/intellij.settingsSync.performanceTesting.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/sh/backend/intellij.sh.backend.iml" filepath="$PROJECT_DIR$/plugins/sh/backend/intellij.sh.backend.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.tests.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.tests.iml" />
community-resources/resources/META-INF/IdeaPlugin.xml
+4
View File
@@ -1,6 +1,10 @@
<!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
<!-- To regenerate, run 'Generate Product Layouts' or directly CommunityModuleSets.main() -->
<!-- Source: org.jetbrains.intellij.build.IdeaCommunityProperties.getProductContentDescriptor() -->
<!--
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.
-->
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
<module value="com.intellij.modules.all"/>
<module value="com.intellij.modules.idea"/>
intellij.idea.community.main.iml
+4
View File
@@ -1,3 +1,7 @@
<!--
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.
-->
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
+4
View File
@@ -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
platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt
+3 -2
View File
@@ -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",
platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt
+5 -3
View File
@@ -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 {
platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt
+17 -15
View File
@@ -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)