From 571fdbca048ce556fd607c0c730dd8e001cb7ab4 Mon Sep 17 00:00:00 2001 From: Sergey Pak Date: Wed, 15 Jan 2025 20:32:10 +0100 Subject: [PATCH] 1. make settingsSync a platform module 2. rename platform module to settingsSync.core and don't include jba module (cherry picked from commit b94ad2175dc954823f17bf1571548d4779945793) Signed-off-by: Sergey Pak GitOrigin-RevId: 08fc765db4cd295b5b9eebb9378ba992c341dce8 --- .idea/modules.xml | 6 +- .../resources/META-INF/IdeaPlugin.xml | 1 + intellij.idea.community.main.iml | 5 +- .../intellij.settingsSync.core.iml | 10 ++- .../settings-sync-core}/plugin-content.yaml | 0 .../resources/SettingsSyncIconMappings.json | 0 .../resources/icons/conflict.svg | 0 .../resources/icons/expui/conflict.svg | 0 .../resources/icons/expui/conflict_dark.svg | 0 .../resources/icons/expui/icon-robots.txt | 0 .../resources/icons/expui/localChanges.svg | 0 .../icons/expui/localChanges_dark.svg | 0 .../resources/icons/expui/remoteChanges.svg | 0 .../icons/expui/remoteChanges_dark.svg | 0 .../resources/icons/expui/statusDisabled.svg | 0 .../icons/expui/statusDisabled_dark.svg | 0 .../resources/icons/expui/statusEnabled.svg | 0 .../icons/expui/statusEnabled_dark.svg | 0 .../resources/icons/localChanges.svg | 0 .../resources/icons/remoteChanges.svg | 0 .../resources/icons/statusDisabled.svg | 0 .../resources/icons/statusDisabled_dark.svg | 0 .../resources/icons/statusEnabled.svg | 0 .../resources/icons/statusNotRun.svg | 0 .../resources/icons/statusNotRun_dark.svg | 0 .../resources/intellij.settingsSync.core.xml | 71 ++++++++----------- .../messages/SettingsSyncBundle.properties | 0 .../core}/AbstractServerCommunicator.kt | 2 +- .../intellij/settingsSync/core}/FileState.kt | 2 +- .../settingsSync/core}/GitSettingsLog.kt | 27 ++++--- .../core/InvalidVersionIdException.kt | 2 + .../core}/LocalHostNameProvider.kt | 2 +- .../settingsSync/core}/ManualPushAction.kt | 2 +- .../core}/SettingSyncNotifications.kt | 2 +- .../core}/SettingsChangeListener.kt | 2 +- .../settingsSync/core}/SettingsLog.kt | 2 +- .../settingsSync/core}/SettingsProvider.kt | 2 +- .../settingsSync/core}/SettingsSnapshot.kt | 4 +- .../core}/SettingsSnapshotZipSerializer.kt | 5 +- .../settingsSync/core}/SettingsSyncBridge.kt | 8 +-- .../settingsSync/core}/SettingsSyncBundle.kt | 2 +- .../settingsSync/core}/SettingsSyncEvents.kt | 11 +-- .../core}/SettingsSyncFiltering.kt | 4 +- .../core}/SettingsSyncIdeMediator.kt | 2 +- .../core}/SettingsSyncIdeMediatorImpl.kt | 34 ++++----- .../core}/SettingsSyncLocalSettings.kt | 2 +- .../settingsSync/core}/SettingsSyncMain.kt | 12 +--- .../core}/SettingsSyncMigration.kt | 2 +- .../core}/SettingsSyncPushResult.kt | 2 +- .../core}/SettingsSyncRemoteCommunicator.kt | 4 +- .../core}/SettingsSyncSettings.kt | 6 +- .../core}/SettingsSyncStatusTracker.kt | 4 +- .../core}/SettingsSyncUpdateChecker.kt | 6 +- .../core}/SettingsSynchronizer.kt | 10 ++- .../settingsSync/core}/ShareableSettings.kt | 2 +- .../core}/auth/SettingsSyncAuthService.kt | 4 +- .../communicator/RemoteCommunicatorHolder.kt | 8 ++- .../SettingsSyncCommunicatorProvider.kt | 6 +- .../core}/config/EnableSettingsSyncDialog.kt | 10 +-- .../core}/config/SettingsSyncConfigurable.kt | 25 ++++--- .../core}/config/SettingsSyncEnabler.kt | 6 +- .../config/SettingsSyncOldConfigurable.kt | 18 +++-- .../config/SettingsSyncOpenSettingsAction.kt | 2 +- .../core}/config/SettingsSyncPanelFactory.kt | 7 +- .../core}/config/SettingsSyncStatusAction.kt | 16 ++--- .../core}/config/SettingsSyncSubcategories.kt | 2 +- .../core}/config/SyncCategoryHolder.kt | 6 +- .../core}/config/SyncPluginsGroup.kt | 6 +- .../settingsSync/core}/config/SyncUiGroup.kt | 4 +- .../core}/git/SettingsHistoryLogUi.kt | 3 +- .../core}/git/SettingsHistoryLogUiFactory.kt | 2 +- .../core}/git/SettingsHistoryPanel.kt | 6 +- .../git/SettingsHistoryToolWindowFactory.kt | 4 +- .../core}/git/SettingsHistoryUiProperties.kt | 2 +- .../core}/git/SettingsSyncHistoryAction.kt | 7 +- .../core}/git/record/ChangeRecord.kt | 8 +-- .../core}/git/record/RecordService.kt | 2 +- .../renderers/SettingsHistoryCellRenderer.kt | 10 +-- .../SettingsHistoryEmptyCellRenderer.kt | 6 +- .../SettingsHistoryFileCellRenderer.kt | 8 +-- .../SettingsHistoryNodeCellRenderer.kt | 14 ++-- .../SettingsHistoryRestoreCellRenderer.kt | 12 ++-- .../SettingsHistorySubtitleRenderer.kt | 8 +-- .../SettingsHistoryTitleCellRenderer.kt | 6 +- .../core}/git/table/ExpandedRowFilter.kt | 2 +- .../core}/git/table/SettingsHistoryTable.kt | 17 +++-- .../git/table/SettingsHistoryTableModel.kt | 8 +-- .../git/table/SettingsHistoryTableRow.kt | 4 +- .../CloudConfigToSettingsSyncMigration.kt | 5 +- .../core}/migration/ConfigInfo.kt | 2 +- .../core}/migration/ConfigState.kt | 5 +- ...ttingsRepositoryToSettingsSyncMigration.kt | 14 ++-- .../core}/migration/StatusInfo.kt | 2 +- .../core}/notification/NotificationService.kt | 4 +- .../notification/NotificationServiceImpl.kt | 8 +-- .../plugins/AbstractPluginManagerProxy.kt | 2 +- .../core}/plugins/CorePluginManagerProxy.kt | 2 +- .../core}/plugins/PluginManagerProxy.kt | 2 +- .../SettingsSyncPluginCategoryFinder.kt | 4 +- .../plugins/SettingsSyncPluginInstaller.kt | 2 +- .../SettingsSyncPluginInstallerImpl.kt | 7 +- .../plugins/SettingsSyncPluginManager.kt | 13 ++-- .../core}/plugins/SettingsSyncPluginsState.kt | 6 +- .../SettingsSyncEventsStatistics.kt | 2 +- .../statistics/SettingsSyncStateStatistics.kt | 8 +-- .../src/icons/SettingsSyncIcons.java | 0 .../settings-sync-core}/test-resources/.env | 0 .../test-resources/docker-compose.yaml | 0 .../core}/BasePluginManagerTest.kt | 12 ++-- .../settingsSync/core}/GitSettingsLogTest.kt | 7 +- .../core}/MatrixIDEStartPluginManagerTest.kt | 4 +- .../core}/MergePluginsStateTest.kt | 6 +- .../core}/MockRemoteCommunicator.kt | 10 ++- .../core}/MockSettingsSyncIdeMediator.kt | 2 +- .../core}/SettingsFilteringTest.kt | 5 +- .../core}/SettingsProviderTest.kt | 3 +- .../core}/SettingsSnapshotTest.kt | 2 +- .../SettingsSnapshotZipSerializerTest.kt | 6 +- .../core}/SettingsSyncFlowTest.kt | 4 +- .../core}/SettingsSyncIdeMediatorTest.kt | 6 +- .../core}/SettingsSyncPluginManagerTest.kt | 8 +-- .../SettingsSyncPluginManagerTestUtil.kt | 6 +- .../core}/SettingsSyncRealIdeTest.kt | 6 +- .../core}/SettingsSyncRealIdeTestBase.kt | 4 +- .../core}/SettingsSyncTestBase.kt | 6 +- .../core}/SettingsSyncTestInfra.kt | 12 ++-- .../settingsSync/core}/TestPluginManager.kt | 7 +- .../CloudConfigToSettingsSyncMigrationTest.kt | 12 ++-- ...gsRepositoryToSettingsSyncMigrationTest.kt | 6 +- .../intellij.settingsSync.fileSystem.iml | 2 +- .../git/intellij.settingsSync.git.iml | 23 ------ .../resources/intellij.settingsSync.git.xml | 17 ----- ...Sync.jba.iml => intellij.settingsSync.iml} | 3 +- .../jba/resources/META-INF/plugin.xml | 26 +++++++ .../resources/META-INF/pluginIcon.svg | 0 .../resources/intellij.settingsSync.jba.xml | 9 --- .../intellij.settingsSync.performance.xml | 8 +++ .../jba/CloudConfigServerCommunicator.kt | 11 +-- .../jba/JbaCommunicatorProvider.kt | 6 +- .../settingsSync/jba/SettingsSyncPromotion.kt | 14 ++-- .../jba/SettingsSyncTroubleshootingAction.kt | 18 ++--- .../jba/auth/DummyJBAccountInfoService.kt | 2 +- .../settingsSync/jba/auth/JBAAuthService.kt | 6 +- .../DisableSettingsSyncCommand.kt | 4 +- .../EnableSettingsSyncCommand.kt | 8 +-- .../GetSettingsFromServerCommand.kt | 6 +- .../PushSettingsToServerCommand.kt | 4 +- .../SettingsSyncCommandProvider.kt | 2 +- .../settingsSync/SettingsSyncAuthTest.kt | 4 +- .../SettingsSyncTestAuthService.kt | 6 +- ...ettingsSync-performance-plugin-support.xml | 5 -- .../settingsSync/InvalidVersionIdException.kt | 2 - .../resources/META-INF/PyCharmCorePlugin.xml | 1 + 153 files changed, 434 insertions(+), 482 deletions(-) rename plugins/settings-sync/intellij.settingsSync.iml => platform/settings-sync-core/intellij.settingsSync.core.iml (85%) rename {plugins/settings-sync => platform/settings-sync-core}/plugin-content.yaml (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/SettingsSyncIconMappings.json (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/conflict.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/expui/conflict.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/expui/conflict_dark.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/expui/icon-robots.txt (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/expui/localChanges.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/expui/localChanges_dark.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/expui/remoteChanges.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/expui/remoteChanges_dark.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/expui/statusDisabled.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/expui/statusDisabled_dark.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/expui/statusEnabled.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/expui/statusEnabled_dark.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/localChanges.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/remoteChanges.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/statusDisabled.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/statusDisabled_dark.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/statusEnabled.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/statusNotRun.svg (100%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/icons/statusNotRun_dark.svg (100%) rename plugins/settings-sync/resources/META-INF/plugin.xml => platform/settings-sync-core/resources/intellij.settingsSync.core.xml (54%) rename {plugins/settings-sync => platform/settings-sync-core}/resources/messages/SettingsSyncBundle.properties (100%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/AbstractServerCommunicator.kt (99%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/FileState.kt (98%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/GitSettingsLog.kt (96%) create mode 100644 platform/settings-sync-core/src/com/intellij/settingsSync/core/InvalidVersionIdException.kt rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/LocalHostNameProvider.kt (96%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/ManualPushAction.kt (94%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingSyncNotifications.kt (93%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsChangeListener.kt (98%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsLog.kt (98%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsProvider.kt (98%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSnapshot.kt (97%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSnapshotZipSerializer.kt (97%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncBridge.kt (98%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncBundle.kt (92%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncEvents.kt (91%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncFiltering.kt (97%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncIdeMediator.kt (96%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncIdeMediatorImpl.kt (93%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncLocalSettings.kt (98%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncMain.kt (87%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncMigration.kt (94%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncPushResult.kt (92%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncRemoteCommunicator.kt (94%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncSettings.kt (97%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncStatusTracker.kt (96%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSyncUpdateChecker.kt (89%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/SettingsSynchronizer.kt (94%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/ShareableSettings.kt (89%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/auth/SettingsSyncAuthService.kt (88%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/communicator/RemoteCommunicatorHolder.kt (90%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/communicator/SettingsSyncCommunicatorProvider.kt (82%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/config/EnableSettingsSyncDialog.kt (87%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/config/SettingsSyncConfigurable.kt (96%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/config/SettingsSyncEnabler.kt (95%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/config/SettingsSyncOldConfigurable.kt (96%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/config/SettingsSyncOpenSettingsAction.kt (90%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/config/SettingsSyncPanelFactory.kt (97%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/config/SettingsSyncStatusAction.kt (83%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/config/SettingsSyncSubcategories.kt (93%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/config/SyncCategoryHolder.kt (95%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/config/SyncPluginsGroup.kt (88%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/config/SyncUiGroup.kt (82%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/SettingsHistoryLogUi.kt (92%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/SettingsHistoryLogUiFactory.kt (95%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/SettingsHistoryPanel.kt (79%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/SettingsHistoryToolWindowFactory.kt (97%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/SettingsHistoryUiProperties.kt (95%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/SettingsSyncHistoryAction.kt (90%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/record/ChangeRecord.kt (97%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/record/RecordService.kt (90%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/renderers/SettingsHistoryCellRenderer.kt (94%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/renderers/SettingsHistoryEmptyCellRenderer.kt (70%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/renderers/SettingsHistoryFileCellRenderer.kt (80%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/renderers/SettingsHistoryNodeCellRenderer.kt (89%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/renderers/SettingsHistoryRestoreCellRenderer.kt (78%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/renderers/SettingsHistorySubtitleRenderer.kt (84%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/renderers/SettingsHistoryTitleCellRenderer.kt (92%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/table/ExpandedRowFilter.kt (93%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/table/SettingsHistoryTable.kt (91%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/table/SettingsHistoryTableModel.kt (95%) rename {plugins/settings-sync/git/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/git/table/SettingsHistoryTableRow.kt (83%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/migration/CloudConfigToSettingsSyncMigration.kt (98%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/migration/ConfigInfo.kt (78%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/migration/ConfigState.kt (83%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/migration/SettingsRepositoryToSettingsSyncMigration.kt (91%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/migration/StatusInfo.kt (89%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/notification/NotificationService.kt (75%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/notification/NotificationServiceImpl.kt (93%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/plugins/AbstractPluginManagerProxy.kt (98%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/plugins/CorePluginManagerProxy.kt (96%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/plugins/PluginManagerProxy.kt (95%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/plugins/SettingsSyncPluginCategoryFinder.kt (85%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/plugins/SettingsSyncPluginInstaller.kt (76%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/plugins/SettingsSyncPluginInstallerImpl.kt (93%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/plugins/SettingsSyncPluginManager.kt (97%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/plugins/SettingsSyncPluginsState.kt (93%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/statistics/SettingsSyncEventsStatistics.kt (97%) rename {plugins/settings-sync/src/com/intellij/settingsSync => platform/settings-sync-core/src/com/intellij/settingsSync/core}/statistics/SettingsSyncStateStatistics.kt (87%) rename {plugins/settings-sync => platform/settings-sync-core}/src/icons/SettingsSyncIcons.java (100%) rename {plugins/settings-sync => platform/settings-sync-core}/test-resources/.env (100%) rename {plugins/settings-sync => platform/settings-sync-core}/test-resources/docker-compose.yaml (100%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/BasePluginManagerTest.kt (93%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/GitSettingsLogTest.kt (99%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/MatrixIDEStartPluginManagerTest.kt (97%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/MergePluginsStateTest.kt (88%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/MockRemoteCommunicator.kt (94%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/MockSettingsSyncIdeMediator.kt (98%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsFilteringTest.kt (95%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsProviderTest.kt (98%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsSnapshotTest.kt (98%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsSnapshotZipSerializerTest.kt (91%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsSyncFlowTest.kt (99%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsSyncIdeMediatorTest.kt (98%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsSyncPluginManagerTest.kt (98%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsSyncPluginManagerTestUtil.kt (94%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsSyncRealIdeTest.kt (98%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsSyncRealIdeTestBase.kt (98%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsSyncTestBase.kt (96%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/SettingsSyncTestInfra.kt (91%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/TestPluginManager.kt (95%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/migration/CloudConfigToSettingsSyncMigrationTest.kt (91%) rename {plugins/settings-sync/tests/com/intellij/settingsSync => platform/settings-sync-core/tests/com/intellij/settingsSync/core}/migration/SettingsRepositoryToSettingsSyncMigrationTest.kt (93%) delete mode 100644 plugins/settings-sync/git/intellij.settingsSync.git.iml delete mode 100644 plugins/settings-sync/git/resources/intellij.settingsSync.git.xml rename plugins/settings-sync/jba/{intellij.settingsSync.jba.iml => intellij.settingsSync.iml} (94%) create mode 100644 plugins/settings-sync/jba/resources/META-INF/plugin.xml rename plugins/settings-sync/{ => jba}/resources/META-INF/pluginIcon.svg (100%) delete mode 100644 plugins/settings-sync/jba/resources/intellij.settingsSync.jba.xml create mode 100644 plugins/settings-sync/jba/resources/intellij.settingsSync.performance.xml rename plugins/settings-sync/{src/com/intellij/settingsSync => jba/src/com/intellij/settingsSync/jba}/performanceTesting/DisableSettingsSyncCommand.kt (94%) rename plugins/settings-sync/{src/com/intellij/settingsSync => jba/src/com/intellij/settingsSync/jba}/performanceTesting/EnableSettingsSyncCommand.kt (94%) rename plugins/settings-sync/{src/com/intellij/settingsSync => jba/src/com/intellij/settingsSync/jba}/performanceTesting/GetSettingsFromServerCommand.kt (87%) rename plugins/settings-sync/{src/com/intellij/settingsSync => jba/src/com/intellij/settingsSync/jba}/performanceTesting/PushSettingsToServerCommand.kt (89%) rename plugins/settings-sync/{src/com/intellij/settingsSync => jba/src/com/intellij/settingsSync/jba}/performanceTesting/SettingsSyncCommandProvider.kt (91%) delete mode 100644 plugins/settings-sync/resources/META-INF/settingsSync-performance-plugin-support.xml delete mode 100644 plugins/settings-sync/src/com/intellij/settingsSync/InvalidVersionIdException.kt diff --git a/.idea/modules.xml b/.idea/modules.xml index fca59ffc5706..35cf25cfc5eb 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -918,10 +918,8 @@ - - - - + + diff --git a/community-resources/resources/META-INF/IdeaPlugin.xml b/community-resources/resources/META-INF/IdeaPlugin.xml index ab05cf067e1b..f5be54c1ec78 100644 --- a/community-resources/resources/META-INF/IdeaPlugin.xml +++ b/community-resources/resources/META-INF/IdeaPlugin.xml @@ -14,6 +14,7 @@ + diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml index b7f8a8fee76a..2ac02e205b62 100644 --- a/intellij.idea.community.main.iml +++ b/intellij.idea.community.main.iml @@ -147,10 +147,7 @@ - - - - + diff --git a/plugins/settings-sync/intellij.settingsSync.iml b/platform/settings-sync-core/intellij.settingsSync.core.iml similarity index 85% rename from plugins/settings-sync/intellij.settingsSync.iml rename to platform/settings-sync-core/intellij.settingsSync.core.iml index d458d58052a9..7e86b12a6a0b 100644 --- a/plugins/settings-sync/intellij.settingsSync.iml +++ b/platform/settings-sync-core/intellij.settingsSync.core.iml @@ -40,7 +40,7 @@ - + @@ -54,8 +54,14 @@ - + + + + + + + \ No newline at end of file diff --git a/plugins/settings-sync/plugin-content.yaml b/platform/settings-sync-core/plugin-content.yaml similarity index 100% rename from plugins/settings-sync/plugin-content.yaml rename to platform/settings-sync-core/plugin-content.yaml diff --git a/plugins/settings-sync/resources/SettingsSyncIconMappings.json b/platform/settings-sync-core/resources/SettingsSyncIconMappings.json similarity index 100% rename from plugins/settings-sync/resources/SettingsSyncIconMappings.json rename to platform/settings-sync-core/resources/SettingsSyncIconMappings.json diff --git a/plugins/settings-sync/resources/icons/conflict.svg b/platform/settings-sync-core/resources/icons/conflict.svg similarity index 100% rename from plugins/settings-sync/resources/icons/conflict.svg rename to platform/settings-sync-core/resources/icons/conflict.svg diff --git a/plugins/settings-sync/resources/icons/expui/conflict.svg b/platform/settings-sync-core/resources/icons/expui/conflict.svg similarity index 100% rename from plugins/settings-sync/resources/icons/expui/conflict.svg rename to platform/settings-sync-core/resources/icons/expui/conflict.svg diff --git a/plugins/settings-sync/resources/icons/expui/conflict_dark.svg b/platform/settings-sync-core/resources/icons/expui/conflict_dark.svg similarity index 100% rename from plugins/settings-sync/resources/icons/expui/conflict_dark.svg rename to platform/settings-sync-core/resources/icons/expui/conflict_dark.svg diff --git a/plugins/settings-sync/resources/icons/expui/icon-robots.txt b/platform/settings-sync-core/resources/icons/expui/icon-robots.txt similarity index 100% rename from plugins/settings-sync/resources/icons/expui/icon-robots.txt rename to platform/settings-sync-core/resources/icons/expui/icon-robots.txt diff --git a/plugins/settings-sync/resources/icons/expui/localChanges.svg b/platform/settings-sync-core/resources/icons/expui/localChanges.svg similarity index 100% rename from plugins/settings-sync/resources/icons/expui/localChanges.svg rename to platform/settings-sync-core/resources/icons/expui/localChanges.svg diff --git a/plugins/settings-sync/resources/icons/expui/localChanges_dark.svg b/platform/settings-sync-core/resources/icons/expui/localChanges_dark.svg similarity index 100% rename from plugins/settings-sync/resources/icons/expui/localChanges_dark.svg rename to platform/settings-sync-core/resources/icons/expui/localChanges_dark.svg diff --git a/plugins/settings-sync/resources/icons/expui/remoteChanges.svg b/platform/settings-sync-core/resources/icons/expui/remoteChanges.svg similarity index 100% rename from plugins/settings-sync/resources/icons/expui/remoteChanges.svg rename to platform/settings-sync-core/resources/icons/expui/remoteChanges.svg diff --git a/plugins/settings-sync/resources/icons/expui/remoteChanges_dark.svg b/platform/settings-sync-core/resources/icons/expui/remoteChanges_dark.svg similarity index 100% rename from plugins/settings-sync/resources/icons/expui/remoteChanges_dark.svg rename to platform/settings-sync-core/resources/icons/expui/remoteChanges_dark.svg diff --git a/plugins/settings-sync/resources/icons/expui/statusDisabled.svg b/platform/settings-sync-core/resources/icons/expui/statusDisabled.svg similarity index 100% rename from plugins/settings-sync/resources/icons/expui/statusDisabled.svg rename to platform/settings-sync-core/resources/icons/expui/statusDisabled.svg diff --git a/plugins/settings-sync/resources/icons/expui/statusDisabled_dark.svg b/platform/settings-sync-core/resources/icons/expui/statusDisabled_dark.svg similarity index 100% rename from plugins/settings-sync/resources/icons/expui/statusDisabled_dark.svg rename to platform/settings-sync-core/resources/icons/expui/statusDisabled_dark.svg diff --git a/plugins/settings-sync/resources/icons/expui/statusEnabled.svg b/platform/settings-sync-core/resources/icons/expui/statusEnabled.svg similarity index 100% rename from plugins/settings-sync/resources/icons/expui/statusEnabled.svg rename to platform/settings-sync-core/resources/icons/expui/statusEnabled.svg diff --git a/plugins/settings-sync/resources/icons/expui/statusEnabled_dark.svg b/platform/settings-sync-core/resources/icons/expui/statusEnabled_dark.svg similarity index 100% rename from plugins/settings-sync/resources/icons/expui/statusEnabled_dark.svg rename to platform/settings-sync-core/resources/icons/expui/statusEnabled_dark.svg diff --git a/plugins/settings-sync/resources/icons/localChanges.svg b/platform/settings-sync-core/resources/icons/localChanges.svg similarity index 100% rename from plugins/settings-sync/resources/icons/localChanges.svg rename to platform/settings-sync-core/resources/icons/localChanges.svg diff --git a/plugins/settings-sync/resources/icons/remoteChanges.svg b/platform/settings-sync-core/resources/icons/remoteChanges.svg similarity index 100% rename from plugins/settings-sync/resources/icons/remoteChanges.svg rename to platform/settings-sync-core/resources/icons/remoteChanges.svg diff --git a/plugins/settings-sync/resources/icons/statusDisabled.svg b/platform/settings-sync-core/resources/icons/statusDisabled.svg similarity index 100% rename from plugins/settings-sync/resources/icons/statusDisabled.svg rename to platform/settings-sync-core/resources/icons/statusDisabled.svg diff --git a/plugins/settings-sync/resources/icons/statusDisabled_dark.svg b/platform/settings-sync-core/resources/icons/statusDisabled_dark.svg similarity index 100% rename from plugins/settings-sync/resources/icons/statusDisabled_dark.svg rename to platform/settings-sync-core/resources/icons/statusDisabled_dark.svg diff --git a/plugins/settings-sync/resources/icons/statusEnabled.svg b/platform/settings-sync-core/resources/icons/statusEnabled.svg similarity index 100% rename from plugins/settings-sync/resources/icons/statusEnabled.svg rename to platform/settings-sync-core/resources/icons/statusEnabled.svg diff --git a/plugins/settings-sync/resources/icons/statusNotRun.svg b/platform/settings-sync-core/resources/icons/statusNotRun.svg similarity index 100% rename from plugins/settings-sync/resources/icons/statusNotRun.svg rename to platform/settings-sync-core/resources/icons/statusNotRun.svg diff --git a/plugins/settings-sync/resources/icons/statusNotRun_dark.svg b/platform/settings-sync-core/resources/icons/statusNotRun_dark.svg similarity index 100% rename from plugins/settings-sync/resources/icons/statusNotRun_dark.svg rename to platform/settings-sync-core/resources/icons/statusNotRun_dark.svg diff --git a/plugins/settings-sync/resources/META-INF/plugin.xml b/platform/settings-sync-core/resources/intellij.settingsSync.core.xml similarity index 54% rename from plugins/settings-sync/resources/META-INF/plugin.xml rename to platform/settings-sync-core/resources/intellij.settingsSync.core.xml index af06a378c1aa..80b7b3a2810a 100644 --- a/plugins/settings-sync/resources/META-INF/plugin.xml +++ b/platform/settings-sync-core/resources/intellij.settingsSync.core.xml @@ -1,37 +1,21 @@ - - Backup and Sync - com.intellij.settingsSync - IDE Settings - Synchronizes settings across all JetBrains IDE instances using your JetBrains account. - The list of synced settings is customizable and includes UI, keymaps, code style, plugins, and much more.

- ]]> - JetBrains - messages.SettingsSyncBundle - - - - - - - - com.intellij.modules.platform - com.jetbrains.performancePlugin - + + + + - - + + - + - + @@ -44,41 +28,46 @@ description="Whether to show GotIt tooltip with promotion to enable the Backup and Sync on Apply button click in the Settings dialog"/> - - - + + + - + + + - - - - - + + + - + - + - + - + + + + diff --git a/plugins/settings-sync/resources/messages/SettingsSyncBundle.properties b/platform/settings-sync-core/resources/messages/SettingsSyncBundle.properties similarity index 100% rename from plugins/settings-sync/resources/messages/SettingsSyncBundle.properties rename to platform/settings-sync-core/resources/messages/SettingsSyncBundle.properties diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/AbstractServerCommunicator.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/AbstractServerCommunicator.kt similarity index 99% rename from plugins/settings-sync/src/com/intellij/settingsSync/AbstractServerCommunicator.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/AbstractServerCommunicator.kt index 6c3a78878f06..aa2580557f2d 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/AbstractServerCommunicator.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/AbstractServerCommunicator.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.application.ApplicationNamesInfo import com.intellij.openapi.diagnostic.logger diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/FileState.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/FileState.kt similarity index 98% rename from plugins/settings-sync/src/com/intellij/settingsSync/FileState.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/FileState.kt index 62e09ce7c49c..3cea2f28e2d3 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/FileState.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/FileState.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.SystemIndependent diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/GitSettingsLog.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/GitSettingsLog.kt similarity index 96% rename from plugins/settings-sync/src/com/intellij/settingsSync/GitSettingsLog.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/GitSettingsLog.kt index d536139d1668..8e91fc8db696 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/GitSettingsLog.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/GitSettingsLog.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.Disposable import com.intellij.openapi.application.PathManager @@ -6,15 +6,14 @@ import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.io.FileUtil -import com.intellij.settingsSync.SettingsSnapshot.MetaInfo -import com.intellij.settingsSync.SettingsSnapshotZipSerializer.deserializeSettingsProviders -import com.intellij.settingsSync.SettingsSnapshotZipSerializer.serializeSettingsProviders -import com.intellij.settingsSync.communicator.SettingsSyncUserData -import com.intellij.settingsSync.notification.NotificationService -import com.intellij.settingsSync.plugins.SettingsSyncPluginsState -import com.intellij.settingsSync.plugins.SettingsSyncPluginsStateMerger.mergePluginStates -import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics -import com.intellij.ui.JBAccountInfoService +import com.intellij.settingsSync.core.SettingsSnapshot.MetaInfo +import com.intellij.settingsSync.core.SettingsSnapshotZipSerializer.deserializeSettingsProviders +import com.intellij.settingsSync.core.SettingsSnapshotZipSerializer.serializeSettingsProviders +import com.intellij.settingsSync.core.communicator.SettingsSyncUserData +import com.intellij.settingsSync.core.notification.NotificationService +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsStateMerger.mergePluginStates +import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics import com.intellij.util.io.createParentDirectories import com.intellij.util.io.write import kotlinx.serialization.encodeToString @@ -44,10 +43,10 @@ import kotlin.io.path.* @Internal class GitSettingsLog(private val settingsSyncStorage: Path, - private val rootConfigPath: Path, - parentDisposable: Disposable, - private val userDataProvider: () -> SettingsSyncUserData?, - private val initialSnapshotProvider: (SettingsSnapshot) -> SettingsSnapshot + private val rootConfigPath: Path, + parentDisposable: Disposable, + private val userDataProvider: () -> SettingsSyncUserData?, + private val initialSnapshotProvider: (SettingsSnapshot) -> SettingsSnapshot ) : SettingsLog, Disposable { private val FIVE_SECONDS = 5000 diff --git a/platform/settings-sync-core/src/com/intellij/settingsSync/core/InvalidVersionIdException.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/InvalidVersionIdException.kt new file mode 100644 index 000000000000..1fd57fabdca5 --- /dev/null +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/InvalidVersionIdException.kt @@ -0,0 +1,2 @@ +package com.intellij.settingsSync.core + diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/LocalHostNameProvider.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/LocalHostNameProvider.kt similarity index 96% rename from plugins/settings-sync/src/com/intellij/settingsSync/LocalHostNameProvider.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/LocalHostNameProvider.kt index 22bf12f75868..12cdd0b05bf0 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/LocalHostNameProvider.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/LocalHostNameProvider.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.components.Service import com.intellij.openapi.components.service diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/ManualPushAction.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/ManualPushAction.kt similarity index 94% rename from plugins/settings-sync/src/com/intellij/settingsSync/ManualPushAction.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/ManualPushAction.kt index 432269ad670c..c178325d36b9 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/ManualPushAction.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/ManualPushAction.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.actionSystem.AnActionEvent diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingSyncNotifications.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingSyncNotifications.kt similarity index 93% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingSyncNotifications.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingSyncNotifications.kt index 3782cf1bfd74..44358facc735 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingSyncNotifications.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingSyncNotifications.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.notification.NotificationGroupManager import com.intellij.notification.NotificationType diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsChangeListener.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsChangeListener.kt similarity index 98% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsChangeListener.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsChangeListener.kt index febca86af959..025651ed1a3c 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsChangeListener.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsChangeListener.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.util.NlsSafe import org.jetbrains.annotations.ApiStatus.Internal diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsLog.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsLog.kt similarity index 98% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsLog.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsLog.kt index 2cd754ce6383..d601758f3cd7 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsLog.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsLog.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.util.concurrency.annotations.RequiresBackgroundThread import org.jetbrains.annotations.ApiStatus diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsProvider.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsProvider.kt similarity index 98% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsProvider.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsProvider.kt index aed8667e7e66..947ec134f902 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsProvider.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsProvider.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.components.PersistentStateComponent import com.intellij.openapi.extensions.ExtensionPointName diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSnapshot.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSnapshot.kt similarity index 97% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSnapshot.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSnapshot.kt index 099a7614f949..6e63a29d5497 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSnapshot.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSnapshot.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.application.ApplicationInfo import com.intellij.openapi.application.PathManager @@ -6,7 +6,7 @@ import com.intellij.openapi.components.service import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.util.BuildNumber import com.intellij.openapi.util.JDOMUtil -import com.intellij.settingsSync.plugins.SettingsSyncPluginsState +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState import com.intellij.util.SystemProperties import com.intellij.util.xmlb.XmlSerializer import org.jetbrains.annotations.ApiStatus diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSnapshotZipSerializer.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSnapshotZipSerializer.kt similarity index 97% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSnapshotZipSerializer.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSnapshotZipSerializer.kt index 949570dfccd3..18a85eeb0a2f 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSnapshotZipSerializer.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSnapshotZipSerializer.kt @@ -1,12 +1,11 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.util.BuildNumber import com.intellij.openapi.util.io.FileUtil -import com.intellij.settingsSync.notification.NotificationService -import com.intellij.settingsSync.plugins.SettingsSyncPluginsState +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState import com.intellij.util.io.Compressor import com.intellij.util.io.Decompressor import kotlinx.serialization.encodeToString diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBridge.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncBridge.kt similarity index 98% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBridge.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncBridge.kt index 1ba2b3b68c97..2bbb19ce0bd8 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBridge.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncBridge.kt @@ -1,13 +1,13 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.codeInsight.template.impl.TemplateSettings import com.intellij.configurationStore.saveSettings import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.diagnostic.logger import com.intellij.platform.util.progress.withProgressText -import com.intellij.settingsSync.SettingsSyncBridge.PushRequestMode.* -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder -import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics +import com.intellij.settingsSync.core.SettingsSyncBridge.PushRequestMode.* +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder +import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics import com.intellij.util.containers.ContainerUtil import kotlinx.coroutines.* import org.jetbrains.annotations.ApiStatus diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBundle.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncBundle.kt similarity index 92% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBundle.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncBundle.kt index 42aa887cce91..d5f9d8333bd9 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBundle.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncBundle.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.DynamicBundle import org.jetbrains.annotations.ApiStatus diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncEvents.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncEvents.kt similarity index 91% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncEvents.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncEvents.kt index 7a51a0e7a19e..ed3b30ad9633 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncEvents.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncEvents.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.Disposable import com.intellij.openapi.components.Service @@ -85,7 +85,8 @@ internal class RestartForPluginInstall(val plugins: Collection) : Restar } override fun getMultiReasonNotificationListEntry(number: Int): String { - return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.install", plugins.size, plugins.take(2).joinToString(", ")) + return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.install", plugins.size, + plugins.take(2).joinToString(", ")) } } @@ -97,7 +98,8 @@ internal class RestartForPluginEnable(val plugins: Collection) : Restart } override fun getMultiReasonNotificationListEntry(number: Int): String { - return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.enable", plugins.size, plugins.take(2).joinToString(", ")) + return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.enable", plugins.size, + plugins.take(2).joinToString(", ")) } } @@ -109,6 +111,7 @@ internal class RestartForPluginDisable(val plugins: Collection) : Restar } override fun getMultiReasonNotificationListEntry(number: Int): String { - return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.disable", plugins.size, plugins.take(2).joinToString(", ")) + return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.disable", plugins.size, + plugins.take(2).joinToString(", ")) } } \ No newline at end of file diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncFiltering.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncFiltering.kt similarity index 97% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncFiltering.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncFiltering.kt index 30e1247662d4..ff242d542c48 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncFiltering.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncFiltering.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.configurationStore.getPerOsSettingsStorageFolderName import com.intellij.configurationStore.schemeManager.SchemeManagerFactoryBase @@ -8,7 +8,7 @@ import com.intellij.openapi.editor.colors.impl.AppEditorFontOptions import com.intellij.openapi.options.SchemeManagerFactory import com.intellij.openapi.util.text.StringUtil import com.intellij.serviceContainer.ComponentManagerImpl -import com.intellij.settingsSync.config.EDITOR_FONT_SUBCATEGORY_ID +import com.intellij.settingsSync.core.config.EDITOR_FONT_SUBCATEGORY_ID import java.util.concurrent.ConcurrentHashMap internal fun isSyncCategoryEnabled(fileSpec: String): Boolean { diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncIdeMediator.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncIdeMediator.kt similarity index 96% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncIdeMediator.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncIdeMediator.kt index 07c8c7f33730..06cf4420cd86 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncIdeMediator.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncIdeMediator.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import org.jetbrains.annotations.ApiStatus import java.nio.file.Path diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncIdeMediatorImpl.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncIdeMediatorImpl.kt similarity index 93% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncIdeMediatorImpl.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncIdeMediatorImpl.kt index 00021834a944..ca571eb7a270 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncIdeMediatorImpl.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncIdeMediatorImpl.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.concurrency.ConcurrentCollectionFactory import com.intellij.configurationStore.* @@ -9,9 +9,9 @@ import com.intellij.openapi.diagnostic.Attachment import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl import com.intellij.openapi.util.registry.Registry -import com.intellij.settingsSync.SettingsSnapshot.MetaInfo -import com.intellij.settingsSync.notification.NotificationService -import com.intellij.settingsSync.plugins.SettingsSyncPluginManager +import com.intellij.settingsSync.core.SettingsSnapshot.MetaInfo +import com.intellij.settingsSync.core.notification.NotificationService +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginManager import com.intellij.ui.NewUiValue import com.intellij.util.io.inputStreamIfExists import com.intellij.util.io.write @@ -77,19 +77,21 @@ internal class SettingsSyncIdeMediatorImpl(private val componentStore: Component SettingsSyncPluginManager.getInstance().pushChangesToIde(snapshot.plugins) } - // 3. after that update the rest of changed settings - val regularFileStates = snapshot.fileStates.filter { it != settingsSyncFileState } - writeStatesToAppConfig(regularFileStates) + if (!AppMode.isRemoteDevHost()) { + // 3. after that update the rest of changed settings + val regularFileStates = snapshot.fileStates.filter { it != settingsSyncFileState } + writeStatesToAppConfig(regularFileStates) - // 4. apply changes from custom providers - for ((id, state) in snapshot.settingsFromProviders) { - val provider = findProviderById(id, state) - if (provider != null) { - LOG.debug("Applying settings for provider '$id'") - provider.applyNewSettings(state) - } - else { - LOG.warn("Couldn't find provider for id '$id' and state '${state.javaClass}'") + // 4. apply changes from custom providers + for ((id, state) in snapshot.settingsFromProviders) { + val provider = findProviderById(id, state) + if (provider != null) { + LOG.debug("Applying settings for provider '$id'") + provider.applyNewSettings(state) + } + else { + LOG.warn("Couldn't find provider for id '$id' and state '${state.javaClass}'") + } } } notifyRestartNeeded() diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncLocalSettings.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncLocalSettings.kt similarity index 98% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncLocalSettings.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncLocalSettings.kt index 8dcef7ddf91d..d3acb390d88b 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncLocalSettings.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncLocalSettings.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.* diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncMain.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncMain.kt similarity index 87% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncMain.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncMain.kt index 35401fdf912d..90b541758fd7 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncMain.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncMain.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.configurationStore.ComponentStoreImpl import com.intellij.openapi.Disposable @@ -8,17 +8,11 @@ import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.components.serviceIfCreated import com.intellij.openapi.components.impl.stores.stateStore -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder -import com.intellij.util.SystemProperties +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder import kotlinx.coroutines.CoroutineScope import org.jetbrains.annotations.ApiStatus import java.nio.file.Path -private const val SETTINGS_SYNC_ENABLED_PROPERTY = "idea.settings.sync.enabled" - -@ApiStatus.Internal -fun isSettingsSyncEnabledByKey(): Boolean = SystemProperties.getBooleanProperty(SETTINGS_SYNC_ENABLED_PROPERTY, true) - @ApiStatus.Internal fun isSettingsSyncEnabledInSettings(): Boolean = SettingsSyncSettings.getInstance().syncEnabled @@ -33,7 +27,7 @@ class SettingsSyncMain(coroutineScope: CoroutineScope) : Disposable { val appConfigPath = PathManager.getConfigDir() val componentStore = ApplicationManager.getApplication().stateStore as ComponentStoreImpl val ideMediator = SettingsSyncIdeMediatorImpl(componentStore = componentStore, rootConfig = appConfigPath, enabledCondition = { - isSettingsSyncEnabledByKey() && isAvailable() && isSettingsSyncEnabledInSettings() + isAvailable() && isSettingsSyncEnabledInSettings() }) controls = init(coroutineScope, parentDisposable = this, diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncMigration.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncMigration.kt similarity index 94% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncMigration.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncMigration.kt index 055f94d42d2c..030c311107a7 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncMigration.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncMigration.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import org.jetbrains.annotations.ApiStatus import java.nio.file.Path diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncPushResult.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncPushResult.kt similarity index 92% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncPushResult.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncPushResult.kt index ac92775b3428..8e5ff82478a1 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncPushResult.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncPushResult.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.util.NlsSafe import org.jetbrains.annotations.ApiStatus diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncRemoteCommunicator.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncRemoteCommunicator.kt similarity index 94% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncRemoteCommunicator.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncRemoteCommunicator.kt index ca8871ca16d2..adc05d1fe157 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncRemoteCommunicator.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncRemoteCommunicator.kt @@ -1,8 +1,6 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.util.NlsSafe -import com.intellij.settingsSync.auth.SettingsSyncAuthService -import com.intellij.settingsSync.communicator.SettingsSyncUserData import com.intellij.util.concurrency.annotations.RequiresBackgroundThread import org.jetbrains.annotations.ApiStatus diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncSettings.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncSettings.kt similarity index 97% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncSettings.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncSettings.kt index 37fbce6baab1..ac6608537ba9 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncSettings.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncSettings.kt @@ -1,8 +1,8 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.components.* -import com.intellij.settingsSync.SettingsSyncSettings.Companion.COMPONENT_NAME -import com.intellij.settingsSync.SettingsSyncSettings.Companion.FILE_SPEC +import com.intellij.settingsSync.core.SettingsSyncSettings.Companion.COMPONENT_NAME +import com.intellij.settingsSync.core.SettingsSyncSettings.Companion.FILE_SPEC import com.intellij.util.xmlb.annotations.Property import org.jetbrains.annotations.ApiStatus diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncStatusTracker.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncStatusTracker.kt similarity index 96% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncStatusTracker.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncStatusTracker.kt index bce7e4d476ab..4810304b36f8 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncStatusTracker.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncStatusTracker.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.Service @@ -15,7 +15,7 @@ internal class SettingsSyncStatusTracker { private val eventDispatcher = EventDispatcher.create(Listener::class.java) init { - SettingsSyncEvents.getInstance().addListener(object: SettingsSyncEventListener{ + SettingsSyncEvents.getInstance().addListener(object: SettingsSyncEventListener { override fun settingChanged(event: SyncSettingsEvent) { if (event is SyncSettingsEvent.CloudChange) { updateOnSuccess() diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncUpdateChecker.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncUpdateChecker.kt similarity index 89% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncUpdateChecker.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncUpdateChecker.kt index 4f1afb9c205e..a1f8da21957a 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncUpdateChecker.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncUpdateChecker.kt @@ -1,8 +1,8 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.diagnostic.logger -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder -import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder +import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics import com.intellij.util.concurrency.annotations.RequiresBackgroundThread import org.jetbrains.annotations.ApiStatus diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSynchronizer.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSynchronizer.kt similarity index 94% rename from plugins/settings-sync/src/com/intellij/settingsSync/SettingsSynchronizer.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSynchronizer.kt index 0084e4ece58c..b9e22ae5f56a 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSynchronizer.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSynchronizer.kt @@ -1,21 +1,19 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.ide.ApplicationActivity import com.intellij.openapi.application.ApplicationActivationListener -import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.PathManager import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.components.serviceAsync import com.intellij.openapi.diagnostic.logger -import com.intellij.openapi.extensions.ExtensionNotApplicableException import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.progress.blockingContext import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.wm.IdeFrame -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder -import com.intellij.settingsSync.migration.migrateIfNeeded -import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder +import com.intellij.settingsSync.core.migration.migrateIfNeeded +import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics import com.intellij.util.concurrency.AppExecutorUtil import com.intellij.util.concurrency.annotations.RequiresEdt import kotlinx.coroutines.coroutineScope diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/ShareableSettings.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/ShareableSettings.kt similarity index 89% rename from plugins/settings-sync/src/com/intellij/settingsSync/ShareableSettings.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/ShareableSettings.kt index eaf2213d35aa..f12c40ec0c5b 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/ShareableSettings.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/ShareableSettings.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core internal interface ShareableSettings { diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/auth/SettingsSyncAuthService.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/auth/SettingsSyncAuthService.kt similarity index 88% rename from plugins/settings-sync/src/com/intellij/settingsSync/auth/SettingsSyncAuthService.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/auth/SettingsSyncAuthService.kt index 5e988c76149b..f212a6cea4c9 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/auth/SettingsSyncAuthService.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/auth/SettingsSyncAuthService.kt @@ -1,6 +1,6 @@ -package com.intellij.settingsSync.auth +package com.intellij.settingsSync.core.auth -import com.intellij.settingsSync.communicator.SettingsSyncUserData +import com.intellij.settingsSync.core.communicator.SettingsSyncUserData import kotlinx.coroutines.Deferred import java.awt.Component import javax.swing.Icon diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/communicator/RemoteCommunicatorHolder.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/communicator/RemoteCommunicatorHolder.kt similarity index 90% rename from plugins/settings-sync/src/com/intellij/settingsSync/communicator/RemoteCommunicatorHolder.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/communicator/RemoteCommunicatorHolder.kt index 2415603e7779..1f3d910e7a53 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/communicator/RemoteCommunicatorHolder.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/communicator/RemoteCommunicatorHolder.kt @@ -1,7 +1,9 @@ -package com.intellij.settingsSync.communicator +package com.intellij.settingsSync.core.communicator import com.intellij.openapi.diagnostic.logger -import com.intellij.settingsSync.* +import com.intellij.settingsSync.core.SettingsSyncEventListener +import com.intellij.settingsSync.core.SettingsSyncLocalSettings +import com.intellij.settingsSync.core.SettingsSyncRemoteCommunicator import com.intellij.util.resettableLazy import org.jetbrains.annotations.ApiStatus @@ -71,7 +73,7 @@ object RemoteCommunicatorHolder : SettingsSyncEventListener { return extensionList } - fun getDefaultProvider(): SettingsSyncCommunicatorProvider { + fun getDefaultProvider(): SettingsSyncCommunicatorProvider? { return getProvider(DEFAULT_PROVIDER_CODE)!! } diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/communicator/SettingsSyncCommunicatorProvider.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/communicator/SettingsSyncCommunicatorProvider.kt similarity index 82% rename from plugins/settings-sync/src/com/intellij/settingsSync/communicator/SettingsSyncCommunicatorProvider.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/communicator/SettingsSyncCommunicatorProvider.kt index 2c11af1c41ea..20f274b5fa8e 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/communicator/SettingsSyncCommunicatorProvider.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/communicator/SettingsSyncCommunicatorProvider.kt @@ -1,8 +1,8 @@ -package com.intellij.settingsSync.communicator +package com.intellij.settingsSync.core.communicator import com.intellij.openapi.extensions.ExtensionPointName -import com.intellij.settingsSync.SettingsSyncRemoteCommunicator -import com.intellij.settingsSync.auth.SettingsSyncAuthService +import com.intellij.settingsSync.core.SettingsSyncRemoteCommunicator +import com.intellij.settingsSync.core.auth.SettingsSyncAuthService interface SettingsSyncCommunicatorProvider { diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/EnableSettingsSyncDialog.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/EnableSettingsSyncDialog.kt similarity index 87% rename from plugins/settings-sync/src/com/intellij/settingsSync/config/EnableSettingsSyncDialog.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/config/EnableSettingsSyncDialog.kt index 4790d2f57ab3..a010f65fb776 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/EnableSettingsSyncDialog.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/EnableSettingsSyncDialog.kt @@ -1,10 +1,10 @@ -package com.intellij.settingsSync.config +package com.intellij.settingsSync.core.config import com.intellij.openapi.ui.DialogWrapper -import com.intellij.settingsSync.SettingsSyncBundle.message -import com.intellij.settingsSync.SettingsSyncLocalStateHolder -import com.intellij.settingsSync.SettingsSyncState -import com.intellij.settingsSync.SettingsSyncStateHolder +import com.intellij.settingsSync.core.SettingsSyncBundle.message +import com.intellij.settingsSync.core.SettingsSyncLocalStateHolder +import com.intellij.settingsSync.core.SettingsSyncState +import com.intellij.settingsSync.core.SettingsSyncStateHolder import java.awt.event.ActionEvent import javax.swing.AbstractAction import javax.swing.Action diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncConfigurable.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncConfigurable.kt similarity index 96% rename from plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncConfigurable.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncConfigurable.kt index 9f5cb9e04b66..0fdf129595ac 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncConfigurable.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncConfigurable.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.config +package com.intellij.settingsSync.core.config import com.intellij.icons.AllIcons @@ -15,15 +15,14 @@ import com.intellij.openapi.ui.* import com.intellij.platform.ide.progress.ModalTaskOwner import com.intellij.platform.ide.progress.TaskCancellation import com.intellij.platform.ide.progress.runWithModalProgressBlocking -import com.intellij.platform.ide.progress.withModalProgress -import com.intellij.settingsSync.* -import com.intellij.settingsSync.SettingsSyncBundle.message -import com.intellij.settingsSync.UpdateResult.* -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder -import com.intellij.settingsSync.communicator.SettingsSyncCommunicatorProvider -import com.intellij.settingsSync.communicator.SettingsSyncUserData -import com.intellij.settingsSync.config.SettingsSyncEnabler.State -import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics +import com.intellij.settingsSync.core.SettingsSyncBundle.message +import com.intellij.settingsSync.core.* +import com.intellij.settingsSync.core.UpdateResult.* +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder +import com.intellij.settingsSync.core.communicator.SettingsSyncCommunicatorProvider +import com.intellij.settingsSync.core.communicator.SettingsSyncUserData +import com.intellij.settingsSync.core.config.SettingsSyncEnabler.State +import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics import com.intellij.ui.components.DropDownLink import com.intellij.ui.dsl.builder.* import com.intellij.ui.dsl.listCellRenderer.groupedTextListCellRenderer @@ -40,8 +39,8 @@ import java.util.concurrent.TimeUnit import javax.swing.* internal class SettingsSyncConfigurable(private val coroutineScope: CoroutineScope) : BoundConfigurable(message("title.settings.sync")), - SettingsSyncEnabler.Listener, - SettingsSyncStatusTracker.Listener { + SettingsSyncEnabler.Listener, + SettingsSyncStatusTracker.Listener { companion object { private val LOG = logger() } @@ -111,7 +110,7 @@ internal class SettingsSyncConfigurable(private val coroutineScope: CoroutineSco }.visibleIf(wasUsedBefore.not().and(hasMultipleProviders)) row { - val defaultProvider = RemoteCommunicatorHolder.getDefaultProvider() + val defaultProvider = RemoteCommunicatorHolder.getDefaultProvider() ?: return@row button(message("config.button.login")) { login(defaultProvider, syncConfigPanel) } diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncEnabler.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncEnabler.kt similarity index 95% rename from plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncEnabler.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncEnabler.kt index 67ba731c8ab5..f3e4f871ab89 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncEnabler.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncEnabler.kt @@ -1,10 +1,10 @@ -package com.intellij.settingsSync.config +package com.intellij.settingsSync.core.config import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.progress.ProgressIndicator import com.intellij.openapi.progress.Task -import com.intellij.settingsSync.* -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder +import com.intellij.settingsSync.core.* +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder import com.intellij.util.EventDispatcher import java.util.* diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncOldConfigurable.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncOldConfigurable.kt similarity index 96% rename from plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncOldConfigurable.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncOldConfigurable.kt index ebaf2daab91b..9a2676ad349e 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncOldConfigurable.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncOldConfigurable.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.config +package com.intellij.settingsSync.core.config import com.intellij.icons.AllIcons import com.intellij.ide.DataManager @@ -13,20 +13,18 @@ import com.intellij.openapi.application.runInEdt import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.options.BoundConfigurable -import com.intellij.openapi.options.Configurable -import com.intellij.openapi.options.ConfigurableProvider import com.intellij.openapi.options.ex.Settings import com.intellij.openapi.progress.ProgressIndicator import com.intellij.openapi.progress.Task import com.intellij.openapi.progress.runBlockingCancellable import com.intellij.openapi.ui.DialogPanel import com.intellij.openapi.ui.Messages -import com.intellij.settingsSync.* -import com.intellij.settingsSync.SettingsSyncBundle.message -import com.intellij.settingsSync.UpdateResult.* -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder +import com.intellij.settingsSync.core.SettingsSyncBundle.message +import com.intellij.settingsSync.core.* +import com.intellij.settingsSync.core.UpdateResult.* +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder //import com.intellij.settingsSync.auth.SettingsSyncAuthService -import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics +import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics import com.intellij.ui.components.ActionLink import com.intellij.ui.dsl.builder.BottomGap import com.intellij.ui.dsl.builder.Cell @@ -254,8 +252,8 @@ internal class SettingsSyncOldConfigurable : BoundConfigurable(message("title.se when (state) { NoFileOnServer, FileDeletedFromServer -> showEnableSyncDialog(null, null) is Success -> showEnableSyncDialog( - state.settingsSnapshot.getState(), - SettingsSyncLocalStateHolder(state.isCrossIdeSyncEnabled), + state.settingsSnapshot.getState(), + SettingsSyncLocalStateHolder(state.isCrossIdeSyncEnabled), ) is Error -> { if (state != SettingsSyncEnabler.State.CANCELLED) { diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncOpenSettingsAction.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncOpenSettingsAction.kt similarity index 90% rename from plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncOpenSettingsAction.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncOpenSettingsAction.kt index 4679d29d1ac7..4ef79a0eb1e3 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncOpenSettingsAction.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncOpenSettingsAction.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.config +package com.intellij.settingsSync.core.config import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.options.ShowSettingsUtil diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncPanelFactory.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncPanelFactory.kt similarity index 97% rename from plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncPanelFactory.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncPanelFactory.kt index 22920220732c..f3f2c073381c 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncPanelFactory.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncPanelFactory.kt @@ -1,12 +1,11 @@ -package com.intellij.settingsSync.config +package com.intellij.settingsSync.core.config import com.intellij.openapi.application.ApplicationNamesInfo import com.intellij.openapi.components.SettingsCategory -import com.intellij.openapi.observable.properties.AtomicBooleanProperty import com.intellij.openapi.ui.DialogPanel import com.intellij.openapi.ui.popup.JBPopupFactory -import com.intellij.settingsSync.* -import com.intellij.settingsSync.SettingsSyncBundle.message +import com.intellij.settingsSync.core.SettingsSyncBundle.message +import com.intellij.settingsSync.core.* import com.intellij.ui.CheckBoxList import com.intellij.ui.CheckBoxListListener import com.intellij.ui.SeparatorComponent diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncStatusAction.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncStatusAction.kt similarity index 83% rename from plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncStatusAction.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncStatusAction.kt index a842370bc74d..7dd7a3da6e6b 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncStatusAction.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncStatusAction.kt @@ -1,15 +1,13 @@ -package com.intellij.settingsSync.config +package com.intellij.settingsSync.core.config import com.intellij.icons.AllIcons import com.intellij.ide.actions.SettingsEntryPointAction import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.actionSystem.AnActionEvent -import com.intellij.settingsSync.SettingsSyncBundle.message -import com.intellij.settingsSync.SettingsSyncSettings -import com.intellij.settingsSync.SettingsSyncStatusTracker -import com.intellij.settingsSync.auth.SettingsSyncAuthService -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder -import com.intellij.settingsSync.isSettingsSyncEnabledByKey +import com.intellij.settingsSync.core.SettingsSyncBundle.message +import com.intellij.settingsSync.core.SettingsSyncSettings +import com.intellij.settingsSync.core.SettingsSyncStatusTracker +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder import com.intellij.ui.BadgeIconSupplier import com.intellij.util.ui.JBUI import com.intellij.util.ui.UIUtil @@ -41,10 +39,6 @@ internal class SettingsSyncStatusAction : SettingsSyncOpenSettingsAction(), override fun update(e: AnActionEvent) { val p = e.presentation - if (!isSettingsSyncEnabledByKey()) { - p.isEnabledAndVisible = false - return - } val status = getStatus() when (status) { SyncStatus.ON -> diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncSubcategories.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncSubcategories.kt similarity index 93% rename from plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncSubcategories.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncSubcategories.kt index c31412149114..6e75d8953f7a 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncSubcategories.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncSubcategories.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.config +package com.intellij.settingsSync.core.config import org.jetbrains.annotations.Nls diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/SyncCategoryHolder.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncCategoryHolder.kt similarity index 95% rename from plugins/settings-sync/src/com/intellij/settingsSync/config/SyncCategoryHolder.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncCategoryHolder.kt index b828e58d97da..89f62e3b6de5 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/SyncCategoryHolder.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncCategoryHolder.kt @@ -1,9 +1,9 @@ -package com.intellij.settingsSync.config +package com.intellij.settingsSync.core.config import com.intellij.openapi.components.SettingsCategory import com.intellij.openapi.components.SettingsCategory.* -import com.intellij.settingsSync.SettingsSyncState -import com.intellij.settingsSync.SettingsSyncBundle.message +import com.intellij.settingsSync.core.SettingsSyncState +import com.intellij.settingsSync.core.SettingsSyncBundle.message import org.jetbrains.annotations.Nls import java.util.* diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/SyncPluginsGroup.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncPluginsGroup.kt similarity index 88% rename from plugins/settings-sync/src/com/intellij/settingsSync/config/SyncPluginsGroup.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncPluginsGroup.kt index ec71b05f4511..138a3f0c96ed 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/SyncPluginsGroup.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncPluginsGroup.kt @@ -1,9 +1,9 @@ -package com.intellij.settingsSync.config +package com.intellij.settingsSync.core.config import com.intellij.ide.plugins.PluginManagerCore import com.intellij.openapi.components.SettingsCategory -import com.intellij.settingsSync.SettingsSyncBundle.message -import com.intellij.settingsSync.plugins.SettingsSyncPluginCategoryFinder +import com.intellij.settingsSync.core.SettingsSyncBundle.message +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginCategoryFinder import org.jetbrains.annotations.Nls internal const val BUNDLED_PLUGINS_ID = "bundled" diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/SyncUiGroup.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncUiGroup.kt similarity index 82% rename from plugins/settings-sync/src/com/intellij/settingsSync/config/SyncUiGroup.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncUiGroup.kt index f3f253911832..8731ea29fc20 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/SyncUiGroup.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncUiGroup.kt @@ -1,6 +1,6 @@ -package com.intellij.settingsSync.config +package com.intellij.settingsSync.core.config -import com.intellij.settingsSync.SettingsSyncBundle +import com.intellij.settingsSync.core.SettingsSyncBundle const val EDITOR_FONT_SUBCATEGORY_ID = "editorFont" diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryLogUi.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryLogUi.kt similarity index 92% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryLogUi.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryLogUi.kt index 486542b0b99c..ac3d2b44a5de 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryLogUi.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryLogUi.kt @@ -1,9 +1,8 @@ -package com.intellij.settingsSync.git +package com.intellij.settingsSync.core.git import com.intellij.vcs.log.VcsLogFilterUi import com.intellij.vcs.log.data.VcsLogData import com.intellij.vcs.log.impl.VcsLogUiProperties -import com.intellij.vcs.log.impl.VcsLogUiPropertiesImpl import com.intellij.vcs.log.ui.VcsLogUiBase import com.intellij.vcs.log.ui.table.VcsLogCommitList import com.intellij.vcs.log.visible.VisiblePack diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryLogUiFactory.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryLogUiFactory.kt similarity index 95% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryLogUiFactory.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryLogUiFactory.kt index 6f99a0424a81..4ed1f9357aac 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryLogUiFactory.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryLogUiFactory.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.git +package com.intellij.settingsSync.core.git import com.intellij.openapi.project.Project import com.intellij.vcs.log.data.VcsLogData diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryPanel.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryPanel.kt similarity index 79% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryPanel.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryPanel.kt index 5d7bfeb86fc8..427ecc77572b 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryPanel.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryPanel.kt @@ -1,7 +1,7 @@ -package com.intellij.settingsSync.git +package com.intellij.settingsSync.core.git -import com.intellij.settingsSync.git.table.SettingsHistoryTable -import com.intellij.settingsSync.git.table.SettingsHistoryTableModel +import com.intellij.settingsSync.core.git.table.SettingsHistoryTable +import com.intellij.settingsSync.core.git.table.SettingsHistoryTableModel import com.intellij.ui.components.JBScrollPane import com.intellij.vcs.log.data.VcsLogData import com.intellij.vcs.log.visible.VisiblePackRefresher diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryToolWindowFactory.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryToolWindowFactory.kt similarity index 97% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryToolWindowFactory.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryToolWindowFactory.kt index e50b2a68fd0c..53cbc765f4e2 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryToolWindowFactory.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryToolWindowFactory.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.git +package com.intellij.settingsSync.core.git import com.intellij.icons.AllIcons import com.intellij.openapi.application.ApplicationManager @@ -13,7 +13,7 @@ import com.intellij.openapi.wm.ToolWindow import com.intellij.openapi.wm.ToolWindowAnchor import com.intellij.openapi.wm.ToolWindowFactory import com.intellij.openapi.wm.ToolWindowManager -import com.intellij.settingsSync.* +import com.intellij.settingsSync.core.* import git4idea.GitVcs import git4idea.log.showExternalGitLogInToolwindow import kotlinx.coroutines.CoroutineScope diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryUiProperties.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryUiProperties.kt similarity index 95% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryUiProperties.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryUiProperties.kt index e80ae1f15f2b..8b730858754a 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryUiProperties.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryUiProperties.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.git +package com.intellij.settingsSync.core.git import com.intellij.openapi.Disposable import com.intellij.vcs.log.impl.VcsLogUiProperties diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsSyncHistoryAction.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsSyncHistoryAction.kt similarity index 90% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsSyncHistoryAction.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsSyncHistoryAction.kt index 851f8e1f2d9e..b6f37d730cfe 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsSyncHistoryAction.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsSyncHistoryAction.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.git +package com.intellij.settingsSync.core.git import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.actionSystem.AnActionEvent @@ -7,9 +7,8 @@ import com.intellij.openapi.ui.Messages import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.wm.ToolWindowManager -import com.intellij.settingsSync.SettingsSyncBundle -import com.intellij.settingsSync.SettingsSyncMain -import com.intellij.settingsSync.isSettingsSyncEnabledByKey +import com.intellij.settingsSync.core.SettingsSyncBundle +import com.intellij.settingsSync.core.SettingsSyncMain import git4idea.GitVcs import git4idea.log.showExternalGitLogInToolwindow import java.util.function.Supplier diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/record/ChangeRecord.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/record/ChangeRecord.kt similarity index 97% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/record/ChangeRecord.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/record/ChangeRecord.kt index 7b83c4c2273f..cddd8670ed63 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/record/ChangeRecord.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/record/ChangeRecord.kt @@ -1,11 +1,11 @@ -package com.intellij.settingsSync.git.record +package com.intellij.settingsSync.core.git.record import com.intellij.openapi.components.SettingsCategory import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.vcs.changes.Change -import com.intellij.settingsSync.GitSettingsLog -import com.intellij.settingsSync.SettingsSyncBundle -import com.intellij.settingsSync.getRoamableCategory +import com.intellij.settingsSync.core.GitSettingsLog +import com.intellij.settingsSync.core.SettingsSyncBundle +import com.intellij.settingsSync.core.getRoamableCategory import com.intellij.vcs.log.VcsFullCommitDetails import java.text.DateFormat import java.util.* diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/record/RecordService.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/record/RecordService.kt similarity index 90% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/record/RecordService.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/record/RecordService.kt index ac90199451a8..b45fef3ee37a 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/record/RecordService.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/record/RecordService.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.git.record +package com.intellij.settingsSync.core.git.record import com.intellij.vcs.log.VcsFullCommitDetails diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryCellRenderer.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryCellRenderer.kt similarity index 94% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryCellRenderer.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryCellRenderer.kt index c33a9d80c2c3..c7b8800055d1 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryCellRenderer.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryCellRenderer.kt @@ -1,9 +1,9 @@ -package com.intellij.settingsSync.git.renderers +package com.intellij.settingsSync.core.git.renderers -import com.intellij.settingsSync.git.table.FileRow -import com.intellij.settingsSync.git.table.SeparatorRow -import com.intellij.settingsSync.git.table.SettingsHistoryTable -import com.intellij.settingsSync.git.table.SettingsHistoryTableRow +import com.intellij.settingsSync.core.git.table.FileRow +import com.intellij.settingsSync.core.git.table.SeparatorRow +import com.intellij.settingsSync.core.git.table.SettingsHistoryTable +import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow import com.intellij.ui.ColoredTableCellRenderer import com.intellij.ui.ExperimentalUI import com.intellij.ui.SimpleTextAttributes diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryEmptyCellRenderer.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryEmptyCellRenderer.kt similarity index 70% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryEmptyCellRenderer.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryEmptyCellRenderer.kt index 334a53a68d83..62191794313a 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryEmptyCellRenderer.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryEmptyCellRenderer.kt @@ -1,7 +1,7 @@ -package com.intellij.settingsSync.git.renderers +package com.intellij.settingsSync.core.git.renderers -import com.intellij.settingsSync.git.table.SettingsHistoryTable -import com.intellij.settingsSync.git.table.SettingsHistoryTableRow +import com.intellij.settingsSync.core.git.table.SettingsHistoryTable +import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow internal class SettingsHistoryEmptyCellRenderer : SettingsHistoryCellRenderer() { override fun customizeHistoryCellRenderer(table: SettingsHistoryTable, diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryFileCellRenderer.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryFileCellRenderer.kt similarity index 80% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryFileCellRenderer.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryFileCellRenderer.kt index 04ce34b708cc..d63977a80423 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryFileCellRenderer.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryFileCellRenderer.kt @@ -1,8 +1,8 @@ -package com.intellij.settingsSync.git.renderers +package com.intellij.settingsSync.core.git.renderers -import com.intellij.settingsSync.git.table.FileRow -import com.intellij.settingsSync.git.table.SettingsHistoryTable -import com.intellij.settingsSync.git.table.SettingsHistoryTableRow +import com.intellij.settingsSync.core.git.table.FileRow +import com.intellij.settingsSync.core.git.table.SettingsHistoryTable +import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow import com.intellij.ui.SimpleTextAttributes import com.intellij.util.IconUtil import com.intellij.util.ui.JBUI diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryNodeCellRenderer.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryNodeCellRenderer.kt similarity index 89% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryNodeCellRenderer.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryNodeCellRenderer.kt index bee63755c9d6..8120f632bbaf 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryNodeCellRenderer.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryNodeCellRenderer.kt @@ -1,11 +1,11 @@ -package com.intellij.settingsSync.git.renderers +package com.intellij.settingsSync.core.git.renderers -import com.intellij.settingsSync.SettingsSyncBundle -import com.intellij.settingsSync.git.record.ChangeRecord -import com.intellij.settingsSync.git.record.HistoryRecord -import com.intellij.settingsSync.git.table.SettingsHistoryTable -import com.intellij.settingsSync.git.table.SettingsHistoryTableRow -import com.intellij.settingsSync.git.table.TitleRow +import com.intellij.settingsSync.core.SettingsSyncBundle +import com.intellij.settingsSync.core.git.record.ChangeRecord +import com.intellij.settingsSync.core.git.record.HistoryRecord +import com.intellij.settingsSync.core.git.table.SettingsHistoryTable +import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow +import com.intellij.settingsSync.core.git.table.TitleRow import com.intellij.util.ui.UIUtil import icons.SettingsSyncIcons import org.jetbrains.annotations.Nls diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryRestoreCellRenderer.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryRestoreCellRenderer.kt similarity index 78% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryRestoreCellRenderer.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryRestoreCellRenderer.kt index 5d07299789fc..4d17ceeebc36 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryRestoreCellRenderer.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryRestoreCellRenderer.kt @@ -1,11 +1,11 @@ -package com.intellij.settingsSync.git.renderers +package com.intellij.settingsSync.core.git.renderers import com.intellij.icons.AllIcons -import com.intellij.settingsSync.SettingsSyncBundle -import com.intellij.settingsSync.git.record.HistoryRecord -import com.intellij.settingsSync.git.table.SettingsHistoryTable -import com.intellij.settingsSync.git.table.SettingsHistoryTableRow -import com.intellij.settingsSync.git.table.TitleRow +import com.intellij.settingsSync.core.SettingsSyncBundle +import com.intellij.settingsSync.core.git.record.HistoryRecord +import com.intellij.settingsSync.core.git.table.SettingsHistoryTable +import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow +import com.intellij.settingsSync.core.git.table.TitleRow import com.intellij.util.ui.JBUI internal class SettingsHistoryRestoreCellRenderer : SettingsHistoryCellRenderer() { diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistorySubtitleRenderer.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistorySubtitleRenderer.kt similarity index 84% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistorySubtitleRenderer.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistorySubtitleRenderer.kt index 20e8f52112c2..903470fa33f6 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistorySubtitleRenderer.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistorySubtitleRenderer.kt @@ -1,9 +1,9 @@ -package com.intellij.settingsSync.git.renderers +package com.intellij.settingsSync.core.git.renderers import com.intellij.icons.AllIcons -import com.intellij.settingsSync.git.record.ChangeRecord -import com.intellij.settingsSync.git.table.SettingsHistoryTable -import com.intellij.settingsSync.git.table.SettingsHistoryTableRow +import com.intellij.settingsSync.core.git.record.ChangeRecord +import com.intellij.settingsSync.core.git.table.SettingsHistoryTable +import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow import com.intellij.ui.SimpleTextAttributes import com.intellij.util.ui.JBUI diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryTitleCellRenderer.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryTitleCellRenderer.kt similarity index 92% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryTitleCellRenderer.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryTitleCellRenderer.kt index 9f4ad95f5719..5cdfc7e170b9 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/renderers/SettingsHistoryTitleCellRenderer.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryTitleCellRenderer.kt @@ -1,7 +1,7 @@ -package com.intellij.settingsSync.git.renderers +package com.intellij.settingsSync.core.git.renderers -import com.intellij.settingsSync.git.table.SettingsHistoryTable -import com.intellij.settingsSync.git.table.SettingsHistoryTableRow +import com.intellij.settingsSync.core.git.table.SettingsHistoryTable +import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow import com.intellij.ui.ExpandableItemsHandler import com.intellij.ui.SimpleTextAttributes import com.intellij.util.ui.UIUtil diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/ExpandedRowFilter.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/ExpandedRowFilter.kt similarity index 93% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/ExpandedRowFilter.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/ExpandedRowFilter.kt index c8a3d8d8f3af..e3b986501d81 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/ExpandedRowFilter.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/ExpandedRowFilter.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.git.table +package com.intellij.settingsSync.core.git.table import javax.swing.RowFilter diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/SettingsHistoryTable.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTable.kt similarity index 91% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/SettingsHistoryTable.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTable.kt index d5b1688e75fa..5813431df1c4 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/SettingsHistoryTable.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTable.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.git.table +package com.intellij.settingsSync.core.git.table import com.intellij.diff.util.DiffUserDataKeysEx import com.intellij.openapi.ListSelection @@ -9,11 +9,16 @@ import com.intellij.openapi.vcs.changes.ChangesUtil import com.intellij.openapi.vcs.changes.actions.diff.ShowDiffAction import com.intellij.openapi.vcs.changes.actions.diff.ShowDiffContext import com.intellij.openapi.vfs.VirtualFile -import com.intellij.settingsSync.SettingsSyncBundle -import com.intellij.settingsSync.SettingsSyncEvents -import com.intellij.settingsSync.SyncSettingsEvent -import com.intellij.settingsSync.git.record.HistoryRecord -import com.intellij.settingsSync.git.renderers.* +import com.intellij.settingsSync.core.SettingsSyncBundle +import com.intellij.settingsSync.core.SettingsSyncEvents +import com.intellij.settingsSync.core.SyncSettingsEvent +import com.intellij.settingsSync.core.git.record.HistoryRecord +import com.intellij.settingsSync.core.git.renderers.* +import com.intellij.settingsSync.core.git.renderers.SettingsHistoryEmptyCellRenderer +import com.intellij.settingsSync.core.git.renderers.SettingsHistoryFileCellRenderer +import com.intellij.settingsSync.core.git.renderers.SettingsHistoryRestoreCellRenderer +import com.intellij.settingsSync.core.git.renderers.SettingsHistorySubtitleRenderer +import com.intellij.settingsSync.core.git.renderers.SettingsHistoryTitleCellRenderer import com.intellij.ui.SingleSelectionModel import com.intellij.ui.hover.TableHoverListener import com.intellij.ui.render.RenderingUtil diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/SettingsHistoryTableModel.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTableModel.kt similarity index 95% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/SettingsHistoryTableModel.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTableModel.kt index 447c58b9bb00..9447447443d7 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/SettingsHistoryTableModel.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTableModel.kt @@ -1,11 +1,11 @@ -package com.intellij.settingsSync.git.table +package com.intellij.settingsSync.core.git.table import com.intellij.openapi.application.runInEdt import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.vcs.VcsException -import com.intellij.settingsSync.git.record.ChangeRecord -import com.intellij.settingsSync.git.record.HistoryRecord -import com.intellij.settingsSync.git.record.RecordService +import com.intellij.settingsSync.core.git.record.ChangeRecord +import com.intellij.settingsSync.core.git.record.HistoryRecord +import com.intellij.settingsSync.core.git.record.RecordService import com.intellij.vcs.log.Hash import com.intellij.vcs.log.VcsFullCommitDetails import com.intellij.vcs.log.VcsLogDataProvider diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/SettingsHistoryTableRow.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTableRow.kt similarity index 83% rename from plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/SettingsHistoryTableRow.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTableRow.kt index 2689ca02076a..9a13c9ee1a09 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/table/SettingsHistoryTableRow.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTableRow.kt @@ -1,8 +1,8 @@ -package com.intellij.settingsSync.git.table +package com.intellij.settingsSync.core.git.table import com.intellij.openapi.vcs.changes.Change import com.intellij.openapi.vfs.VirtualFile -import com.intellij.settingsSync.git.record.ChangeRecord +import com.intellij.settingsSync.core.git.record.ChangeRecord internal sealed class SettingsHistoryTableRow(val record: ChangeRecord) diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/migration/CloudConfigToSettingsSyncMigration.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/CloudConfigToSettingsSyncMigration.kt similarity index 98% rename from plugins/settings-sync/src/com/intellij/settingsSync/migration/CloudConfigToSettingsSyncMigration.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/CloudConfigToSettingsSyncMigration.kt index fc0db9ebd928..50bdef15d964 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/migration/CloudConfigToSettingsSyncMigration.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/CloudConfigToSettingsSyncMigration.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.migration +package com.intellij.settingsSync.core.migration import com.intellij.configurationStore.getPerOsSettingsStorageFolderName import com.intellij.ide.plugins.DisabledPluginsState @@ -9,7 +9,8 @@ import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.text.StringUtil import com.intellij.settingsSync.* -import com.intellij.settingsSync.config.EDITOR_FONT_SUBCATEGORY_ID +import com.intellij.settingsSync.core.* +import com.intellij.settingsSync.core.config.EDITOR_FONT_SUBCATEGORY_ID import java.io.FileNotFoundException import java.io.IOException import java.nio.file.Files diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/migration/ConfigInfo.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/ConfigInfo.kt similarity index 78% rename from plugins/settings-sync/src/com/intellij/settingsSync/migration/ConfigInfo.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/ConfigInfo.kt index 4af9534ca9b3..d44cb97f5d22 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/migration/ConfigInfo.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/ConfigInfo.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.migration +package com.intellij.settingsSync.core.migration import org.jetbrains.annotations.Nls import org.jetbrains.annotations.NonNls diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/migration/ConfigState.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/ConfigState.kt similarity index 83% rename from plugins/settings-sync/src/com/intellij/settingsSync/migration/ConfigState.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/ConfigState.kt index 55473047e9f1..0843e72c8d97 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/migration/ConfigState.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/ConfigState.kt @@ -1,8 +1,7 @@ -package com.intellij.settingsSync.migration +package com.intellij.settingsSync.core.migration import com.intellij.ide.IdeBundle -import com.intellij.settingsSync.SettingsSyncBundle -import org.jetbrains.annotations.Nls +import com.intellij.settingsSync.core.SettingsSyncBundle /** * The synchronization state of the given group of settings. diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/migration/SettingsRepositoryToSettingsSyncMigration.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/SettingsRepositoryToSettingsSyncMigration.kt similarity index 91% rename from plugins/settings-sync/src/com/intellij/settingsSync/migration/SettingsRepositoryToSettingsSyncMigration.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/SettingsRepositoryToSettingsSyncMigration.kt index 34b7cf3eaba3..d38d7a18aed0 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/migration/SettingsRepositoryToSettingsSyncMigration.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/SettingsRepositoryToSettingsSyncMigration.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.migration +package com.intellij.settingsSync.core.migration import com.intellij.codeInsight.template.impl.TemplateSettings import com.intellij.configurationStore.ComponentStoreImpl @@ -14,11 +14,13 @@ import com.intellij.openapi.components.serviceAsync import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.util.io.FileUtil -import com.intellij.settingsSync.* -import com.intellij.settingsSync.plugins.PluginManagerProxy -import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics -import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics.SettingsRepositoryMigrationNotificationAction.INSTALL_SETTINGS_REPOSITORY -import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics.SettingsRepositoryMigrationNotificationAction.USE_NEW_SETTINGS_SYNC +import com.intellij.settingsSync.core.* +import com.intellij.settingsSync.core.NOTIFICATION_GROUP +import com.intellij.settingsSync.core.SettingsSyncIdeMediatorImpl +import com.intellij.settingsSync.core.plugins.PluginManagerProxy +import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics +import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics.SettingsRepositoryMigrationNotificationAction.INSTALL_SETTINGS_REPOSITORY +import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics.SettingsRepositoryMigrationNotificationAction.USE_NEW_SETTINGS_SYNC import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import java.nio.file.FileVisitResult diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/migration/StatusInfo.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/StatusInfo.kt similarity index 89% rename from plugins/settings-sync/src/com/intellij/settingsSync/migration/StatusInfo.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/StatusInfo.kt index 3a7c016391aa..a0ac4190354d 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/migration/StatusInfo.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/StatusInfo.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.migration +package com.intellij.settingsSync.core.migration /** * @author Alexander Lobas diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/notification/NotificationService.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/notification/NotificationService.kt similarity index 75% rename from plugins/settings-sync/src/com/intellij/settingsSync/notification/NotificationService.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/notification/NotificationService.kt index a1bca59d06dd..c08ee249359d 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/notification/NotificationService.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/notification/NotificationService.kt @@ -1,7 +1,7 @@ -package com.intellij.settingsSync.notification +package com.intellij.settingsSync.core.notification import com.intellij.openapi.components.service -import com.intellij.settingsSync.RestartReason +import com.intellij.settingsSync.core.RestartReason internal interface NotificationService { companion object { diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/notification/NotificationServiceImpl.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/notification/NotificationServiceImpl.kt similarity index 93% rename from plugins/settings-sync/src/com/intellij/settingsSync/notification/NotificationServiceImpl.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/notification/NotificationServiceImpl.kt index 28a9bd087293..7f401a669728 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/notification/NotificationServiceImpl.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/notification/NotificationServiceImpl.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.notification +package com.intellij.settingsSync.core.notification import com.intellij.ide.util.propComponentProperty import com.intellij.notification.Notification @@ -8,9 +8,9 @@ import com.intellij.notification.NotificationType import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationNamesInfo import com.intellij.openapi.application.ex.ApplicationEx -import com.intellij.settingsSync.NOTIFICATION_GROUP -import com.intellij.settingsSync.RestartReason -import com.intellij.settingsSync.SettingsSyncBundle +import com.intellij.settingsSync.core.NOTIFICATION_GROUP +import com.intellij.settingsSync.core.RestartReason +import com.intellij.settingsSync.core.SettingsSyncBundle internal class NotificationServiceImpl: NotificationService { override fun notifySateRestoreFailed() { diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/AbstractPluginManagerProxy.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/AbstractPluginManagerProxy.kt similarity index 98% rename from plugins/settings-sync/src/com/intellij/settingsSync/plugins/AbstractPluginManagerProxy.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/AbstractPluginManagerProxy.kt index 052e22836cbf..462aa5332d87 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/AbstractPluginManagerProxy.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/AbstractPluginManagerProxy.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.plugins +package com.intellij.settingsSync.core.plugins import com.intellij.ide.plugins.IdeaPluginDescriptor import com.intellij.ide.plugins.PluginEnabler diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/CorePluginManagerProxy.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/CorePluginManagerProxy.kt similarity index 96% rename from plugins/settings-sync/src/com/intellij/settingsSync/plugins/CorePluginManagerProxy.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/CorePluginManagerProxy.kt index 32a0d67c02f8..07aa290a3da1 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/CorePluginManagerProxy.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/CorePluginManagerProxy.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.plugins +package com.intellij.settingsSync.core.plugins import com.intellij.ide.plugins.* import com.intellij.openapi.Disposable diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/PluginManagerProxy.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/PluginManagerProxy.kt similarity index 95% rename from plugins/settings-sync/src/com/intellij/settingsSync/plugins/PluginManagerProxy.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/PluginManagerProxy.kt index 1d32b1b09d10..51ebfd30639c 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/PluginManagerProxy.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/PluginManagerProxy.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.plugins +package com.intellij.settingsSync.core.plugins import com.intellij.ide.plugins.IdeaPluginDescriptor import com.intellij.ide.plugins.PluginEnableStateChangedListener diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginCategoryFinder.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginCategoryFinder.kt similarity index 85% rename from plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginCategoryFinder.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginCategoryFinder.kt index bebe1341deb3..7c14f352048d 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginCategoryFinder.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginCategoryFinder.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.plugins +package com.intellij.settingsSync.core.plugins import com.intellij.ide.plugins.IdeaPluginDescriptor import com.intellij.ide.plugins.IdeaPluginDescriptorImpl @@ -16,7 +16,7 @@ internal object SettingsSyncPluginCategoryFinder { ) fun getPluginCategory(descriptor: IdeaPluginDescriptor): SettingsCategory { - if (UI_CATEGORIES.contains(descriptor.category)|| containsOnlyUIExtensions(descriptor)) { + if (UI_CATEGORIES.contains(descriptor.category) || containsOnlyUIExtensions(descriptor)) { return SettingsCategory.UI } return SettingsCategory.PLUGINS diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginInstaller.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginInstaller.kt similarity index 76% rename from plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginInstaller.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginInstaller.kt index 74364770a157..e677fe1f3b7f 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginInstaller.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginInstaller.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.plugins +package com.intellij.settingsSync.core.plugins import com.intellij.openapi.extensions.PluginId diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginInstallerImpl.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginInstallerImpl.kt similarity index 93% rename from plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginInstallerImpl.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginInstallerImpl.kt index 2806238d2b64..ee11898a200f 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginInstallerImpl.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginInstallerImpl.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.plugins +package com.intellij.settingsSync.core.plugins import com.intellij.ide.plugins.marketplace.MarketplaceRequests import com.intellij.openapi.application.EDT @@ -13,7 +13,10 @@ import com.intellij.platform.ide.progress.ModalTaskOwner import com.intellij.platform.ide.progress.TaskCancellation import com.intellij.platform.ide.progress.withBackgroundProgress import com.intellij.platform.ide.progress.withModalProgress -import com.intellij.settingsSync.* +import com.intellij.settingsSync.core.RestartForPluginInstall +import com.intellij.settingsSync.core.SettingsSyncBundle +import com.intellij.settingsSync.core.SettingsSyncEvents +import com.intellij.settingsSync.core.SettingsSyncSettings import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginManager.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginManager.kt similarity index 97% rename from plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginManager.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginManager.kt index 6859698423fc..266a6b1a0ae7 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginManager.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginManager.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.plugins +package com.intellij.settingsSync.core.plugins import com.intellij.ide.plugins.IdeaPluginDescriptor import com.intellij.ide.plugins.PluginEnableStateChangedListener @@ -11,9 +11,12 @@ import com.intellij.openapi.components.Service import com.intellij.openapi.components.SettingsCategory import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.extensions.PluginId -import com.intellij.settingsSync.* -import com.intellij.settingsSync.config.BUNDLED_PLUGINS_ID -import com.intellij.settingsSync.plugins.SettingsSyncPluginsState.PluginData +import com.intellij.settingsSync.core.* +import com.intellij.settingsSync.core.RestartForPluginDisable +import com.intellij.settingsSync.core.RestartForPluginEnable +import com.intellij.settingsSync.core.config.BUNDLED_PLUGINS_ID +import com.intellij.settingsSync.core.enabledOrDisabled +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState.PluginData import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.cancel import kotlinx.coroutines.launch @@ -363,7 +366,7 @@ internal class SettingsSyncPluginManager(private val cs: CoroutineScope) : Dispo } if (plugin.isBundled && enable) { newPlugins.remove(pluginDescriptor.pluginId) - LOG.info("Bundled plugin ${pluginDescriptor.pluginId} is ${ed(enable)}d. Will remove its info from ${com.intellij.settingsSync.SettingsSnapshotZipSerializer.PLUGINS}") + LOG.info("Bundled plugin ${pluginDescriptor.pluginId} is ${ed(enable)}d. Will remove its info from ${SettingsSnapshotZipSerializer.PLUGINS}") } else { newPlugins[pluginDescriptor.pluginId] = getPluginData(pluginDescriptor, enable) diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginsState.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginsState.kt similarity index 93% rename from plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginsState.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginsState.kt index e42499bacb5b..90dd9ef44df5 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/plugins/SettingsSyncPluginsState.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginsState.kt @@ -1,8 +1,8 @@ -package com.intellij.settingsSync.plugins +package com.intellij.settingsSync.core.plugins import com.intellij.openapi.components.SettingsCategory import com.intellij.openapi.extensions.PluginId -import com.intellij.settingsSync.plugins.SettingsSyncPluginsState.PluginData +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState.PluginData import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.descriptors.PrimitiveKind @@ -14,7 +14,7 @@ import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal @Serializable -data class SettingsSyncPluginsState(val plugins: Map<@Serializable(with=PluginIdSerializer::class) PluginId, PluginData>) { +data class SettingsSyncPluginsState(val plugins: Map<@Serializable(with= PluginIdSerializer::class) PluginId, PluginData>) { @Serializable data class PluginData( val enabled: Boolean = true, diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/statistics/SettingsSyncEventsStatistics.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/statistics/SettingsSyncEventsStatistics.kt similarity index 97% rename from plugins/settings-sync/src/com/intellij/settingsSync/statistics/SettingsSyncEventsStatistics.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/statistics/SettingsSyncEventsStatistics.kt index 214902b2835e..f2ad79a05585 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/statistics/SettingsSyncEventsStatistics.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/statistics/SettingsSyncEventsStatistics.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.statistics +package com.intellij.settingsSync.core.statistics import com.intellij.internal.statistic.eventLog.EventLogGroup import com.intellij.internal.statistic.eventLog.events.EventFields diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/statistics/SettingsSyncStateStatistics.kt b/platform/settings-sync-core/src/com/intellij/settingsSync/core/statistics/SettingsSyncStateStatistics.kt similarity index 87% rename from plugins/settings-sync/src/com/intellij/settingsSync/statistics/SettingsSyncStateStatistics.kt rename to platform/settings-sync-core/src/com/intellij/settingsSync/core/statistics/SettingsSyncStateStatistics.kt index 4d989d6a411b..056023ee4137 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/statistics/SettingsSyncStateStatistics.kt +++ b/platform/settings-sync-core/src/com/intellij/settingsSync/core/statistics/SettingsSyncStateStatistics.kt @@ -1,13 +1,13 @@ -package com.intellij.settingsSync.statistics +package com.intellij.settingsSync.core.statistics import com.intellij.internal.statistic.beans.MetricEvent import com.intellij.internal.statistic.eventLog.EventLogGroup import com.intellij.internal.statistic.eventLog.events.EventFields import com.intellij.internal.statistic.service.fus.collectors.ApplicationUsagesCollector import com.intellij.openapi.components.SettingsCategory -import com.intellij.settingsSync.SettingsSyncSettings -import com.intellij.settingsSync.config.BUNDLED_PLUGINS_ID -import com.intellij.settingsSync.config.EDITOR_FONT_SUBCATEGORY_ID +import com.intellij.settingsSync.core.SettingsSyncSettings +import com.intellij.settingsSync.core.config.BUNDLED_PLUGINS_ID +import com.intellij.settingsSync.core.config.EDITOR_FONT_SUBCATEGORY_ID class SettingsSyncStateStatistics : ApplicationUsagesCollector() { diff --git a/plugins/settings-sync/src/icons/SettingsSyncIcons.java b/platform/settings-sync-core/src/icons/SettingsSyncIcons.java similarity index 100% rename from plugins/settings-sync/src/icons/SettingsSyncIcons.java rename to platform/settings-sync-core/src/icons/SettingsSyncIcons.java diff --git a/plugins/settings-sync/test-resources/.env b/platform/settings-sync-core/test-resources/.env similarity index 100% rename from plugins/settings-sync/test-resources/.env rename to platform/settings-sync-core/test-resources/.env diff --git a/plugins/settings-sync/test-resources/docker-compose.yaml b/platform/settings-sync-core/test-resources/docker-compose.yaml similarity index 100% rename from plugins/settings-sync/test-resources/docker-compose.yaml rename to platform/settings-sync-core/test-resources/docker-compose.yaml diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/BasePluginManagerTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/BasePluginManagerTest.kt similarity index 93% rename from plugins/settings-sync/tests/com/intellij/settingsSync/BasePluginManagerTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/BasePluginManagerTest.kt index 7a0db3b12890..dbc9151fdebb 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/BasePluginManagerTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/BasePluginManagerTest.kt @@ -1,20 +1,18 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.Disposable import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.SettingsCategory import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.util.Disposer -import com.intellij.settingsSync.plugins.PluginManagerProxy -import com.intellij.settingsSync.plugins.SettingsSyncPluginManager -import com.intellij.settingsSync.plugins.SettingsSyncPluginsState -import com.intellij.settingsSync.plugins.SettingsSyncPluginsState.PluginData +import com.intellij.settingsSync.core.plugins.PluginManagerProxy +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginManager +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState.PluginData import com.intellij.testFramework.junit5.TestApplication import com.intellij.testFramework.junit5.TestDisposable import com.intellij.testFramework.replaceService import com.intellij.util.containers.mapSmartSet -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.* import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotNull diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/GitSettingsLogTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/GitSettingsLogTest.kt similarity index 99% rename from plugins/settings-sync/tests/com/intellij/settingsSync/GitSettingsLogTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/GitSettingsLogTest.kt index f9613fa27bca..69f179e6e355 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/GitSettingsLogTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/GitSettingsLogTest.kt @@ -1,10 +1,11 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.idea.TestFor import com.intellij.openapi.components.SettingsCategory import com.intellij.openapi.util.Disposer -import com.intellij.settingsSync.SettingsSnapshot.AppInfo -import com.intellij.settingsSync.communicator.SettingsSyncUserData +import com.intellij.openapi.util.io.FileUtil +import com.intellij.settingsSync.core.SettingsSnapshot.AppInfo +import com.intellij.settingsSync.core.communicator.SettingsSyncUserData import com.intellij.testFramework.ApplicationRule import com.intellij.testFramework.DisposableRule import com.intellij.testFramework.TemporaryDirectory diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/MatrixIDEStartPluginManagerTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/MatrixIDEStartPluginManagerTest.kt similarity index 97% rename from plugins/settings-sync/tests/com/intellij/settingsSync/MatrixIDEStartPluginManagerTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/MatrixIDEStartPluginManagerTest.kt index dbe92dd64903..6b0784eb0049 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/MatrixIDEStartPluginManagerTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/MatrixIDEStartPluginManagerTest.kt @@ -1,10 +1,8 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core -import org.junit.Test import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments import org.junit.jupiter.params.provider.MethodSource -import org.junit.runners.Parameterized import java.util.stream.Stream class MatrixIDEStartPluginManagerTest : BasePluginManagerTest() { diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/MergePluginsStateTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/MergePluginsStateTest.kt similarity index 88% rename from plugins/settings-sync/tests/com/intellij/settingsSync/MergePluginsStateTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/MergePluginsStateTest.kt index 7da68426e77a..63020252fc41 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/MergePluginsStateTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/MergePluginsStateTest.kt @@ -1,8 +1,8 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.extensions.PluginId -import com.intellij.settingsSync.plugins.SettingsSyncPluginsState -import com.intellij.settingsSync.plugins.SettingsSyncPluginsStateMerger.mergePluginStates +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsStateMerger.mergePluginStates import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/MockRemoteCommunicator.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/MockRemoteCommunicator.kt similarity index 94% rename from plugins/settings-sync/tests/com/intellij/settingsSync/MockRemoteCommunicator.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/MockRemoteCommunicator.kt index c38bd4323b97..51f969a0a57d 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/MockRemoteCommunicator.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/MockRemoteCommunicator.kt @@ -1,12 +1,10 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.util.io.FileUtil -import com.intellij.settingsSync.auth.SettingsSyncAuthService -import com.intellij.settingsSync.communicator.SettingsSyncCommunicatorProvider -import com.intellij.settingsSync.communicator.SettingsSyncUserData -import kotlinx.coroutines.CompletableDeferred -import kotlinx.coroutines.Deferred +import com.intellij.settingsSync.core.auth.SettingsSyncAuthService +import com.intellij.settingsSync.core.communicator.SettingsSyncCommunicatorProvider +import com.intellij.settingsSync.core.communicator.SettingsSyncUserData import org.junit.Assert import java.awt.Component import java.io.ByteArrayInputStream diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/MockSettingsSyncIdeMediator.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/MockSettingsSyncIdeMediator.kt similarity index 98% rename from plugins/settings-sync/tests/com/intellij/settingsSync/MockSettingsSyncIdeMediator.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/MockSettingsSyncIdeMediator.kt index e1a07b740b9c..460c3225b9f5 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/MockSettingsSyncIdeMediator.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/MockSettingsSyncIdeMediator.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import java.nio.charset.Charset import java.nio.file.Files diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsFilteringTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsFilteringTest.kt similarity index 95% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsFilteringTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsFilteringTest.kt index 97bffef9e8c4..d45e83cb0472 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsFilteringTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsFilteringTest.kt @@ -1,11 +1,10 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.configurationStore.getPerOsSettingsStorageFolderName import com.intellij.idea.TestFor -import com.intellij.openapi.components.RoamingType import com.intellij.openapi.components.SettingsCategory import com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl -import com.intellij.settingsSync.config.EDITOR_FONT_SUBCATEGORY_ID +import com.intellij.settingsSync.core.config.EDITOR_FONT_SUBCATEGORY_ID import com.intellij.testFramework.LightPlatformTestCase class SettingsFilteringTest : LightPlatformTestCase() { diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsProviderTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt similarity index 98% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsProviderTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt index d50e469b872c..4416460cad25 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsProviderTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.ide.GeneralSettings import com.intellij.testFramework.common.timeoutRunBlocking @@ -12,7 +12,6 @@ import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import kotlin.io.path.div -import kotlin.time.Duration.Companion.seconds internal class SettingsProviderTest : SettingsSyncRealIdeTestBase() { diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSnapshotTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSnapshotTest.kt similarity index 98% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSnapshotTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSnapshotTest.kt index fc757b3bf8c5..d78b78c8d972 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSnapshotTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSnapshotTest.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.components.SettingsCategory import org.junit.jupiter.api.Assertions diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSnapshotZipSerializerTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSnapshotZipSerializerTest.kt similarity index 91% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSnapshotZipSerializerTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSnapshotZipSerializerTest.kt index 376973273e08..42933b0bb40a 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSnapshotZipSerializerTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSnapshotZipSerializerTest.kt @@ -1,11 +1,11 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.idea.TestFor import com.intellij.openapi.components.SettingsCategory import com.intellij.openapi.util.BuildNumber import com.intellij.openapi.util.io.FileUtil -import com.intellij.settingsSync.SettingsSnapshot.AppInfo -import com.intellij.settingsSync.SettingsSnapshot.MetaInfo +import com.intellij.settingsSync.core.SettingsSnapshot.AppInfo +import com.intellij.settingsSync.core.SettingsSnapshot.MetaInfo import com.intellij.testFramework.registerExtension import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncFlowTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncFlowTest.kt similarity index 99% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncFlowTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncFlowTest.kt index 772c2804a7bf..22b553acb054 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncFlowTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncFlowTest.kt @@ -1,9 +1,9 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.idea.TestFor import com.intellij.openapi.components.SettingsCategory import com.intellij.openapi.progress.currentThreadCoroutineScope -import com.intellij.settingsSync.communicator.SettingsSyncUserData +import com.intellij.settingsSync.core.communicator.SettingsSyncUserData import com.intellij.testFramework.LoggedErrorProcessor import com.intellij.testFramework.common.timeoutRunBlocking import com.intellij.testFramework.common.waitUntil diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncIdeMediatorTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncIdeMediatorTest.kt similarity index 98% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncIdeMediatorTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncIdeMediatorTest.kt index 578dcce6cf47..5601d3599a67 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncIdeMediatorTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncIdeMediatorTest.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.configurationStore.ComponentStoreImpl import com.intellij.configurationStore.StateStorageManager @@ -207,7 +207,7 @@ true var strg: String = "" ) - override fun getState(): FirstState{ + override fun getState(): FirstState { return internalState } @@ -232,7 +232,7 @@ true var intt: Int = 0 ) - override fun getState(): SecondState{ + override fun getState(): SecondState { return internalState } diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncPluginManagerTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncPluginManagerTest.kt similarity index 98% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncPluginManagerTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncPluginManagerTest.kt index 46781bebca8c..953d5965bf22 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncPluginManagerTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncPluginManagerTest.kt @@ -1,10 +1,10 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.idea.TestFor import com.intellij.openapi.components.SettingsCategory -import com.intellij.settingsSync.config.BUNDLED_PLUGINS_ID -import com.intellij.settingsSync.plugins.PluginManagerProxy -import com.intellij.settingsSync.plugins.SettingsSyncPluginsState +import com.intellij.settingsSync.core.config.BUNDLED_PLUGINS_ID +import com.intellij.settingsSync.core.plugins.PluginManagerProxy +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.launch import kotlinx.coroutines.test.runCurrent diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncPluginManagerTestUtil.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncPluginManagerTestUtil.kt similarity index 94% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncPluginManagerTestUtil.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncPluginManagerTestUtil.kt index 98b7df1cc24a..8634c81fde4c 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncPluginManagerTestUtil.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncPluginManagerTestUtil.kt @@ -1,12 +1,10 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.ide.plugins.IdeaPluginDependency import com.intellij.ide.plugins.IdeaPluginDescriptor import com.intellij.openapi.extensions.PluginId -import com.intellij.openapi.progress.ProgressIndicator import com.intellij.openapi.updateSettings.impl.PluginDownloader -import com.intellij.settingsSync.plugins.SettingsSyncPluginInstaller -import com.intellij.settingsSync.plugins.SettingsSyncPluginInstallerImpl +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginInstallerImpl import java.nio.file.Path import java.util.* diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncRealIdeTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt similarity index 98% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncRealIdeTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt index 506c6c25dadc..8207b9020a08 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncRealIdeTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.configurationStore.getPerOsSettingsStorageFolderName import com.intellij.ide.GeneralSettings @@ -10,12 +10,10 @@ import com.intellij.openapi.editor.ex.EditorSettingsExternalizable import com.intellij.openapi.keymap.impl.KeymapImpl import com.intellij.openapi.keymap.impl.KeymapManagerImpl import com.intellij.openapi.util.Disposer -import com.intellij.settingsSync.SettingsSnapshot.MetaInfo +import com.intellij.settingsSync.core.SettingsSnapshot.MetaInfo import com.intellij.util.toByteArray -import com.intellij.util.xmlb.annotations.Attribute import kotlinx.coroutines.runBlocking import org.junit.jupiter.api.Assertions -import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import java.nio.charset.Charset import java.time.Instant diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncRealIdeTestBase.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTestBase.kt similarity index 98% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncRealIdeTestBase.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTestBase.kt index 7992d06780cc..cc1b5ef29fa4 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncRealIdeTestBase.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTestBase.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.configurationStore.ApplicationStoreImpl import com.intellij.configurationStore.StateLoadPolicy @@ -10,7 +10,7 @@ import com.intellij.openapi.extensions.DefaultPluginDescriptor import com.intellij.openapi.progress.currentThreadCoroutineScope import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.io.FileUtil.createTempDirectory -import com.intellij.settingsSync.communicator.SettingsSyncUserData +import com.intellij.settingsSync.core.communicator.SettingsSyncUserData import com.intellij.testFramework.common.timeoutRunBlocking import com.intellij.testFramework.replaceService import com.intellij.util.xmlb.annotations.Attribute diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncTestBase.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncTestBase.kt similarity index 96% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncTestBase.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncTestBase.kt index 2c7491e4d145..29e5d081ad14 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncTestBase.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncTestBase.kt @@ -1,11 +1,11 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.openapi.Disposable import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.impl.ApplicationImpl import com.intellij.openapi.diagnostic.logger -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder -import com.intellij.settingsSync.communicator.SettingsSyncCommunicatorProvider +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder +import com.intellij.settingsSync.core.communicator.SettingsSyncCommunicatorProvider import com.intellij.testFramework.common.DEFAULT_TEST_TIMEOUT import com.intellij.testFramework.common.timeoutRunBlocking import com.intellij.testFramework.junit5.TestApplication diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncTestInfra.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncTestInfra.kt similarity index 91% rename from plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncTestInfra.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncTestInfra.kt index 69c02bfc2253..677a2ba3d83b 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncTestInfra.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncTestInfra.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.configurationStore.getDefaultStoragePathSpec import com.intellij.configurationStore.serializeStateInto @@ -7,9 +7,9 @@ import com.intellij.openapi.components.PersistentStateComponent import com.intellij.openapi.components.SettingsCategory import com.intellij.openapi.components.State import com.intellij.openapi.extensions.PluginId -import com.intellij.settingsSync.SettingsSnapshot.MetaInfo -import com.intellij.settingsSync.plugins.SettingsSyncPluginsState -import com.intellij.settingsSync.plugins.SettingsSyncPluginsState.PluginData +import com.intellij.settingsSync.core.SettingsSnapshot.MetaInfo +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState.PluginData import com.intellij.util.toByteArray import com.intellij.util.xmlb.Constants import org.jdom.Element @@ -23,8 +23,8 @@ fun SettingsSnapshot.assertSettingsSnapshot(buildExpectedSnapshot: SettingsSnaps val settingsSnapshotBuilder = SettingsSnapshotBuilder() settingsSnapshotBuilder.buildExpectedSnapshot() val expectedSnapshot = SettingsSnapshot(metaInfo, settingsSnapshotBuilder.fileStates, - SettingsSyncPluginsState(settingsSnapshotBuilder.plugins), - settingsSnapshotBuilder.settingsFromProviders, settingsSnapshotBuilder.additionalFiles) + SettingsSyncPluginsState(settingsSnapshotBuilder.plugins), + settingsSnapshotBuilder.settingsFromProviders, settingsSnapshotBuilder.additionalFiles) assertSettingsSnapshotsEqual(expectedSnapshot, this) } diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/TestPluginManager.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/TestPluginManager.kt similarity index 95% rename from plugins/settings-sync/tests/com/intellij/settingsSync/TestPluginManager.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/TestPluginManager.kt index 9ac365caf9d0..21e48669faae 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/TestPluginManager.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/TestPluginManager.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync +package com.intellij.settingsSync.core import com.intellij.ide.plugins.IdeaPluginDescriptor import com.intellij.ide.plugins.PluginEnableStateChangedListener @@ -6,10 +6,9 @@ import com.intellij.ide.plugins.PluginEnabler import com.intellij.openapi.Disposable import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.util.Disposer -import com.intellij.settingsSync.plugins.AbstractPluginManagerProxy -import com.intellij.settingsSync.plugins.SettingsSyncPluginInstaller +import com.intellij.settingsSync.core.plugins.AbstractPluginManagerProxy +import com.intellij.settingsSync.core.plugins.SettingsSyncPluginInstaller import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.test.TestCoroutineScheduler import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent import org.junit.Assert diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/migration/CloudConfigToSettingsSyncMigrationTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/migration/CloudConfigToSettingsSyncMigrationTest.kt similarity index 91% rename from plugins/settings-sync/tests/com/intellij/settingsSync/migration/CloudConfigToSettingsSyncMigrationTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/migration/CloudConfigToSettingsSyncMigrationTest.kt index f8e2fc1d9c96..78336188e75e 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/migration/CloudConfigToSettingsSyncMigrationTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/migration/CloudConfigToSettingsSyncMigrationTest.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.migration +package com.intellij.settingsSync.core.migration import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.hints.settings.ParameterNameHintsSettings @@ -14,11 +14,11 @@ import com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl import com.intellij.openapi.editor.ex.EditorSettingsExternalizable import com.intellij.openapi.keymap.impl.KeymapManagerImpl import com.intellij.psi.impl.source.codeStyle.PersistableCodeStyleSchemes -import com.intellij.settingsSync.SettingsSnapshot -import com.intellij.settingsSync.SettingsSyncSettings -import com.intellij.settingsSync.assertSettingsSnapshot -import com.intellij.settingsSync.migration.CloudConfigToSettingsSyncMigration.Companion.LAYOUT_CONFIG_FILENAME -import com.intellij.settingsSync.migration.CloudConfigToSettingsSyncMigration.Companion.LOCAL_LAYOUT_CONFIG_FILENAME +import com.intellij.settingsSync.core.SettingsSnapshot +import com.intellij.settingsSync.core.SettingsSyncSettings +import com.intellij.settingsSync.core.assertSettingsSnapshot +import com.intellij.settingsSync.core.migration.CloudConfigToSettingsSyncMigration.Companion.LAYOUT_CONFIG_FILENAME +import com.intellij.settingsSync.core.migration.CloudConfigToSettingsSyncMigration.Companion.LOCAL_LAYOUT_CONFIG_FILENAME import com.intellij.testFramework.ApplicationRule import com.intellij.testFramework.rules.InMemoryFsRule import com.intellij.util.application diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/migration/SettingsRepositoryToSettingsSyncMigrationTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/migration/SettingsRepositoryToSettingsSyncMigrationTest.kt similarity index 93% rename from plugins/settings-sync/tests/com/intellij/settingsSync/migration/SettingsRepositoryToSettingsSyncMigrationTest.kt rename to platform/settings-sync-core/tests/com/intellij/settingsSync/core/migration/SettingsRepositoryToSettingsSyncMigrationTest.kt index 01daf316b5fc..af108f9e5182 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/migration/SettingsRepositoryToSettingsSyncMigrationTest.kt +++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/migration/SettingsRepositoryToSettingsSyncMigrationTest.kt @@ -1,9 +1,9 @@ -package com.intellij.settingsSync.migration +package com.intellij.settingsSync.core.migration import com.intellij.configurationStore.getPerOsSettingsStorageFolderName import com.intellij.openapi.util.SystemInfo -import com.intellij.settingsSync.SettingsSnapshot -import com.intellij.settingsSync.assertSettingsSnapshot +import com.intellij.settingsSync.core.SettingsSnapshot +import com.intellij.settingsSync.core.assertSettingsSnapshot import com.intellij.testFramework.ApplicationRule import com.intellij.testFramework.rules.InMemoryFsRule import com.intellij.util.io.createDirectories diff --git a/plugins/settings-sync/fileSystem/intellij.settingsSync.fileSystem.iml b/plugins/settings-sync/fileSystem/intellij.settingsSync.fileSystem.iml index cf071115fce2..5af21cd7a17b 100644 --- a/plugins/settings-sync/fileSystem/intellij.settingsSync.fileSystem.iml +++ b/plugins/settings-sync/fileSystem/intellij.settingsSync.fileSystem.iml @@ -11,7 +11,7 @@ - + diff --git a/plugins/settings-sync/git/intellij.settingsSync.git.iml b/plugins/settings-sync/git/intellij.settingsSync.git.iml deleted file mode 100644 index 7309de2c6f3a..000000000000 --- a/plugins/settings-sync/git/intellij.settingsSync.git.iml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/settings-sync/git/resources/intellij.settingsSync.git.xml b/plugins/settings-sync/git/resources/intellij.settingsSync.git.xml deleted file mode 100644 index c9545feb1d98..000000000000 --- a/plugins/settings-sync/git/resources/intellij.settingsSync.git.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/settings-sync/jba/intellij.settingsSync.jba.iml b/plugins/settings-sync/jba/intellij.settingsSync.iml similarity index 94% rename from plugins/settings-sync/jba/intellij.settingsSync.jba.iml rename to plugins/settings-sync/jba/intellij.settingsSync.iml index 9606e702516f..403ac6a564a6 100644 --- a/plugins/settings-sync/jba/intellij.settingsSync.jba.iml +++ b/plugins/settings-sync/jba/intellij.settingsSync.iml @@ -10,7 +10,7 @@ - + @@ -19,6 +19,7 @@ + diff --git a/plugins/settings-sync/jba/resources/META-INF/plugin.xml b/plugins/settings-sync/jba/resources/META-INF/plugin.xml new file mode 100644 index 000000000000..6bd7a288468d --- /dev/null +++ b/plugins/settings-sync/jba/resources/META-INF/plugin.xml @@ -0,0 +1,26 @@ + + Backup and Sync + com.intellij.settingsSync + IDE Settings + Backs up and synchronizes settings across all JetBrains IDE instances using your JetBrains account. + The list of synced settings is customizable and includes UI, keymaps, code style, plugins, and much more.

+ ]]> + JetBrains + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/settings-sync/resources/META-INF/pluginIcon.svg b/plugins/settings-sync/jba/resources/META-INF/pluginIcon.svg similarity index 100% rename from plugins/settings-sync/resources/META-INF/pluginIcon.svg rename to plugins/settings-sync/jba/resources/META-INF/pluginIcon.svg diff --git a/plugins/settings-sync/jba/resources/intellij.settingsSync.jba.xml b/plugins/settings-sync/jba/resources/intellij.settingsSync.jba.xml deleted file mode 100644 index d004a387fb14..000000000000 --- a/plugins/settings-sync/jba/resources/intellij.settingsSync.jba.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/plugins/settings-sync/jba/resources/intellij.settingsSync.performance.xml b/plugins/settings-sync/jba/resources/intellij.settingsSync.performance.xml new file mode 100644 index 000000000000..0d8dd4dadd24 --- /dev/null +++ b/plugins/settings-sync/jba/resources/intellij.settingsSync.performance.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/CloudConfigServerCommunicator.kt b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/CloudConfigServerCommunicator.kt index f2b85e265b79..51228d56e21f 100644 --- a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/CloudConfigServerCommunicator.kt +++ b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/CloudConfigServerCommunicator.kt @@ -3,10 +3,10 @@ package com.intellij.settingsSync.jba import com.intellij.ide.plugins.PluginManagerCore.isRunningFromSources import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.util.JDOMUtil -import com.intellij.settingsSync.AbstractServerCommunicator -import com.intellij.settingsSync.SettingsSyncEventListener -import com.intellij.settingsSync.SettingsSyncEvents -import com.intellij.settingsSync.SettingsSyncSettings +import com.intellij.settingsSync.core.AbstractServerCommunicator +import com.intellij.settingsSync.core.SettingsSyncEventListener +import com.intellij.settingsSync.core.SettingsSyncEvents +import com.intellij.settingsSync.core.SettingsSyncSettings import com.intellij.settingsSync.jba.auth.JBAAuthService import com.intellij.util.concurrency.SynchronizedClearableLazy import com.intellij.util.io.HttpRequests @@ -27,7 +27,8 @@ private const val CONNECTION_TIMEOUT_MS = 10000 private const val READ_TIMEOUT_MS = 50000 internal open class CloudConfigServerCommunicator(serverUrl: String? = null, - private val jbaAuthService: JBAAuthService) : AbstractServerCommunicator() { + private val jbaAuthService: JBAAuthService +) : AbstractServerCommunicator() { protected val clientVersionContext = CloudConfigVersionContext() diff --git a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/JbaCommunicatorProvider.kt b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/JbaCommunicatorProvider.kt index 369ae680364a..f903a57c57cc 100644 --- a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/JbaCommunicatorProvider.kt +++ b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/JbaCommunicatorProvider.kt @@ -1,9 +1,9 @@ package com.intellij.settingsSync.jba import com.intellij.openapi.Disposable -import com.intellij.settingsSync.SettingsSyncRemoteCommunicator -import com.intellij.settingsSync.auth.SettingsSyncAuthService -import com.intellij.settingsSync.communicator.SettingsSyncCommunicatorProvider +import com.intellij.settingsSync.core.SettingsSyncRemoteCommunicator +import com.intellij.settingsSync.core.auth.SettingsSyncAuthService +import com.intellij.settingsSync.core.communicator.SettingsSyncCommunicatorProvider import com.intellij.settingsSync.jba.auth.JBAAuthService class JbaCommunicatorProvider : SettingsSyncCommunicatorProvider, Disposable { diff --git a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/SettingsSyncPromotion.kt b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/SettingsSyncPromotion.kt index 6149715a5eb0..c48306b05bb7 100644 --- a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/SettingsSyncPromotion.kt +++ b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/SettingsSyncPromotion.kt @@ -10,13 +10,13 @@ import com.intellij.openapi.options.newEditor.SettingsTreeView import com.intellij.openapi.ui.popup.Balloon import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.registry.Registry -import com.intellij.settingsSync.SettingsSyncBundle -import com.intellij.settingsSync.SettingsSyncEventListener -import com.intellij.settingsSync.SettingsSyncEvents -import com.intellij.settingsSync.SettingsSyncLocalSettings -import com.intellij.settingsSync.SettingsSyncSettings -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder -import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics +import com.intellij.settingsSync.core.SettingsSyncBundle +import com.intellij.settingsSync.core.SettingsSyncEventListener +import com.intellij.settingsSync.core.SettingsSyncEvents +import com.intellij.settingsSync.core.SettingsSyncLocalSettings +import com.intellij.settingsSync.core.SettingsSyncSettings +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder +import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics import com.intellij.ui.GotItTooltip import com.intellij.ui.treeStructure.SimpleNode import com.intellij.ui.treeStructure.filtered.FilteringTreeStructure diff --git a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/SettingsSyncTroubleshootingAction.kt b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/SettingsSyncTroubleshootingAction.kt index 99c98f718bd3..5c6dc0fd6c71 100644 --- a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/SettingsSyncTroubleshootingAction.kt +++ b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/SettingsSyncTroubleshootingAction.kt @@ -19,17 +19,10 @@ import com.intellij.openapi.util.ThrowableComputable import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtilRt import com.intellij.openapi.util.text.StringUtil -import com.intellij.settingsSync.SettingsSnapshot -import com.intellij.settingsSync.SettingsSyncBundle -import com.intellij.settingsSync.SettingsSyncLocalSettings -import com.intellij.settingsSync.SettingsSyncMain -import com.intellij.settingsSync.SettingsSyncSettings -import com.intellij.settingsSync.auth.SettingsSyncAuthService -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder -import com.intellij.settingsSync.communicator.SettingsSyncUserData -import com.intellij.settingsSync.getLocalApplicationInfo -import com.intellij.settingsSync.isSettingsSyncEnabledByKey -import com.intellij.ui.JBAccountInfoService +import com.intellij.settingsSync.core.* +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder +import com.intellij.settingsSync.core.communicator.SettingsSyncUserData +import com.intellij.settingsSync.jba.auth.JBAAuthService import com.intellij.ui.components.JBLabel import com.intellij.ui.components.JBScrollPane import com.intellij.ui.dsl.builder.Panel @@ -60,7 +53,8 @@ internal class SettingsSyncTroubleshootingAction : DumbAwareAction() { override fun getActionUpdateThread() = ActionUpdateThread.BGT override fun update(e: AnActionEvent) { - e.presentation.isEnabledAndVisible = isSettingsSyncEnabledByKey() + e.presentation.isEnabledAndVisible = isSettingsSyncEnabledInSettings() && + RemoteCommunicatorHolder.getAuthService() is JBAAuthService } override fun actionPerformed(e: AnActionEvent) { diff --git a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/auth/DummyJBAccountInfoService.kt b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/auth/DummyJBAccountInfoService.kt index 3455ef22ebd5..56e1396bfca0 100644 --- a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/auth/DummyJBAccountInfoService.kt +++ b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/auth/DummyJBAccountInfoService.kt @@ -1,7 +1,7 @@ package com.intellij.settingsSync.jba.auth import com.intellij.ide.gdpr.Version -import com.intellij.settingsSync.SettingsSyncEvents +import com.intellij.settingsSync.core.SettingsSyncEvents import com.intellij.ui.JBAccountInfoService import java.util.concurrent.CompletableFuture import java.util.function.Consumer diff --git a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/auth/JBAAuthService.kt b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/auth/JBAAuthService.kt index e76889385f21..e903758b2e50 100644 --- a/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/auth/JBAAuthService.kt +++ b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/auth/JBAAuthService.kt @@ -6,9 +6,9 @@ import com.intellij.openapi.diagnostic.logger import com.intellij.platform.ide.progress.ModalTaskOwner import com.intellij.platform.ide.progress.TaskCancellation import com.intellij.platform.ide.progress.withModalProgress -import com.intellij.settingsSync.SettingsSyncEvents -import com.intellij.settingsSync.auth.SettingsSyncAuthService -import com.intellij.settingsSync.communicator.SettingsSyncUserData +import com.intellij.settingsSync.core.SettingsSyncEvents +import com.intellij.settingsSync.core.auth.SettingsSyncAuthService +import com.intellij.settingsSync.core.communicator.SettingsSyncUserData import com.intellij.settingsSync.jba.SettingsSyncJbaBundle import com.intellij.settingsSync.jba.SettingsSyncPromotion import com.intellij.ui.JBAccountInfoService diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/DisableSettingsSyncCommand.kt b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/DisableSettingsSyncCommand.kt similarity index 94% rename from plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/DisableSettingsSyncCommand.kt rename to plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/DisableSettingsSyncCommand.kt index 6665f2c8f248..1aea9fd01ca6 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/DisableSettingsSyncCommand.kt +++ b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/DisableSettingsSyncCommand.kt @@ -1,11 +1,11 @@ -package com.intellij.settingsSync.performanceTesting +package com.intellij.settingsSync.jba.performanceTesting import com.intellij.openapi.application.EDT import com.intellij.openapi.progress.ProgressIndicator import com.intellij.openapi.progress.Task import com.intellij.openapi.ui.playback.PlaybackContext import com.intellij.openapi.ui.playback.commands.PlaybackCommandCoroutineAdapter -import com.intellij.settingsSync.* +import com.intellij.settingsSync.core.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.jetbrains.annotations.NonNls diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/EnableSettingsSyncCommand.kt b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/EnableSettingsSyncCommand.kt similarity index 94% rename from plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/EnableSettingsSyncCommand.kt rename to plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/EnableSettingsSyncCommand.kt index 067938615b3e..b3ddc751476e 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/EnableSettingsSyncCommand.kt +++ b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/EnableSettingsSyncCommand.kt @@ -1,11 +1,11 @@ -package com.intellij.settingsSync.performanceTesting +package com.intellij.settingsSync.jba.performanceTesting import com.intellij.openapi.application.EDT import com.intellij.openapi.ui.playback.PlaybackContext import com.intellij.openapi.ui.playback.commands.PlaybackCommandCoroutineAdapter -import com.intellij.settingsSync.* -import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder -import com.intellij.settingsSync.config.SettingsSyncEnabler +import com.intellij.settingsSync.core.* +import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder +import com.intellij.settingsSync.core.config.SettingsSyncEnabler import kotlinx.coroutines.* import org.jetbrains.annotations.NonNls import java.util.concurrent.TimeUnit diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/GetSettingsFromServerCommand.kt b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/GetSettingsFromServerCommand.kt similarity index 87% rename from plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/GetSettingsFromServerCommand.kt rename to plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/GetSettingsFromServerCommand.kt index 5602d055c4f3..97e914597b00 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/GetSettingsFromServerCommand.kt +++ b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/GetSettingsFromServerCommand.kt @@ -1,10 +1,10 @@ -package com.intellij.settingsSync.performanceTesting +package com.intellij.settingsSync.jba.performanceTesting import com.intellij.openapi.application.EDT import com.intellij.openapi.ui.playback.PlaybackContext import com.intellij.openapi.ui.playback.commands.PlaybackCommandCoroutineAdapter -import com.intellij.settingsSync.UpdateResult -import com.intellij.settingsSync.config.SettingsSyncEnabler +import com.intellij.settingsSync.core.UpdateResult +import com.intellij.settingsSync.core.config.SettingsSyncEnabler import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/PushSettingsToServerCommand.kt b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/PushSettingsToServerCommand.kt similarity index 89% rename from plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/PushSettingsToServerCommand.kt rename to plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/PushSettingsToServerCommand.kt index 2b25ce1ccf22..8a980d4eb849 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/PushSettingsToServerCommand.kt +++ b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/PushSettingsToServerCommand.kt @@ -1,9 +1,9 @@ -package com.intellij.settingsSync.performanceTesting +package com.intellij.settingsSync.jba.performanceTesting import com.intellij.openapi.application.EDT import com.intellij.openapi.ui.playback.PlaybackContext import com.intellij.openapi.ui.playback.commands.PlaybackCommandCoroutineAdapter -import com.intellij.settingsSync.config.SettingsSyncEnabler +import com.intellij.settingsSync.core.config.SettingsSyncEnabler import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/SettingsSyncCommandProvider.kt b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/SettingsSyncCommandProvider.kt similarity index 91% rename from plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/SettingsSyncCommandProvider.kt rename to plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/SettingsSyncCommandProvider.kt index 8d47f3c2e36c..1ae4941ea111 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/performanceTesting/SettingsSyncCommandProvider.kt +++ b/plugins/settings-sync/jba/src/com/intellij/settingsSync/jba/performanceTesting/SettingsSyncCommandProvider.kt @@ -1,4 +1,4 @@ -package com.intellij.settingsSync.performanceTesting +package com.intellij.settingsSync.jba.performanceTesting import com.jetbrains.performancePlugin.CommandProvider import com.jetbrains.performancePlugin.CreateCommand diff --git a/plugins/settings-sync/jba/test/com/intellij/settingsSync/SettingsSyncAuthTest.kt b/plugins/settings-sync/jba/test/com/intellij/settingsSync/SettingsSyncAuthTest.kt index 36ff5f302d23..84ba6834830f 100644 --- a/plugins/settings-sync/jba/test/com/intellij/settingsSync/SettingsSyncAuthTest.kt +++ b/plugins/settings-sync/jba/test/com/intellij/settingsSync/SettingsSyncAuthTest.kt @@ -3,7 +3,9 @@ package com.intellij.settingsSync import com.intellij.idea.TestFor import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.progress.runBlockingCancellable -import com.intellij.settingsSync.auth.SettingsSyncAuthService +import com.intellij.settingsSync.core.SettingsSyncMain +import com.intellij.settingsSync.core.SettingsSyncSettings +import com.intellij.settingsSync.core.auth.SettingsSyncAuthService import com.intellij.settingsSync.jba.CloudConfigServerCommunicator import com.intellij.settingsSync.jba.CloudConfigVersionContext import com.intellij.settingsSync.jba.auth.JBAAuthService diff --git a/plugins/settings-sync/jba/test/com/intellij/settingsSync/SettingsSyncTestAuthService.kt b/plugins/settings-sync/jba/test/com/intellij/settingsSync/SettingsSyncTestAuthService.kt index a7bd48bc7f52..ef1bee8bd09f 100644 --- a/plugins/settings-sync/jba/test/com/intellij/settingsSync/SettingsSyncTestAuthService.kt +++ b/plugins/settings-sync/jba/test/com/intellij/settingsSync/SettingsSyncTestAuthService.kt @@ -1,11 +1,9 @@ package com.intellij.settingsSync -import com.intellij.settingsSync.auth.SettingsSyncAuthService -import com.intellij.settingsSync.communicator.SettingsSyncUserData +import com.intellij.settingsSync.core.auth.SettingsSyncAuthService +import com.intellij.settingsSync.core.communicator.SettingsSyncUserData import com.intellij.settingsSync.jba.auth.DummyJBAccountInfoService import com.intellij.ui.JBAccountInfoService -import kotlinx.coroutines.CompletableDeferred -import kotlinx.coroutines.Deferred import java.awt.Component import javax.swing.Icon diff --git a/plugins/settings-sync/resources/META-INF/settingsSync-performance-plugin-support.xml b/plugins/settings-sync/resources/META-INF/settingsSync-performance-plugin-support.xml deleted file mode 100644 index 815d387c3e00..000000000000 --- a/plugins/settings-sync/resources/META-INF/settingsSync-performance-plugin-support.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/InvalidVersionIdException.kt b/plugins/settings-sync/src/com/intellij/settingsSync/InvalidVersionIdException.kt deleted file mode 100644 index 56d74227d8f7..000000000000 --- a/plugins/settings-sync/src/com/intellij/settingsSync/InvalidVersionIdException.kt +++ /dev/null @@ -1,2 +0,0 @@ -package com.intellij.settingsSync - diff --git a/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml b/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml index a38d2ec40768..c15654d49115 100644 --- a/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml +++ b/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml @@ -6,6 +6,7 @@ +