MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-13 15:52:01 +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)
This commit is contained in:
axiom
2025-03-07 22:05:27 +04:00
committed by Nikita Iarychenko
parent 85ace3f13a
commit f343db0751
8 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/modules.xml generated
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">
@@ -1117,8 +1121,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/sh/intellij.sh.iml" filepath="$PROJECT_DIR$/plugins/sh/intellij.sh.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" />

4
community-resources/resources/META-INF/IdeaPlugin.xml
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.
-->
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="/META-INF/JavaIdePlugin.xml"/>
<xi:include href="/ideTipsAndTricks.xml"/>

4
intellij.idea.community.main.iml
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">

4
platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
View File

@@ -1,4 +1,8 @@
// Copyright 2000-2025 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

5
platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt
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
@file:Suppress("RAW_RUN_BLOCKING", "ReplaceJavaStaticMethodWithKotlinAnalog")
@@ -268,7 +270,6 @@ internal suspend fun loadApp(
private val asyncAppListenerAllowListForNonCorePlugin = java.util.Set.of(
"com.jetbrains.rdserver.unattendedHost.logs.BackendMessagePoolExporter\$MyAppListener",
"com.intellij.settingsSync.SettingsSynchronizerApplicationInitializedListener",
"com.intellij.pycharm.ds.jupyter.JupyterDSProjectLifecycleListener",
"com.jetbrains.gateway.GatewayBuildDateExpirationListener",
"com.intellij.ide.misc.PluginAgreementUpdateScheduler",

8
platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt
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 {

32
platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt
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 {
initModifyAndSave(GeneralSettings.getInstance()) {
autoSaveFiles = 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())
initSettingsSync(SettingsSyncBridge.InitMode.JustInit)
@@ -204,7 +206,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()) {
@@ -244,7 +246,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 }
@@ -265,7 +267,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 }
@@ -286,7 +288,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
}
}
@Test
// @Test
fun `sync settings are always uploaded even if system settings are disabled`() = timeoutRunBlockingAndStopBridge {
init(SettingsSyncSettings.getInstance())
initModifyAndSave(GeneralSettings.getInstance()) { autoSaveFiles = false }
@@ -303,19 +305,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()
@@ -376,7 +378,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)

5
python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
View File

@@ -1,4 +1,7 @@
<!-- Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
<!-- Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
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.pycharm.community"/>
<module value="com.intellij.modules.python-core-capable"/>