From eaca3b2b7cf32b1511acfe8c494e92c547b741b8 Mon Sep 17 00:00:00 2001 From: Denis Zaichenko Date: Tue, 24 Dec 2024 14:24:00 +0100 Subject: [PATCH] [vcs] [RD] IJPL-160237 Changed root package for new vcs-impl modules. GitOrigin-RevId: 47bc4e91c42baa708a676f7568f4b578cb993428 --- .../repo/rhizome/RepositoryCountUpdater.kt | 2 +- .../RepositoryNodeToEntityConverter.kt | 6 ++-- .../impl/ui/SingleFileActivityDiffPreview.kt | 2 +- .../intellij.platform.vcs.impl.backend.iml | 1 - .../intellij.platform.vcs.impl.backend.xml | 18 +++++----- .../backend/shelf/ChangelistComparator.kt | 2 +- .../shelf/ChangesBrowserNodeConverter.kt | 12 ++++--- .../backend/shelf/ShelfActionsApiProvider.kt | 8 ++--- .../impl/backend/shelf/ShelfApiProvider.kt | 11 +++--- .../shelf/ShelfRemoteActionExecutor.kt | 6 ++-- .../vcs/impl/backend/shelf/ShelfTreeHolder.kt | 26 +++++++++----- .../impl/backend/shelf/ShelvedChangeNode.kt | 2 +- .../vcs/impl/backend/shelf/ShelvedListNode.kt | 2 +- .../backend/shelf/ShelvedTreeModelBuilder.kt | 2 +- .../diff/BackendShelveEditorDiffPreview.kt | 2 +- .../shelf/diff/ShelfDiffChangesProvider.kt | 4 +-- .../shelf/diff/ShelvedPreviewProcessor.kt | 18 +++++----- .../intellij.platform.vcs.impl.frontend.xml | 36 +++++++++---------- .../vcs/impl/frontend/VcsFrontendBundle.kt | 2 +- .../impl/frontend/VcsFrontendConfiguration.kt | 5 +-- .../vcs/impl/frontend/changes/ChangeList.kt | 4 +-- .../changes/ChangesGroupingStatesHolder.kt | 7 ++-- .../changes/ChangesGroupingSupport.kt | 7 ++-- .../vcs/impl/frontend/changes/ChangesTree.kt | 16 +++------ .../changes/ChangesTreeEditorDiffPreview.kt | 2 +- .../impl/frontend/changes/ChangesTreeModel.kt | 4 +-- .../frontend/changes/ChangesTreeModelData.kt | 4 +-- .../CreatePatchForShelvedChangeAction.kt | 10 +++--- .../changes/actions/FrontendDeleteAction.kt | 2 +- ...electChangesGroupingFrontendActionGroup.kt | 8 ++--- .../changes/actions/ShowDiffAction.kt | 6 ++-- .../frontend/changes/tree/FilePathTreeNode.kt | 10 +++--- .../frontend/changes/tree/ModuleTreeNode.kt | 8 ++--- .../changes/tree/RepositoryTreeNode.kt | 10 +++--- .../vcs/impl/frontend/changes/util.kt | 9 ++--- .../FrontendNavigateToSourceAction.kt | 2 +- .../navigation/FrontendShelfNavigatable.kt | 8 ++--- .../impl/frontend/shelf/ChangeNodeFactory.kt | 27 ++++++++++---- .../shelf/ShelfRenameTreeCellEditor.kt | 6 ++-- .../vcs/impl/frontend/shelf/ShelfService.kt | 18 +++++----- .../frontend/shelf/ShelfToolWindowPanel.kt | 16 ++++----- .../impl/frontend/shelf/ShelfTreeUpdater.kt | 21 ++++++----- .../frontend/shelf/ShelveContentReplacer.kt | 4 +-- .../shelf/actions/FrontendUnshelveAction.kt | 8 ++--- .../actions/ImportShelvesFromPatchesAction.kt | 4 +-- .../actions/RenameShelvedChangelistAction.kt | 10 +++--- .../shelf/actions/RestoreShelfAction.kt | 10 +++--- .../shelf/actions/ShowStandaloneDiffAction.kt | 10 +++--- .../shelf/tree/ChangesBrowserNode.java | 4 +-- .../tree/ChangesBrowserNodeRenderer.java | 2 +- .../shelf/tree/ChangesBrowserRootNode.kt | 2 +- .../tree/ChangesTreeFrontendCellRenderer.kt | 4 +-- .../shelf/tree/EntityChangesBrowserNode.kt | 6 ++-- .../shelf/tree/SelectionIdentifier.kt | 6 ++-- .../vcs/impl/frontend/shelf/tree/ShelfTree.kt | 16 +++++---- .../shelf/tree/ShelfTreeEditorDiffPreview.kt | 16 ++++----- .../tree/ShelfTreeGroupingUpdateScheduler.kt | 6 ++-- .../shelf/tree/ShelveDeleteProvider.kt | 6 ++-- .../shelf/tree/ShelvedChangeListNode.kt | 6 ++-- .../frontend/shelf/tree/ShelvedChangeNode.kt | 8 ++--- .../vcs/impl/frontend/shelf/tree/TagNode.kt | 4 +-- .../vcs-impl/intellij.platform.vcs.impl.iml | 10 +++--- .../intellij.platform.vcs.impl.shared.iml | 2 +- .../intellij.platform.vcs.impl.shared.xml | 10 +++--- .../changes/DiffPreviewUpdateProcessor.kt | 2 +- .../shared/changes/GroupingUpdatePlaces.kt | 2 +- .../changes/PreviewDiffSplitterComponent.kt | 2 +- .../rhizome/GroupingItemTypeProvider.kt | 2 +- .../rhizome/ShelfDiffEntityTypeProvider.kt | 4 +-- .../rhizome/ShelfNodesEntityTypeProvider.kt | 3 +- .../shared/rhizome/VcsEntityTypeProvider.kt | 2 +- .../impl/shared/rpc/RemoteShelfActionsApi.kt | 4 +-- .../vcs/impl/shared/rpc/RemoteShelfApi.kt | 6 ++-- .../ChangeViewDiffRequestProcessor.java | 2 +- .../vcs/changes/ChangesViewManager.java | 2 +- .../openapi/vcs/changes/EditorTabPreview.kt | 2 +- .../changes/SingleFileDiffPreviewProcessor.kt | 2 +- .../shelf/ShelvedChangesViewManager.java | 6 ++-- .../changes/ui/GroupingPolicyFactoryHolder.kt | 2 +- .../src/git4idea/index/ui/GitStagePanel.kt | 2 +- 80 files changed, 295 insertions(+), 276 deletions(-) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/ChangelistComparator.kt (88%) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/ChangesBrowserNodeConverter.kt (91%) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/ShelfActionsApiProvider.kt (90%) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/ShelfApiProvider.kt (87%) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/ShelfRemoteActionExecutor.kt (97%) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/ShelfTreeHolder.kt (88%) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/ShelvedChangeNode.kt (96%) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/ShelvedListNode.kt (93%) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/ShelvedTreeModelBuilder.kt (98%) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/diff/BackendShelveEditorDiffPreview.kt (96%) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/diff/ShelfDiffChangesProvider.kt (91%) rename platform/vcs-impl/backend/src/com/intellij/{ => platform}/vcs/impl/backend/shelf/diff/ShelvedPreviewProcessor.kt (81%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/VcsFrontendBundle.kt (93%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/VcsFrontendConfiguration.kt (81%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/ChangeList.kt (80%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/ChangesGroupingStatesHolder.kt (91%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/ChangesGroupingSupport.kt (90%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/ChangesTree.kt (86%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/ChangesTreeEditorDiffPreview.kt (96%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/ChangesTreeModel.kt (79%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/ChangesTreeModelData.kt (90%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/actions/CreatePatchForShelvedChangeAction.kt (85%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/actions/FrontendDeleteAction.kt (86%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/actions/SelectChangesGroupingFrontendActionGroup.kt (89%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/actions/ShowDiffAction.kt (80%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/tree/FilePathTreeNode.kt (82%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/tree/ModuleTreeNode.kt (78%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/tree/RepositoryTreeNode.kt (86%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/changes/util.kt (84%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/navigation/FrontendNavigateToSourceAction.kt (93%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/navigation/FrontendShelfNavigatable.kt (67%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/ChangeNodeFactory.kt (70%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/ShelfRenameTreeCellEditor.kt (84%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/ShelfService.kt (89%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/ShelfToolWindowPanel.kt (90%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/ShelfTreeUpdater.kt (84%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/ShelveContentReplacer.kt (93%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/actions/FrontendUnshelveAction.kt (80%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/actions/ImportShelvesFromPatchesAction.kt (79%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/actions/RenameShelvedChangelistAction.kt (62%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/actions/RestoreShelfAction.kt (61%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/actions/ShowStandaloneDiffAction.kt (74%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/ChangesBrowserNode.java (97%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/ChangesBrowserNodeRenderer.java (98%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/ChangesBrowserRootNode.kt (85%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/ChangesTreeFrontendCellRenderer.kt (97%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/EntityChangesBrowserNode.kt (84%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/SelectionIdentifier.kt (87%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/ShelfTree.kt (85%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/ShelfTreeEditorDiffPreview.kt (81%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/ShelfTreeGroupingUpdateScheduler.kt (85%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/ShelveDeleteProvider.kt (81%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/ShelvedChangeListNode.kt (87%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/ShelvedChangeNode.kt (86%) rename platform/vcs-impl/frontend/src/com/intellij/{ => platform}/vcs/impl/frontend/shelf/tree/TagNode.kt (84%) rename platform/vcs-impl/shared/src/com/intellij/{ => platform}/vcs/impl/shared/changes/DiffPreviewUpdateProcessor.kt (94%) rename platform/vcs-impl/shared/src/com/intellij/{ => platform}/vcs/impl/shared/changes/GroupingUpdatePlaces.kt (88%) rename platform/vcs-impl/shared/src/com/intellij/{ => platform}/vcs/impl/shared/changes/PreviewDiffSplitterComponent.kt (96%) rename platform/vcs-impl/shared/src/com/intellij/{ => platform}/vcs/impl/shared/rhizome/GroupingItemTypeProvider.kt (96%) rename platform/vcs-impl/shared/src/com/intellij/{ => platform}/vcs/impl/shared/rhizome/ShelfDiffEntityTypeProvider.kt (94%) rename platform/vcs-impl/shared/src/com/intellij/{ => platform}/vcs/impl/shared/rhizome/ShelfNodesEntityTypeProvider.kt (98%) rename platform/vcs-impl/shared/src/com/intellij/{ => platform}/vcs/impl/shared/rhizome/VcsEntityTypeProvider.kt (95%) rename platform/vcs-impl/shared/src/com/intellij/{ => platform}/vcs/impl/shared/rpc/RemoteShelfActionsApi.kt (91%) rename platform/vcs-impl/shared/src/com/intellij/{ => platform}/vcs/impl/shared/rpc/RemoteShelfApi.kt (87%) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/repo/rhizome/RepositoryCountUpdater.kt b/platform/dvcs-impl/src/com/intellij/dvcs/repo/rhizome/RepositoryCountUpdater.kt index 2d7b4a1ad17f..3fb0131cbf72 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/repo/rhizome/RepositoryCountUpdater.kt +++ b/platform/dvcs-impl/src/com/intellij/dvcs/repo/rhizome/RepositoryCountUpdater.kt @@ -7,7 +7,7 @@ import com.intellij.openapi.project.Project import com.intellij.platform.kernel.withKernel import com.intellij.platform.project.asEntity import com.intellij.platform.util.coroutines.sync.OverflowSemaphore -import com.intellij.vcs.impl.shared.rhizome.RepositoryCountEntity +import com.intellij.platform.vcs.impl.shared.rhizome.RepositoryCountEntity import fleet.kernel.change import fleet.kernel.shared import kotlinx.coroutines.CoroutineScope diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/repo/rhizome/RepositoryNodeToEntityConverter.kt b/platform/dvcs-impl/src/com/intellij/dvcs/repo/rhizome/RepositoryNodeToEntityConverter.kt index 6b87793f06ef..01de78345e34 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/repo/rhizome/RepositoryNodeToEntityConverter.kt +++ b/platform/dvcs-impl/src/com/intellij/dvcs/repo/rhizome/RepositoryNodeToEntityConverter.kt @@ -6,9 +6,9 @@ import com.intellij.dvcs.ui.RepositoryChangesBrowserNode import com.intellij.openapi.project.Project import com.intellij.openapi.vcs.changes.ui.CurrentBranchComponent.Companion.getCurrentBranch import com.intellij.vcs.branch.BranchPresentation -import com.intellij.vcs.impl.backend.shelf.NodeToEntityConverter -import com.intellij.vcs.impl.shared.rhizome.NodeEntity -import com.intellij.vcs.impl.shared.rhizome.RepositoryNodeEntity +import com.intellij.platform.vcs.impl.backend.shelf.NodeToEntityConverter +import com.intellij.platform.vcs.impl.shared.rhizome.NodeEntity +import com.intellij.platform.vcs.impl.shared.rhizome.RepositoryNodeEntity import fleet.kernel.SharedChangeScope internal class RepositoryNodeToEntityConverter : NodeToEntityConverter(RepositoryChangesBrowserNode::class) { diff --git a/platform/lvcs-impl/src/com/intellij/platform/lvcs/impl/ui/SingleFileActivityDiffPreview.kt b/platform/lvcs-impl/src/com/intellij/platform/lvcs/impl/ui/SingleFileActivityDiffPreview.kt index b816468e8219..9a87f830c3ce 100644 --- a/platform/lvcs-impl/src/com/intellij/platform/lvcs/impl/ui/SingleFileActivityDiffPreview.kt +++ b/platform/lvcs-impl/src/com/intellij/platform/lvcs/impl/ui/SingleFileActivityDiffPreview.kt @@ -19,7 +19,7 @@ import com.intellij.platform.lvcs.impl.ActivitySelection import com.intellij.platform.lvcs.impl.filePath import com.intellij.platform.lvcs.impl.statistics.LocalHistoryCounter import com.intellij.util.EventDispatcher -import com.intellij.vcs.impl.shared.changes.DiffPreviewUpdateProcessor +import com.intellij.platform.vcs.impl.shared.changes.DiffPreviewUpdateProcessor import org.jetbrains.annotations.Nls internal class SingleFileActivityDiffPreview(project: Project, private val model: ActivityViewModel, disposable: Disposable) : EditorTabDiffPreview(project) { diff --git a/platform/vcs-impl/backend/intellij.platform.vcs.impl.backend.iml b/platform/vcs-impl/backend/intellij.platform.vcs.impl.backend.iml index 833ea0e387c3..f341e642f11b 100644 --- a/platform/vcs-impl/backend/intellij.platform.vcs.impl.backend.iml +++ b/platform/vcs-impl/backend/intellij.platform.vcs.impl.backend.iml @@ -36,7 +36,6 @@ - diff --git a/platform/vcs-impl/backend/resources/intellij.platform.vcs.impl.backend.xml b/platform/vcs-impl/backend/resources/intellij.platform.vcs.impl.backend.xml index 564cb785f8ba..68b83440c6de 100644 --- a/platform/vcs-impl/backend/resources/intellij.platform.vcs.impl.backend.xml +++ b/platform/vcs-impl/backend/resources/intellij.platform.vcs.impl.backend.xml @@ -1,21 +1,21 @@ - + - - - - - - - + + + + + + + diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ChangelistComparator.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ChangelistComparator.kt similarity index 88% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ChangelistComparator.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ChangelistComparator.kt index e60fe4230eff..55e110cff94f 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ChangelistComparator.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ChangelistComparator.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf; +package com.intellij.platform.vcs.impl.backend.shelf import com.intellij.openapi.vcs.changes.shelf.ShelvedChangeList import java.util.Comparator diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ChangesBrowserNodeConverter.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ChangesBrowserNodeConverter.kt similarity index 91% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ChangesBrowserNodeConverter.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ChangesBrowserNodeConverter.kt index c6ea6922ba1e..8116d097244a 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ChangesBrowserNodeConverter.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ChangesBrowserNodeConverter.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf +package com.intellij.platform.vcs.impl.backend.shelf import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.logger @@ -10,12 +10,14 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowserFilePathNode import com.intellij.openapi.vcs.changes.ui.ChangesBrowserModuleNode import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNode import com.intellij.openapi.vcs.changes.ui.TagChangesBrowserNode -import com.intellij.platform.kernel.withKernel -import com.intellij.vcs.impl.shared.rhizome.* +import com.intellij.platform.vcs.impl.shared.rhizome.FilePathNodeEntity +import com.intellij.platform.vcs.impl.shared.rhizome.ModuleNodeEntity +import com.intellij.platform.vcs.impl.shared.rhizome.NodeEntity +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeEntity +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeListEntity +import com.intellij.platform.vcs.impl.shared.rhizome.TagNodeEntity import com.intellij.vcsUtil.VcsUtil import fleet.kernel.SharedChangeScope -import fleet.kernel.change -import fleet.kernel.shared import org.jetbrains.annotations.ApiStatus import kotlin.reflect.KClass diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfActionsApiProvider.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfActionsApiProvider.kt similarity index 90% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfActionsApiProvider.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfActionsApiProvider.kt index e7f346861e91..36e0a8940693 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfActionsApiProvider.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfActionsApiProvider.kt @@ -1,12 +1,12 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf +package com.intellij.platform.vcs.impl.backend.shelf import com.intellij.platform.project.ProjectId import com.intellij.platform.project.findProject import com.intellij.platform.rpc.backend.RemoteApiProvider -import com.intellij.vcs.impl.shared.rhizome.ShelvedChangeListEntity -import com.intellij.vcs.impl.shared.rpc.ChangeListRpc -import com.intellij.vcs.impl.shared.rpc.RemoteShelfActionsApi +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeListEntity +import com.intellij.platform.vcs.impl.shared.rpc.ChangeListRpc +import com.intellij.platform.vcs.impl.shared.rpc.RemoteShelfActionsApi import fleet.kernel.DurableRef import fleet.rpc.remoteApiDescriptor import org.jetbrains.annotations.ApiStatus diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfApiProvider.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfApiProvider.kt similarity index 87% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfApiProvider.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfApiProvider.kt index abef17e45043..f82f113487bc 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfApiProvider.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfApiProvider.kt @@ -1,19 +1,18 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf +package com.intellij.platform.vcs.impl.backend.shelf import com.intellij.openapi.vcs.changes.shelf.ShelveChangesManager import com.intellij.platform.project.ProjectId import com.intellij.platform.project.findProject import com.intellij.platform.rpc.backend.RemoteApiProvider -import com.intellij.vcs.impl.shared.rhizome.ShelvedChangeListEntity -import com.intellij.vcs.impl.shared.rpc.ChangeListRpc -import com.intellij.vcs.impl.shared.rpc.RemoteShelfApi -import com.intellij.vcs.impl.shared.rpc.UpdateStatus +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeListEntity +import com.intellij.platform.vcs.impl.shared.rpc.ChangeListRpc +import com.intellij.platform.vcs.impl.shared.rpc.RemoteShelfApi +import com.intellij.platform.vcs.impl.shared.rpc.UpdateStatus import fleet.kernel.DurableRef import fleet.rpc.remoteApiDescriptor import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Deferred -import kotlinx.coroutines.delay import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfRemoteActionExecutor.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfRemoteActionExecutor.kt similarity index 97% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfRemoteActionExecutor.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfRemoteActionExecutor.kt index c4996138ce30..fa438c737c35 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfRemoteActionExecutor.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfRemoteActionExecutor.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf +package com.intellij.platform.vcs.impl.backend.shelf import com.intellij.openapi.ListSelection import com.intellij.openapi.application.EDT @@ -13,8 +13,8 @@ import com.intellij.openapi.vcs.changes.patch.CreatePatchCommitExecutor import com.intellij.openapi.vcs.changes.shelf.* import com.intellij.pom.NavigatableAdapter import com.intellij.util.OpenSourceUtil -import com.intellij.vcs.impl.shared.rhizome.ShelvedChangeListEntity -import com.intellij.vcs.impl.shared.rpc.ChangeListRpc +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeListEntity +import com.intellij.platform.vcs.impl.shared.rpc.ChangeListRpc import fleet.kernel.DurableRef import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfTreeHolder.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfTreeHolder.kt similarity index 88% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfTreeHolder.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfTreeHolder.kt index d4037a346adb..2ace8d9f3190 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelfTreeHolder.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelfTreeHolder.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf +package com.intellij.platform.vcs.impl.backend.shelf import com.intellij.openapi.application.EDT import com.intellij.openapi.components.Service @@ -16,14 +16,21 @@ import com.intellij.openapi.vcs.changes.ui.GroupingPolicyFactoryHolder import com.intellij.platform.kernel.withKernel import com.intellij.platform.project.asEntity import com.intellij.util.ui.tree.TreeUtil -import com.intellij.vcs.impl.backend.shelf.diff.BackendShelveEditorDiffPreview -import com.intellij.vcs.impl.backend.shelf.diff.ShelfDiffChangesProvider -import com.intellij.vcs.impl.backend.shelf.diff.ShelfDiffChangesState -import com.intellij.vcs.impl.backend.shelf.diff.ShelvedPreviewProcessor -import com.intellij.vcs.impl.shared.changes.GroupingUpdatePlaces -import com.intellij.vcs.impl.shared.changes.PreviewDiffSplitterComponent -import com.intellij.vcs.impl.shared.rhizome.* -import com.intellij.vcs.impl.shared.rpc.ChangeListRpc +import com.intellij.platform.vcs.impl.backend.shelf.diff.BackendShelveEditorDiffPreview +import com.intellij.platform.vcs.impl.backend.shelf.diff.ShelfDiffChangesProvider +import com.intellij.platform.vcs.impl.backend.shelf.diff.ShelfDiffChangesState +import com.intellij.platform.vcs.impl.backend.shelf.diff.ShelvedPreviewProcessor +import com.intellij.platform.vcs.impl.shared.changes.GroupingUpdatePlaces +import com.intellij.platform.vcs.impl.shared.changes.PreviewDiffSplitterComponent +import com.intellij.platform.vcs.impl.shared.rhizome.DiffSplitterEntity +import com.intellij.platform.vcs.impl.shared.rhizome.GroupingItemEntity +import com.intellij.platform.vcs.impl.shared.rhizome.GroupingItemsEntity +import com.intellij.platform.vcs.impl.shared.rhizome.NodeEntity +import com.intellij.platform.vcs.impl.shared.rhizome.SelectShelveChangeEntity +import com.intellij.platform.vcs.impl.shared.rhizome.ShelfTreeEntity +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeListEntity +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvesTreeRootEntity +import com.intellij.platform.vcs.impl.shared.rpc.ChangeListRpc import com.jetbrains.rhizomedb.entity import fleet.kernel.* import fleet.kernel.rete.Rete @@ -34,6 +41,7 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.debounce import org.jetbrains.annotations.ApiStatus import javax.swing.tree.DefaultTreeModel +import kotlin.collections.iterator private const val UPDATE_DEBOUNCE_TIMEOUT = 200L diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelvedChangeNode.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelvedChangeNode.kt similarity index 96% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelvedChangeNode.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelvedChangeNode.kt index 04bc711fd410..0818e758bb50 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelvedChangeNode.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelvedChangeNode.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf; +package com.intellij.platform.vcs.impl.backend.shelf import com.intellij.openapi.fileTypes.FileTypeManager import com.intellij.openapi.project.Project diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelvedListNode.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelvedListNode.kt similarity index 93% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelvedListNode.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelvedListNode.kt index 8217fc72b58f..a0e9e5bad884 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelvedListNode.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelvedListNode.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf; +package com.intellij.platform.vcs.impl.backend.shelf import com.intellij.openapi.vcs.VcsBundle import com.intellij.openapi.vcs.changes.shelf.ShelvedChangeList diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelvedTreeModelBuilder.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelvedTreeModelBuilder.kt similarity index 98% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelvedTreeModelBuilder.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelvedTreeModelBuilder.kt index a47e8184864e..d480e944d248 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/ShelvedTreeModelBuilder.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/ShelvedTreeModelBuilder.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf; +package com.intellij.platform.vcs.impl.backend.shelf import com.intellij.openapi.project.Project import com.intellij.openapi.vcs.VcsBundle diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/diff/BackendShelveEditorDiffPreview.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/diff/BackendShelveEditorDiffPreview.kt similarity index 96% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/diff/BackendShelveEditorDiffPreview.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/diff/BackendShelveEditorDiffPreview.kt index c1a2732ac1d5..58efe5d18f58 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/diff/BackendShelveEditorDiffPreview.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/diff/BackendShelveEditorDiffPreview.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf.diff +package com.intellij.platform.vcs.impl.backend.shelf.diff import com.intellij.diff.chains.DiffRequestProducer import com.intellij.diff.impl.DiffEditorViewer diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/diff/ShelfDiffChangesProvider.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/diff/ShelfDiffChangesProvider.kt similarity index 91% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/diff/ShelfDiffChangesProvider.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/diff/ShelfDiffChangesProvider.kt index 04ee5d3adcab..ab9c249ede87 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/diff/ShelfDiffChangesProvider.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/diff/ShelfDiffChangesProvider.kt @@ -1,11 +1,11 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf.diff +package com.intellij.platform.vcs.impl.backend.shelf.diff import com.intellij.openapi.vcs.changes.ChangeViewDiffRequestProcessor.Wrapper import com.intellij.openapi.vcs.changes.shelf.ShelvedWrapper import com.intellij.openapi.vcs.changes.ui.VcsTreeModelData import com.intellij.util.containers.JBIterable -import com.intellij.vcs.impl.backend.shelf.ShelvedListNode +import com.intellij.platform.vcs.impl.backend.shelf.ShelvedListNode import kotlinx.coroutines.flow.MutableStateFlow import org.jetbrains.annotations.ApiStatus import javax.swing.tree.TreeModel diff --git a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/diff/ShelvedPreviewProcessor.kt b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/diff/ShelvedPreviewProcessor.kt similarity index 81% rename from platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/diff/ShelvedPreviewProcessor.kt rename to platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/diff/ShelvedPreviewProcessor.kt index 4c4bd6ba7970..ff9a36cf3e1a 100644 --- a/platform/vcs-impl/backend/src/com/intellij/vcs/impl/backend/shelf/diff/ShelvedPreviewProcessor.kt +++ b/platform/vcs-impl/backend/src/com/intellij/platform/vcs/impl/backend/shelf/diff/ShelvedPreviewProcessor.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.backend.shelf.diff; +package com.intellij.platform.vcs.impl.backend.shelf.diff import com.intellij.diff.FrameDiffTool import com.intellij.diff.chains.DiffRequestProducer @@ -14,14 +14,14 @@ import com.intellij.openapi.vcs.changes.shelf.ShelvedWrapperDiffRequestProducer import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNode import com.intellij.platform.kernel.withKernel import com.intellij.platform.project.asEntity +import com.intellij.platform.vcs.impl.backend.shelf.ShelfTreeHolder import com.intellij.util.concurrency.annotations.RequiresEdt import com.intellij.util.ui.tree.TreeUtil -import com.intellij.vcs.impl.backend.shelf.ShelfTreeHolder.Companion.ENTITY_ID_KEY -import com.intellij.vcs.impl.backend.shelf.ShelvedListNode -import com.intellij.vcs.impl.shared.changes.DiffPreviewUpdateProcessor -import com.intellij.vcs.impl.shared.rhizome.SelectShelveChangeEntity -import com.intellij.vcs.impl.shared.rhizome.ShelvedChangeEntity -import com.intellij.vcs.impl.shared.rhizome.ShelvedChangeListEntity +import com.intellij.platform.vcs.impl.backend.shelf.ShelvedListNode +import com.intellij.platform.vcs.impl.shared.changes.DiffPreviewUpdateProcessor +import com.intellij.platform.vcs.impl.shared.rhizome.SelectShelveChangeEntity +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeEntity +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeListEntity import com.jetbrains.rhizomedb.entity import fleet.kernel.change import fleet.kernel.shared @@ -73,8 +73,8 @@ class ShelvedPreviewProcessor( val nodeToSelect = TreeUtil.findNodeWithObject(changesProvider.treeModel.root as ChangesBrowserNode<*>, change) as? ChangesBrowserNode<*> ?: return@withKernel val changeListNode = nodeToSelect.path.firstOrNull { it is ShelvedListNode } as? ChangesBrowserNode<*> ?: return@withKernel - val changeEntity = nodeToSelect.getUserData(ENTITY_ID_KEY)?.derefOrNull() as? ShelvedChangeEntity ?: return@withKernel - val changeListEntity = changeListNode.getUserData(ENTITY_ID_KEY)?.derefOrNull() as? ShelvedChangeListEntity ?: return@withKernel + val changeEntity = nodeToSelect.getUserData(ShelfTreeHolder.Companion.ENTITY_ID_KEY)?.derefOrNull() as? ShelvedChangeEntity ?: return@withKernel + val changeListEntity = changeListNode.getUserData(ShelfTreeHolder.Companion.ENTITY_ID_KEY)?.derefOrNull() as? ShelvedChangeListEntity ?: return@withKernel val projectEntity = project.asEntity() change { shared { diff --git a/platform/vcs-impl/frontend/resources/intellij.platform.vcs.impl.frontend.xml b/platform/vcs-impl/frontend/resources/intellij.platform.vcs.impl.frontend.xml index 54d4b48e7c1d..e681d6ebe4fa 100644 --- a/platform/vcs-impl/frontend/resources/intellij.platform.vcs.impl.frontend.xml +++ b/platform/vcs-impl/frontend/resources/intellij.platform.vcs.impl.frontend.xml @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -15,16 +15,16 @@ + class="com.intellij.platform.vcs.impl.frontend.changes.actions.SelectChangesGroupingFrontendActionGroup"> - - - + + + - @@ -38,25 +38,25 @@ - - - + - - - + + - - + - - + + - + diff --git a/platform/vcs-impl/frontend/src/com/intellij/vcs/impl/frontend/VcsFrontendBundle.kt b/platform/vcs-impl/frontend/src/com/intellij/platform/vcs/impl/frontend/VcsFrontendBundle.kt similarity index 93% rename from platform/vcs-impl/frontend/src/com/intellij/vcs/impl/frontend/VcsFrontendBundle.kt rename to platform/vcs-impl/frontend/src/com/intellij/platform/vcs/impl/frontend/VcsFrontendBundle.kt index a43522e00dac..8abf8e291d0a 100644 --- a/platform/vcs-impl/frontend/src/com/intellij/vcs/impl/frontend/VcsFrontendBundle.kt +++ b/platform/vcs-impl/frontend/src/com/intellij/platform/vcs/impl/frontend/VcsFrontendBundle.kt @@ -1,5 +1,5 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.vcs.impl.frontend +package com.intellij.platform.vcs.impl.frontend import com.intellij.DynamicBundle import org.jetbrains.annotations.Nls diff --git a/platform/vcs-impl/frontend/src/com/intellij/vcs/impl/frontend/VcsFrontendConfiguration.kt b/platform/vcs-impl/frontend/src/com/intellij/platform/vcs/impl/frontend/VcsFrontendConfiguration.kt similarity index 81% rename from platform/vcs-impl/frontend/src/com/intellij/vcs/impl/frontend/VcsFrontendConfiguration.kt rename to platform/vcs-impl/frontend/src/com/intellij/platform/vcs/impl/frontend/VcsFrontendConfiguration.kt index c62eaf60820c..3d81c14c0c50 100644 --- a/platform/vcs-impl/frontend/src/com/intellij/vcs/impl/frontend/VcsFrontendConfiguration.kt +++ b/platform/vcs-impl/frontend/src/com/intellij/platform/vcs/impl/frontend/VcsFrontendConfiguration.kt @@ -1,7 +1,8 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.frontend +package com.intellij.platform.vcs.impl.frontend import com.intellij.openapi.components.* +import com.intellij.openapi.project.Project import com.intellij.util.xmlb.XmlSerializerUtil import org.jetbrains.annotations.ApiStatus @@ -21,6 +22,6 @@ class VcsFrontendConfiguration : PersistentStateComponent - $KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar - $MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.1.0-0.4/rpc-compiler-plugin-2.1.0-0.4.jar - $MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.1.0-0.2/rhizomedb-compiler-plugin-2.1.0-0.2.jar + + $KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar + $MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.1.0-0.4/rpc-compiler-plugin-2.1.0-0.4.jar + $MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.1.0-0.2/rhizomedb-compiler-plugin-2.1.0-0.2.jar + @@ -80,7 +82,5 @@ - - \ No newline at end of file diff --git a/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml b/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml index 51251cd14b38..698584a3d8af 100644 --- a/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml +++ b/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml @@ -16,8 +16,8 @@ $KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar - $MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.1.0-0.2/rhizomedb-compiler-plugin-2.1.0-0.2.jar $MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.1.0-0.4/rpc-compiler-plugin-2.1.0-0.4.jar + $MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.1.0-0.2/rhizomedb-compiler-plugin-2.1.0-0.2.jar diff --git a/platform/vcs-impl/shared/resources/intellij.platform.vcs.impl.shared.xml b/platform/vcs-impl/shared/resources/intellij.platform.vcs.impl.shared.xml index a1942ccaa075..443bf2f8fd30 100644 --- a/platform/vcs-impl/shared/resources/intellij.platform.vcs.impl.shared.xml +++ b/platform/vcs-impl/shared/resources/intellij.platform.vcs.impl.shared.xml @@ -1,9 +1,9 @@ - + - - - - + + + + diff --git a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/changes/DiffPreviewUpdateProcessor.kt b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/changes/DiffPreviewUpdateProcessor.kt similarity index 94% rename from platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/changes/DiffPreviewUpdateProcessor.kt rename to platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/changes/DiffPreviewUpdateProcessor.kt index 45f38be28a29..a815654007b6 100644 --- a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/changes/DiffPreviewUpdateProcessor.kt +++ b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/changes/DiffPreviewUpdateProcessor.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.shared.changes +package com.intellij.platform.vcs.impl.shared.changes import com.intellij.util.concurrency.annotations.RequiresEdt import javax.swing.JComponent diff --git a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/changes/GroupingUpdatePlaces.kt b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/changes/GroupingUpdatePlaces.kt similarity index 88% rename from platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/changes/GroupingUpdatePlaces.kt rename to platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/changes/GroupingUpdatePlaces.kt index 1d497f71103e..13a3cb14e756 100644 --- a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/changes/GroupingUpdatePlaces.kt +++ b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/changes/GroupingUpdatePlaces.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.shared.changes +package com.intellij.platform.vcs.impl.shared.changes import org.jetbrains.annotations.ApiStatus diff --git a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/changes/PreviewDiffSplitterComponent.kt b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/changes/PreviewDiffSplitterComponent.kt similarity index 96% rename from platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/changes/PreviewDiffSplitterComponent.kt rename to platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/changes/PreviewDiffSplitterComponent.kt index a6438f19c6ee..63b65810dc26 100644 --- a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/changes/PreviewDiffSplitterComponent.kt +++ b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/changes/PreviewDiffSplitterComponent.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.shared.changes +package com.intellij.platform.vcs.impl.shared.changes import com.intellij.openapi.vcs.changes.DiffPreview import com.intellij.ui.OnePixelSplitter diff --git a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/GroupingItemTypeProvider.kt b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/GroupingItemTypeProvider.kt similarity index 96% rename from platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/GroupingItemTypeProvider.kt rename to platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/GroupingItemTypeProvider.kt index 84e4c2d5aa8b..f9f75edd0221 100644 --- a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/GroupingItemTypeProvider.kt +++ b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/GroupingItemTypeProvider.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.shared.rhizome +package com.intellij.platform.vcs.impl.shared.rhizome import com.intellij.platform.kernel.EntityTypeProvider import com.jetbrains.rhizomedb.* diff --git a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/ShelfDiffEntityTypeProvider.kt b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/ShelfDiffEntityTypeProvider.kt similarity index 94% rename from platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/ShelfDiffEntityTypeProvider.kt rename to platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/ShelfDiffEntityTypeProvider.kt index 8fbf8435a02e..e61b23e2f741 100644 --- a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/ShelfDiffEntityTypeProvider.kt +++ b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/ShelfDiffEntityTypeProvider.kt @@ -1,9 +1,9 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.shared.rhizome +package com.intellij.platform.vcs.impl.shared.rhizome import com.intellij.platform.kernel.EntityTypeProvider import com.intellij.platform.project.ProjectEntity -import com.intellij.vcs.impl.shared.changes.PreviewDiffSplitterComponent +import com.intellij.platform.vcs.impl.shared.changes.PreviewDiffSplitterComponent import com.jetbrains.rhizomedb.EID import com.jetbrains.rhizomedb.Entity import com.jetbrains.rhizomedb.EntityType diff --git a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/ShelfNodesEntityTypeProvider.kt b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/ShelfNodesEntityTypeProvider.kt similarity index 98% rename from platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/ShelfNodesEntityTypeProvider.kt rename to platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/ShelfNodesEntityTypeProvider.kt index 9c49b7473ee4..27e6ec2f420a 100644 --- a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/ShelfNodesEntityTypeProvider.kt +++ b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/ShelfNodesEntityTypeProvider.kt @@ -1,9 +1,10 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.shared.rhizome +package com.intellij.platform.vcs.impl.shared.rhizome import com.intellij.platform.kernel.EntityTypeProvider import com.intellij.platform.project.ProjectEntity import com.jetbrains.rhizomedb.* +import com.jetbrains.rhizomedb.get import fleet.kernel.DurableEntityType import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.serializer diff --git a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/VcsEntityTypeProvider.kt b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/VcsEntityTypeProvider.kt similarity index 95% rename from platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/VcsEntityTypeProvider.kt rename to platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/VcsEntityTypeProvider.kt index 7b9b8b104b28..612c41c6e56b 100644 --- a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rhizome/VcsEntityTypeProvider.kt +++ b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rhizome/VcsEntityTypeProvider.kt @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.shared.rhizome +package com.intellij.platform.vcs.impl.shared.rhizome import com.intellij.platform.kernel.EntityTypeProvider import com.intellij.platform.project.ProjectEntity diff --git a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rpc/RemoteShelfActionsApi.kt b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rpc/RemoteShelfActionsApi.kt similarity index 91% rename from platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rpc/RemoteShelfActionsApi.kt rename to platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rpc/RemoteShelfActionsApi.kt index 78f25a291697..bfc6fa4ead6e 100644 --- a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rpc/RemoteShelfActionsApi.kt +++ b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rpc/RemoteShelfActionsApi.kt @@ -1,9 +1,9 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.shared.rpc +package com.intellij.platform.vcs.impl.shared.rpc import com.intellij.platform.project.ProjectId import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.vcs.impl.shared.rhizome.ShelvedChangeListEntity +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeListEntity import fleet.kernel.DurableRef import fleet.rpc.RemoteApi import fleet.rpc.Rpc diff --git a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rpc/RemoteShelfApi.kt b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rpc/RemoteShelfApi.kt similarity index 87% rename from platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rpc/RemoteShelfApi.kt rename to platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rpc/RemoteShelfApi.kt index 7f3dc8f4b2e3..f612477afd20 100644 --- a/platform/vcs-impl/shared/src/com/intellij/vcs/impl/shared/rpc/RemoteShelfApi.kt +++ b/platform/vcs-impl/shared/src/com/intellij/platform/vcs/impl/shared/rpc/RemoteShelfApi.kt @@ -1,10 +1,10 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.vcs.impl.shared.rpc +package com.intellij.platform.vcs.impl.shared.rpc import com.intellij.platform.project.ProjectId import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.vcs.impl.shared.rhizome.ShelvedChangeEntity -import com.intellij.vcs.impl.shared.rhizome.ShelvedChangeListEntity +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeEntity +import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeListEntity import fleet.kernel.DurableRef import fleet.rpc.RemoteApi import fleet.rpc.Rpc diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeViewDiffRequestProcessor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeViewDiffRequestProcessor.java index 15385a84d25b..5f9900f9ee93 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeViewDiffRequestProcessor.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeViewDiffRequestProcessor.java @@ -29,7 +29,7 @@ import com.intellij.openapi.vcs.changes.ui.PresentableChange; import com.intellij.util.concurrency.annotations.RequiresEdt; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.JBIterable; -import com.intellij.vcs.impl.shared.changes.DiffPreviewUpdateProcessor; +import com.intellij.platform.vcs.impl.shared.changes.DiffPreviewUpdateProcessor; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java index 2c5476744eed..6c34d32fa797 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java @@ -68,7 +68,7 @@ import com.intellij.util.ui.tree.TreeUtil; import com.intellij.util.xmlb.annotations.Attribute; import com.intellij.util.xmlb.annotations.XCollection; import com.intellij.vcs.commit.*; -import com.intellij.vcs.impl.shared.changes.PreviewDiffSplitterComponent; +import com.intellij.platform.vcs.impl.shared.changes.PreviewDiffSplitterComponent; import com.intellij.vcsUtil.VcsUtil; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/EditorTabPreview.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/EditorTabPreview.kt index 6842a17243ac..701cdf71e5c6 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/EditorTabPreview.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/EditorTabPreview.kt @@ -30,7 +30,7 @@ import com.intellij.util.IJSwingUtilities import com.intellij.util.Processor import com.intellij.util.ui.update.DisposableUpdate import com.intellij.util.ui.update.MergingUpdateQueue -import com.intellij.vcs.impl.shared.changes.DiffPreviewUpdateProcessor +import com.intellij.platform.vcs.impl.shared.changes.DiffPreviewUpdateProcessor import kotlinx.coroutines.Runnable import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.Nls diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SingleFileDiffPreviewProcessor.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SingleFileDiffPreviewProcessor.kt index 1ea461cc937d..b3347e41edc8 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SingleFileDiffPreviewProcessor.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SingleFileDiffPreviewProcessor.kt @@ -5,7 +5,7 @@ import com.intellij.diff.impl.CacheDiffRequestProcessor import com.intellij.diff.requests.NoDiffRequest import com.intellij.openapi.project.Project; import com.intellij.util.ui.UIUtil -import com.intellij.vcs.impl.shared.changes.DiffPreviewUpdateProcessor +import com.intellij.platform.vcs.impl.shared.changes.DiffPreviewUpdateProcessor import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java index 1e10a29117cd..56bcff114411 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java @@ -25,7 +25,6 @@ import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileTypes.FileTypeManager; -import com.intellij.openapi.progress.util.BackgroundTaskUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.SimpleToolWindowPanel; import com.intellij.openapi.util.Disposer; @@ -58,8 +57,8 @@ import com.intellij.util.ui.JBUI; import com.intellij.util.ui.tree.TreeUtil; import com.intellij.util.ui.update.MergingUpdateQueue; import com.intellij.util.ui.update.Update; -import com.intellij.vcs.impl.shared.changes.DiffPreviewUpdateProcessor; -import com.intellij.vcs.impl.shared.changes.PreviewDiffSplitterComponent; +import com.intellij.platform.vcs.impl.shared.changes.DiffPreviewUpdateProcessor; +import com.intellij.platform.vcs.impl.shared.changes.PreviewDiffSplitterComponent; import kotlinx.coroutines.CoroutineScope; import one.util.streamex.StreamEx; import org.jetbrains.annotations.*; @@ -79,7 +78,6 @@ import java.util.stream.Collectors; import static com.intellij.openapi.util.Predicates.nonNull; import static com.intellij.openapi.vcs.VcsNotificationIdsHolder.SHELVE_DELETION_UNDO; import static com.intellij.openapi.vcs.changes.ui.ChangesGroupingSupport.REPOSITORY_GROUPING; -import static com.intellij.openapi.vcs.changes.ui.ChangesGroupingSupport.REPOSITORY_GROUPING; import static com.intellij.openapi.vcs.changes.ui.ChangesViewContentManager.*; import static com.intellij.openapi.vcs.changes.ui.ChangesViewContentManagerKt.subscribeOnVcsToolWindowLayoutChanges; import static com.intellij.util.FontUtil.spaceAndThinSpace; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/GroupingPolicyFactoryHolder.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/GroupingPolicyFactoryHolder.kt index 17b912e1d759..90813ca1f365 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/GroupingPolicyFactoryHolder.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/GroupingPolicyFactoryHolder.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.components.service import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.platform.kernel.withKernel -import com.intellij.vcs.impl.shared.rhizome.GroupingItemEntity +import com.intellij.platform.vcs.impl.shared.rhizome.GroupingItemEntity import fleet.kernel.change import fleet.kernel.shared import kotlinx.coroutines.CoroutineScope diff --git a/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt b/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt index e6866ec9ed8e..f0286f9963de 100644 --- a/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt +++ b/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt @@ -42,7 +42,7 @@ import com.intellij.util.ui.tree.TreeUtil import com.intellij.vcs.commit.CommitStatusPanel import com.intellij.vcs.commit.CommitWorkflowListener import com.intellij.vcs.commit.insertEditedCommitNode -import com.intellij.vcs.impl.shared.changes.PreviewDiffSplitterComponent +import com.intellij.platform.vcs.impl.shared.changes.PreviewDiffSplitterComponent import com.intellij.vcs.log.runInEdt import com.intellij.vcs.log.runInEdtAsync import com.intellij.vcs.ui.ProgressStripe