From b5708c6564ac4a168364b47a8f6621e961c7e91b Mon Sep 17 00:00:00 2001 From: Aydar Mukhametzyanov Date: Tue, 26 Nov 2024 13:23:55 +0100 Subject: [PATCH] IJPL-158622 Move files to shared and add a module for backend GitOrigin-RevId: 80345c958d8bd2568672a92dc066beb4fabd1c77 --- .idea/modules.xml | 1 + java/java-tests/intellij.java.tests.iml | 1 + .../ide/util/gotoByName/NewGotoActionTest.kt | 8 ++++---- platform/lang-impl/intellij.platform.lang.impl.iml | 1 + .../ide/util/gotoByName/ActionSearchUtil.kt | 6 +++--- .../ide/util/gotoByName/ActionsItemsProvider.kt | 2 +- .../src/META-INF/essential-modules.xml | 1 + .../intellij.platform.searchEverywhere.backend.iml | 13 +++++++++++++ .../intellij.platform.searchEverywhere.backend.xml | 2 ++ .../shared/intellij.platform.searchEverywhere.iml | 4 ++++ .../shared/src}/SearchEverywhereItem.kt | 2 +- .../shared/src}/SearchEverywhereItemData.kt | 2 +- .../shared/src}/SearchEverywhereItemId.kt | 2 +- .../shared/src}/SearchEverywhereItemPresentation.kt | 2 +- .../shared/src}/SearchEverywhereItemsProvider.kt | 2 +- .../shared/src}/SearchEverywhereParams.kt | 2 +- .../shared/src}/SearchEverywhereProviderId.kt | 2 +- .../shared/src}/SearchEverywhereSession.kt | 2 +- .../backend/SearchEverywhereBackendDispatcher.kt | 4 ++-- .../backend/SearchEverywhereRpcImpl.kt | 8 ++++---- .../core/SearchEverywhereBaseDispatcher.kt | 8 ++++++-- .../core/SearchEverywhereResultsAccumulator.kt | 4 ++-- .../searchEverywhere/core/SearchEverywhereTab.kt | 4 ++-- .../frontend/SearchEverywhereFrontendDispatcher.kt | 4 ++-- .../frontend/SearchEverywherePopupVm.kt | 6 ++---- .../frontend/SearchEverywhereTabVm.kt | 6 +++--- .../mocks/SearchEverywhereViewItemsProviderMock.kt | 4 ++-- .../shared/SearchEverywhereDispatcher.kt | 6 +++++- .../searchEverywhere/shared/SearchEverywhereRpc.kt | 4 +++- 29 files changed, 72 insertions(+), 41 deletions(-) create mode 100644 platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml create mode 100644 platform/searchEverywhere/backend/resources/intellij.platform.searchEverywhere.backend.xml rename platform/{platform-api/src/com/intellij/searchEverywhere/shared => searchEverywhere/shared/src}/SearchEverywhereItem.kt (87%) rename platform/{platform-api/src/com/intellij/searchEverywhere/shared => searchEverywhere/shared/src}/SearchEverywhereItemData.kt (88%) rename platform/{platform-api/src/com/intellij/searchEverywhere/shared => searchEverywhere/shared/src}/SearchEverywhereItemId.kt (83%) rename platform/{platform-api/src/com/intellij/searchEverywhere/shared => searchEverywhere/shared/src}/SearchEverywhereItemPresentation.kt (94%) rename platform/{platform-api/src/com/intellij/searchEverywhere/shared => searchEverywhere/shared/src}/SearchEverywhereItemsProvider.kt (89%) rename platform/{platform-api/src/com/intellij/searchEverywhere/shared => searchEverywhere/shared/src}/SearchEverywhereParams.kt (85%) rename platform/{platform-api/src/com/intellij/searchEverywhere/shared => searchEverywhere/shared/src}/SearchEverywhereProviderId.kt (83%) rename platform/{platform-api/src/com/intellij/searchEverywhere/shared => searchEverywhere/shared/src}/SearchEverywhereSession.kt (90%) rename platform/{platform-impl/src/com/intellij => searchEverywhere/shared/src}/searchEverywhere/backend/SearchEverywhereBackendDispatcher.kt (60%) rename platform/{platform-impl/src/com/intellij => searchEverywhere/shared/src}/searchEverywhere/backend/SearchEverywhereRpcImpl.kt (62%) rename platform/{platform-impl/src/com/intellij => searchEverywhere/shared/src}/searchEverywhere/core/SearchEverywhereBaseDispatcher.kt (73%) rename platform/{platform-impl/src/com/intellij => searchEverywhere/shared/src}/searchEverywhere/core/SearchEverywhereResultsAccumulator.kt (96%) rename platform/{platform-impl/src/com/intellij => searchEverywhere/shared/src}/searchEverywhere/core/SearchEverywhereTab.kt (72%) rename platform/{platform-impl/src/com/intellij => searchEverywhere/shared/src}/searchEverywhere/frontend/SearchEverywhereFrontendDispatcher.kt (60%) rename platform/{platform-impl/src/com/intellij => searchEverywhere/shared/src}/searchEverywhere/frontend/SearchEverywherePopupVm.kt (84%) rename platform/{platform-impl/src/com/intellij => searchEverywhere/shared/src}/searchEverywhere/frontend/SearchEverywhereTabVm.kt (88%) rename platform/{platform-impl/src/com/intellij => searchEverywhere/shared/src}/searchEverywhere/mocks/SearchEverywhereViewItemsProviderMock.kt (95%) rename platform/{platform-impl/src/com/intellij => searchEverywhere/shared/src}/searchEverywhere/shared/SearchEverywhereDispatcher.kt (59%) rename platform/{platform-impl/src/com/intellij => searchEverywhere/shared/src}/searchEverywhere/shared/SearchEverywhereRpc.kt (65%) diff --git a/.idea/modules.xml b/.idea/modules.xml index fb89ace6f798..e4c74335248c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -823,6 +823,7 @@ + diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml index efd6df3c12a9..13768b7fe312 100644 --- a/java/java-tests/intellij.java.tests.iml +++ b/java/java-tests/intellij.java.tests.iml @@ -98,5 +98,6 @@ + \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/ide/util/gotoByName/NewGotoActionTest.kt b/java/java-tests/testSrc/com/intellij/ide/util/gotoByName/NewGotoActionTest.kt index 9adb410865ba..c195e290ad55 100644 --- a/java/java-tests/testSrc/com/intellij/ide/util/gotoByName/NewGotoActionTest.kt +++ b/java/java-tests/testSrc/com/intellij/ide/util/gotoByName/NewGotoActionTest.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.ide.util.gotoByName -import com.intellij.searchEverywhere.frontend.SearchEverywhereFrontendDispatcher -import com.intellij.searchEverywhere.mocks.* -import com.intellij.searchEverywhere.shared.OptionItemPresentation -import com.intellij.searchEverywhere.shared.SearchEverywhereItemsProvider +import com.intellij.platform.searchEverywhere.OptionItemPresentation +import com.intellij.platform.searchEverywhere.SearchEverywhereItemsProvider +import com.intellij.platform.searchEverywhere.searchEverywhere.frontend.SearchEverywhereFrontendDispatcher +import com.intellij.platform.searchEverywhere.searchEverywhere.mocks.* import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml index bc2f63f86fa0..1d92c4ddc52b 100644 --- a/platform/lang-impl/intellij.platform.lang.impl.iml +++ b/platform/lang-impl/intellij.platform.lang.impl.iml @@ -115,5 +115,6 @@ + \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ActionSearchUtil.kt b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ActionSearchUtil.kt index b6a828618ef5..7d00996cd864 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ActionSearchUtil.kt +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ActionSearchUtil.kt @@ -12,12 +12,12 @@ import com.intellij.lang.LangBundle import com.intellij.openapi.actionSystem.* import com.intellij.openapi.keymap.KeymapUtil import com.intellij.openapi.util.NlsSafe +import com.intellij.platform.searchEverywhere.ActionItemPresentation +import com.intellij.platform.searchEverywhere.OptionItemPresentation +import com.intellij.platform.searchEverywhere.SearchEverywhereItemPresentation import com.intellij.psi.codeStyle.MinusculeMatcher import com.intellij.psi.codeStyle.NameUtil import com.intellij.psi.codeStyle.WordPrefixMatcher -import com.intellij.searchEverywhere.shared.ActionItemPresentation -import com.intellij.searchEverywhere.shared.OptionItemPresentation -import com.intellij.searchEverywhere.shared.SearchEverywhereItemPresentation import com.intellij.util.DefaultBundleService import com.intellij.util.text.Matcher import com.intellij.util.text.nullize diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ActionsItemsProvider.kt b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ActionsItemsProvider.kt index a09ecd3cb373..06e636b5b150 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ActionsItemsProvider.kt +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ActionsItemsProvider.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.actionSystem.impl.Utils.runSuspendingUpdateSessionFo import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.openapi.util.registry.Registry -import com.intellij.searchEverywhere.shared.* +import com.intellij.platform.searchEverywhere.* import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.channelFlow diff --git a/platform/platform-resources/src/META-INF/essential-modules.xml b/platform/platform-resources/src/META-INF/essential-modules.xml index a573a231d157..39db1f7420be 100644 --- a/platform/platform-resources/src/META-INF/essential-modules.xml +++ b/platform/platform-resources/src/META-INF/essential-modules.xml @@ -18,6 +18,7 @@ + diff --git a/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml b/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml new file mode 100644 index 000000000000..0dc686208607 --- /dev/null +++ b/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/searchEverywhere/backend/resources/intellij.platform.searchEverywhere.backend.xml b/platform/searchEverywhere/backend/resources/intellij.platform.searchEverywhere.backend.xml new file mode 100644 index 000000000000..9e7c7ed82d50 --- /dev/null +++ b/platform/searchEverywhere/backend/resources/intellij.platform.searchEverywhere.backend.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml b/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml index 8ec6c08d766f..0aede2017df2 100644 --- a/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml +++ b/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml @@ -9,5 +9,9 @@ + + + + \ No newline at end of file diff --git a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItem.kt b/platform/searchEverywhere/shared/src/SearchEverywhereItem.kt similarity index 87% rename from platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItem.kt rename to platform/searchEverywhere/shared/src/SearchEverywhereItem.kt index c4239fec91b1..a1d45947e785 100644 --- a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItem.kt +++ b/platform/searchEverywhere/shared/src/SearchEverywhereItem.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.searchEverywhere.shared +package com.intellij.platform.searchEverywhere import org.jetbrains.annotations.ApiStatus diff --git a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemData.kt b/platform/searchEverywhere/shared/src/SearchEverywhereItemData.kt similarity index 88% rename from platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemData.kt rename to platform/searchEverywhere/shared/src/SearchEverywhereItemData.kt index b89713e8e2ca..37bf8a6800fa 100644 --- a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemData.kt +++ b/platform/searchEverywhere/shared/src/SearchEverywhereItemData.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.searchEverywhere.shared +package com.intellij.platform.searchEverywhere import org.jetbrains.annotations.ApiStatus diff --git a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemId.kt b/platform/searchEverywhere/shared/src/SearchEverywhereItemId.kt similarity index 83% rename from platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemId.kt rename to platform/searchEverywhere/shared/src/SearchEverywhereItemId.kt index f15083c6e6a7..37a52d9b0b99 100644 --- a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemId.kt +++ b/platform/searchEverywhere/shared/src/SearchEverywhereItemId.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.searchEverywhere.shared +package com.intellij.platform.searchEverywhere import org.jetbrains.annotations.ApiStatus diff --git a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemPresentation.kt b/platform/searchEverywhere/shared/src/SearchEverywhereItemPresentation.kt similarity index 94% rename from platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemPresentation.kt rename to platform/searchEverywhere/shared/src/SearchEverywhereItemPresentation.kt index b4b5ecd27994..b20fb5745d34 100644 --- a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemPresentation.kt +++ b/platform/searchEverywhere/shared/src/SearchEverywhereItemPresentation.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.searchEverywhere.shared +package com.intellij.platform.searchEverywhere import org.jetbrains.annotations.ApiStatus import javax.swing.Icon diff --git a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemsProvider.kt b/platform/searchEverywhere/shared/src/SearchEverywhereItemsProvider.kt similarity index 89% rename from platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemsProvider.kt rename to platform/searchEverywhere/shared/src/SearchEverywhereItemsProvider.kt index d4a9d20c82a6..8aaf331bc264 100644 --- a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereItemsProvider.kt +++ b/platform/searchEverywhere/shared/src/SearchEverywhereItemsProvider.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.searchEverywhere.shared +package com.intellij.platform.searchEverywhere import kotlinx.coroutines.flow.Flow import org.jetbrains.annotations.ApiStatus diff --git a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereParams.kt b/platform/searchEverywhere/shared/src/SearchEverywhereParams.kt similarity index 85% rename from platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereParams.kt rename to platform/searchEverywhere/shared/src/SearchEverywhereParams.kt index b1cca8ca0a1b..248513dc50bc 100644 --- a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereParams.kt +++ b/platform/searchEverywhere/shared/src/SearchEverywhereParams.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.searchEverywhere.shared +package com.intellij.platform.searchEverywhere import org.jetbrains.annotations.ApiStatus diff --git a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereProviderId.kt b/platform/searchEverywhere/shared/src/SearchEverywhereProviderId.kt similarity index 83% rename from platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereProviderId.kt rename to platform/searchEverywhere/shared/src/SearchEverywhereProviderId.kt index 4d8da71eacf9..389fe95f597a 100644 --- a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereProviderId.kt +++ b/platform/searchEverywhere/shared/src/SearchEverywhereProviderId.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.searchEverywhere.shared +package com.intellij.platform.searchEverywhere import org.jetbrains.annotations.ApiStatus diff --git a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereSession.kt b/platform/searchEverywhere/shared/src/SearchEverywhereSession.kt similarity index 90% rename from platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereSession.kt rename to platform/searchEverywhere/shared/src/SearchEverywhereSession.kt index 1ef1f46d289c..6e9ec7604ede 100644 --- a/platform/platform-api/src/com/intellij/searchEverywhere/shared/SearchEverywhereSession.kt +++ b/platform/searchEverywhere/shared/src/SearchEverywhereSession.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.searchEverywhere.shared +package com.intellij.platform.searchEverywhere import com.intellij.openapi.Disposable import org.jetbrains.annotations.ApiStatus diff --git a/platform/platform-impl/src/com/intellij/searchEverywhere/backend/SearchEverywhereBackendDispatcher.kt b/platform/searchEverywhere/shared/src/searchEverywhere/backend/SearchEverywhereBackendDispatcher.kt similarity index 60% rename from platform/platform-impl/src/com/intellij/searchEverywhere/backend/SearchEverywhereBackendDispatcher.kt rename to platform/searchEverywhere/shared/src/searchEverywhere/backend/SearchEverywhereBackendDispatcher.kt index 503cb2b0ba56..5d3ce5d1dc19 100644 --- a/platform/platform-impl/src/com/intellij/searchEverywhere/backend/SearchEverywhereBackendDispatcher.kt +++ b/platform/searchEverywhere/shared/src/searchEverywhere/backend/SearchEverywhereBackendDispatcher.kt @@ -1,7 +1,7 @@ // 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.searchEverywhere.backend +package com.intellij.platform.searchEverywhere.searchEverywhere.backend -import com.intellij.searchEverywhere.core.SearchEverywhereBaseDispatcher +import com.intellij.platform.searchEverywhere.searchEverywhere.core.SearchEverywhereBaseDispatcher import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal diff --git a/platform/platform-impl/src/com/intellij/searchEverywhere/backend/SearchEverywhereRpcImpl.kt b/platform/searchEverywhere/shared/src/searchEverywhere/backend/SearchEverywhereRpcImpl.kt similarity index 62% rename from platform/platform-impl/src/com/intellij/searchEverywhere/backend/SearchEverywhereRpcImpl.kt rename to platform/searchEverywhere/shared/src/searchEverywhere/backend/SearchEverywhereRpcImpl.kt index 358c85e47e7e..5b0c0677ae92 100644 --- a/platform/platform-impl/src/com/intellij/searchEverywhere/backend/SearchEverywhereRpcImpl.kt +++ b/platform/searchEverywhere/shared/src/searchEverywhere/backend/SearchEverywhereRpcImpl.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.searchEverywhere.backend +package com.intellij.platform.searchEverywhere.searchEverywhere.backend -import com.intellij.searchEverywhere.shared.SearchEverywhereItemData -import com.intellij.searchEverywhere.shared.SearchEverywhereParams -import com.intellij.searchEverywhere.shared.SearchEverywhereRpc +import com.intellij.platform.searchEverywhere.SearchEverywhereItemData +import com.intellij.platform.searchEverywhere.SearchEverywhereParams +import com.intellij.platform.searchEverywhere.searchEverywhere.shared.SearchEverywhereRpc import kotlinx.coroutines.flow.Flow import org.jetbrains.annotations.ApiStatus diff --git a/platform/platform-impl/src/com/intellij/searchEverywhere/core/SearchEverywhereBaseDispatcher.kt b/platform/searchEverywhere/shared/src/searchEverywhere/core/SearchEverywhereBaseDispatcher.kt similarity index 73% rename from platform/platform-impl/src/com/intellij/searchEverywhere/core/SearchEverywhereBaseDispatcher.kt rename to platform/searchEverywhere/shared/src/searchEverywhere/core/SearchEverywhereBaseDispatcher.kt index 60d419c47a86..07a9d371f4ae 100644 --- a/platform/platform-impl/src/com/intellij/searchEverywhere/core/SearchEverywhereBaseDispatcher.kt +++ b/platform/searchEverywhere/shared/src/searchEverywhere/core/SearchEverywhereBaseDispatcher.kt @@ -1,7 +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.searchEverywhere.core +package com.intellij.platform.searchEverywhere.searchEverywhere.core -import com.intellij.searchEverywhere.shared.* +import com.intellij.platform.searchEverywhere.SearchEverywhereItemData +import com.intellij.platform.searchEverywhere.SearchEverywhereItemsProvider +import com.intellij.platform.searchEverywhere.SearchEverywhereParams +import com.intellij.platform.searchEverywhere.SearchEverywhereProviderId +import com.intellij.platform.searchEverywhere.searchEverywhere.shared.SearchEverywhereDispatcher import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asFlow diff --git a/platform/platform-impl/src/com/intellij/searchEverywhere/core/SearchEverywhereResultsAccumulator.kt b/platform/searchEverywhere/shared/src/searchEverywhere/core/SearchEverywhereResultsAccumulator.kt similarity index 96% rename from platform/platform-impl/src/com/intellij/searchEverywhere/core/SearchEverywhereResultsAccumulator.kt rename to platform/searchEverywhere/shared/src/searchEverywhere/core/SearchEverywhereResultsAccumulator.kt index 7b549884770b..7f2b70b347f6 100644 --- a/platform/platform-impl/src/com/intellij/searchEverywhere/core/SearchEverywhereResultsAccumulator.kt +++ b/platform/searchEverywhere/shared/src/searchEverywhere/core/SearchEverywhereResultsAccumulator.kt @@ -1,7 +1,7 @@ // 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.searchEverywhere.core +package com.intellij.platform.searchEverywhere.searchEverywhere.core -import com.intellij.searchEverywhere.shared.* +import com.intellij.platform.searchEverywhere.* import kotlinx.coroutines.isActive import kotlinx.coroutines.yield import org.jetbrains.annotations.ApiStatus diff --git a/platform/platform-impl/src/com/intellij/searchEverywhere/core/SearchEverywhereTab.kt b/platform/searchEverywhere/shared/src/searchEverywhere/core/SearchEverywhereTab.kt similarity index 72% rename from platform/platform-impl/src/com/intellij/searchEverywhere/core/SearchEverywhereTab.kt rename to platform/searchEverywhere/shared/src/searchEverywhere/core/SearchEverywhereTab.kt index 9c9aa923e86c..68c7c5e13ecc 100644 --- a/platform/platform-impl/src/com/intellij/searchEverywhere/core/SearchEverywhereTab.kt +++ b/platform/searchEverywhere/shared/src/searchEverywhere/core/SearchEverywhereTab.kt @@ -1,7 +1,7 @@ // 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.searchEverywhere.core +package com.intellij.platform.searchEverywhere.searchEverywhere.core -import com.intellij.searchEverywhere.shared.SearchEverywhereItemsProvider +import com.intellij.platform.searchEverywhere.SearchEverywhereItemsProvider import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal diff --git a/platform/platform-impl/src/com/intellij/searchEverywhere/frontend/SearchEverywhereFrontendDispatcher.kt b/platform/searchEverywhere/shared/src/searchEverywhere/frontend/SearchEverywhereFrontendDispatcher.kt similarity index 60% rename from platform/platform-impl/src/com/intellij/searchEverywhere/frontend/SearchEverywhereFrontendDispatcher.kt rename to platform/searchEverywhere/shared/src/searchEverywhere/frontend/SearchEverywhereFrontendDispatcher.kt index 6c9039957a44..b30ba72a7bec 100644 --- a/platform/platform-impl/src/com/intellij/searchEverywhere/frontend/SearchEverywhereFrontendDispatcher.kt +++ b/platform/searchEverywhere/shared/src/searchEverywhere/frontend/SearchEverywhereFrontendDispatcher.kt @@ -1,7 +1,7 @@ // 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.searchEverywhere.frontend +package com.intellij.platform.searchEverywhere.searchEverywhere.frontend -import com.intellij.searchEverywhere.core.SearchEverywhereBaseDispatcher +import com.intellij.platform.searchEverywhere.searchEverywhere.core.SearchEverywhereBaseDispatcher import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal diff --git a/platform/platform-impl/src/com/intellij/searchEverywhere/frontend/SearchEverywherePopupVm.kt b/platform/searchEverywhere/shared/src/searchEverywhere/frontend/SearchEverywherePopupVm.kt similarity index 84% rename from platform/platform-impl/src/com/intellij/searchEverywhere/frontend/SearchEverywherePopupVm.kt rename to platform/searchEverywhere/shared/src/searchEverywhere/frontend/SearchEverywherePopupVm.kt index 7f53dd965702..25bd0bf96aa8 100644 --- a/platform/platform-impl/src/com/intellij/searchEverywhere/frontend/SearchEverywherePopupVm.kt +++ b/platform/searchEverywhere/shared/src/searchEverywhere/frontend/SearchEverywherePopupVm.kt @@ -1,8 +1,7 @@ // 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.searchEverywhere.frontend +package com.intellij.platform.searchEverywhere.searchEverywhere.frontend -import com.intellij.openapi.project.Project -import com.intellij.searchEverywhere.core.SearchEverywhereTab +import com.intellij.platform.searchEverywhere.searchEverywhere.core.SearchEverywhereTab import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow @@ -11,7 +10,6 @@ import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal class SearchEverywherePopupVm(private val coroutineScope: CoroutineScope, - private val project: Project, private val tabs: List) { val currentTab: StateFlow get() = _currentTab.asStateFlow() diff --git a/platform/platform-impl/src/com/intellij/searchEverywhere/frontend/SearchEverywhereTabVm.kt b/platform/searchEverywhere/shared/src/searchEverywhere/frontend/SearchEverywhereTabVm.kt similarity index 88% rename from platform/platform-impl/src/com/intellij/searchEverywhere/frontend/SearchEverywhereTabVm.kt rename to platform/searchEverywhere/shared/src/searchEverywhere/frontend/SearchEverywhereTabVm.kt index 294609b6dc46..193b3721e22b 100644 --- a/platform/platform-impl/src/com/intellij/searchEverywhere/frontend/SearchEverywhereTabVm.kt +++ b/platform/searchEverywhere/shared/src/searchEverywhere/frontend/SearchEverywhereTabVm.kt @@ -1,8 +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.searchEverywhere.frontend +package com.intellij.platform.searchEverywhere.searchEverywhere.frontend -import com.intellij.searchEverywhere.core.SearchEverywhereTab -import com.intellij.searchEverywhere.shared.SearchEverywhereItemData +import com.intellij.platform.searchEverywhere.SearchEverywhereItemData +import com.intellij.platform.searchEverywhere.searchEverywhere.core.SearchEverywhereTab import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/platform/platform-impl/src/com/intellij/searchEverywhere/mocks/SearchEverywhereViewItemsProviderMock.kt b/platform/searchEverywhere/shared/src/searchEverywhere/mocks/SearchEverywhereViewItemsProviderMock.kt similarity index 95% rename from platform/platform-impl/src/com/intellij/searchEverywhere/mocks/SearchEverywhereViewItemsProviderMock.kt rename to platform/searchEverywhere/shared/src/searchEverywhere/mocks/SearchEverywhereViewItemsProviderMock.kt index 11448ea6b799..9e4583e80dde 100644 --- a/platform/platform-impl/src/com/intellij/searchEverywhere/mocks/SearchEverywhereViewItemsProviderMock.kt +++ b/platform/searchEverywhere/shared/src/searchEverywhere/mocks/SearchEverywhereViewItemsProviderMock.kt @@ -1,7 +1,7 @@ // 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.searchEverywhere.mocks +package com.intellij.platform.searchEverywhere.searchEverywhere.mocks -import com.intellij.searchEverywhere.shared.* +import com.intellij.platform.searchEverywhere.* import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/platform/platform-impl/src/com/intellij/searchEverywhere/shared/SearchEverywhereDispatcher.kt b/platform/searchEverywhere/shared/src/searchEverywhere/shared/SearchEverywhereDispatcher.kt similarity index 59% rename from platform/platform-impl/src/com/intellij/searchEverywhere/shared/SearchEverywhereDispatcher.kt rename to platform/searchEverywhere/shared/src/searchEverywhere/shared/SearchEverywhereDispatcher.kt index ed971bed8a7f..7cc6597aa313 100644 --- a/platform/platform-impl/src/com/intellij/searchEverywhere/shared/SearchEverywhereDispatcher.kt +++ b/platform/searchEverywhere/shared/src/searchEverywhere/shared/SearchEverywhereDispatcher.kt @@ -1,6 +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.searchEverywhere.shared +package com.intellij.platform.searchEverywhere.searchEverywhere.shared +import com.intellij.platform.searchEverywhere.SearchEverywhereItemData +import com.intellij.platform.searchEverywhere.SearchEverywhereItemsProvider +import com.intellij.platform.searchEverywhere.SearchEverywhereParams +import com.intellij.platform.searchEverywhere.SearchEverywhereProviderId import kotlinx.coroutines.flow.Flow import org.jetbrains.annotations.ApiStatus diff --git a/platform/platform-impl/src/com/intellij/searchEverywhere/shared/SearchEverywhereRpc.kt b/platform/searchEverywhere/shared/src/searchEverywhere/shared/SearchEverywhereRpc.kt similarity index 65% rename from platform/platform-impl/src/com/intellij/searchEverywhere/shared/SearchEverywhereRpc.kt rename to platform/searchEverywhere/shared/src/searchEverywhere/shared/SearchEverywhereRpc.kt index d184e037da63..995067fe138d 100644 --- a/platform/platform-impl/src/com/intellij/searchEverywhere/shared/SearchEverywhereRpc.kt +++ b/platform/searchEverywhere/shared/src/searchEverywhere/shared/SearchEverywhereRpc.kt @@ -1,6 +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.searchEverywhere.shared +package com.intellij.platform.searchEverywhere.searchEverywhere.shared +import com.intellij.platform.searchEverywhere.SearchEverywhereItemData +import com.intellij.platform.searchEverywhere.SearchEverywhereParams import kotlinx.coroutines.flow.Flow import org.jetbrains.annotations.ApiStatus