diff --git a/java/java-tests/testSrc/com/intellij/java/configurationStore/SaveAsDirectoryBasedFormatActionTest.kt b/java/java-tests/testSrc/com/intellij/java/configurationStore/SaveAsDirectoryBasedFormatActionTest.kt index 8288cbacb7d3..aa9e6b85acfb 100644 --- a/java/java-tests/testSrc/com/intellij/java/configurationStore/SaveAsDirectoryBasedFormatActionTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/configurationStore/SaveAsDirectoryBasedFormatActionTest.kt @@ -1,10 +1,10 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.java.configurationStore import com.intellij.ide.actions.SaveAsDirectoryBasedFormatAction import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.application.runWriteActionAndWait -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.testFramework.TemporaryDirectory import com.intellij.testFramework.fixtures.BareTestFixtureTestCase import com.intellij.testFramework.loadProjectAndCheckResults diff --git a/java/java-tests/testSrc/com/intellij/java/configurationStore/testUtils.kt b/java/java-tests/testSrc/com/intellij/java/configurationStore/testUtils.kt index 4895e6e08f28..8ae74d2d1ea4 100644 --- a/java/java-tests/testSrc/com/intellij/java/configurationStore/testUtils.kt +++ b/java/java-tests/testSrc/com/intellij/java/configurationStore/testUtils.kt @@ -2,7 +2,7 @@ package com.intellij.java.configurationStore import com.intellij.openapi.application.ex.PathManagerEx -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.platform.workspace.jps.CustomModuleEntitySource import com.intellij.platform.workspace.jps.JpsFileEntitySource import com.intellij.platform.workspace.jps.entities.LibraryEntity diff --git a/java/java-tests/testSrc/com/intellij/roots/AutomaticModuleUnloaderTest.kt b/java/java-tests/testSrc/com/intellij/roots/AutomaticModuleUnloaderTest.kt index 0a265ecd98e0..350e6c190b4e 100644 --- a/java/java-tests/testSrc/com/intellij/roots/AutomaticModuleUnloaderTest.kt +++ b/java/java-tests/testSrc/com/intellij/roots/AutomaticModuleUnloaderTest.kt @@ -4,7 +4,7 @@ package com.intellij.roots import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.EDT import com.intellij.openapi.application.runWriteAction -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.module.AutomaticModuleUnloader import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager diff --git a/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java b/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java index fe089951554d..2f6f2c52d619 100644 --- a/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java +++ b/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.compiler; import com.intellij.compiler.server.BuildManager; @@ -6,8 +6,8 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.components.PersistentStateComponent; -import com.intellij.openapi.components.ServiceKt; import com.intellij.openapi.components.impl.stores.IComponentStore; +import com.intellij.openapi.components.impl.stores.IComponentStoreKt; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.module.Module; @@ -49,7 +49,7 @@ public final class CompilerTestUtil { @NotNull public static IComponentStore getApplicationStore() { - return ServiceKt.getStateStore(ApplicationManager.getApplication()); + return IComponentStoreKt.getStateStore(ApplicationManager.getApplication()); } @TestOnly diff --git a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java index e081ecf7bd44..15e4f5dc55b5 100644 --- a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java +++ b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.testFramework; import com.intellij.compiler.CompilerManagerImpl; @@ -13,8 +13,8 @@ import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.compiler.*; import com.intellij.openapi.components.PersistentStateComponent; -import com.intellij.openapi.components.ServiceKt; import com.intellij.openapi.components.impl.stores.IComponentStore; +import com.intellij.openapi.components.impl.stores.IComponentStoreKt; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -215,7 +215,7 @@ public final class CompilerTester { LOG.warn(message); String fakeMacroName = "__remove_me__"; - IComponentStore appStore = ServiceKt.getStateStore(ApplicationManager.getApplication()); + IComponentStore appStore = IComponentStoreKt.getStateStore(ApplicationManager.getApplication()); pathMacroManager.setMacro(fakeMacroName, fakeMacroName); appStore.saveComponent((PersistentStateComponent)pathMacroManager); pathMacroManager.setMacro(fakeMacroName, null); diff --git a/platform/configuration-store-impl/src/ApplicationStoreBridge.kt b/platform/configuration-store-impl/src/ApplicationStoreBridge.kt index c9bce27e7af3..6ebddeec7eb3 100644 --- a/platform/configuration-store-impl/src/ApplicationStoreBridge.kt +++ b/platform/configuration-store-impl/src/ApplicationStoreBridge.kt @@ -4,7 +4,11 @@ package com.intellij.configurationStore import com.intellij.ide.plugins.PluginManagerCore import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.PathManager -import com.intellij.openapi.components.* +import com.intellij.openapi.components.ExpandMacroToPathMap +import com.intellij.openapi.components.PathMacroManager +import com.intellij.openapi.components.PathMacroMap +import com.intellij.openapi.components.StateSplitterEx +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.platform.diagnostic.telemetry.helpers.MillisecondsMeasurer import com.intellij.platform.workspace.jps.serialization.impl.JpsAppFileContentWriter import com.intellij.platform.workspace.jps.serialization.impl.JpsFileContentReader diff --git a/platform/configuration-store-impl/src/ApplicationStoreImpl.kt b/platform/configuration-store-impl/src/ApplicationStoreImpl.kt index 9ac5539715c9..4b87050c98e3 100644 --- a/platform/configuration-store-impl/src/ApplicationStoreImpl.kt +++ b/platform/configuration-store-impl/src/ApplicationStoreImpl.kt @@ -6,7 +6,11 @@ import com.intellij.diagnostic.LoadingState import com.intellij.openapi.application.Application import com.intellij.openapi.application.PathManager import com.intellij.openapi.application.appSystemDir -import com.intellij.openapi.components.* +import com.intellij.openapi.components.PathMacroManager +import com.intellij.openapi.components.StateStorageOperation +import com.intellij.openapi.components.StoragePathMacros +import com.intellij.openapi.components.impl.stores.stateStore +import com.intellij.openapi.components.serviceAsync import com.intellij.openapi.diagnostic.getOrLogException import com.intellij.openapi.project.ProjectManager import com.intellij.openapi.project.ex.ProjectManagerEx diff --git a/platform/configuration-store-impl/src/ComponentStoreImpl.kt b/platform/configuration-store-impl/src/ComponentStoreImpl.kt index c6d6532f2ef0..4d5b0aef6231 100644 --- a/platform/configuration-store-impl/src/ComponentStoreImpl.kt +++ b/platform/configuration-store-impl/src/ComponentStoreImpl.kt @@ -17,6 +17,7 @@ import com.intellij.openapi.application.readAction import com.intellij.openapi.components.* import com.intellij.openapi.components.StateStorageChooserEx.Resolution import com.intellij.openapi.components.impl.stores.IComponentStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.diagnostic.* import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.project.Project diff --git a/platform/configuration-store-impl/src/DefaultProjectStoreImpl.kt b/platform/configuration-store-impl/src/DefaultProjectStoreImpl.kt index bf0fe454b1d3..a26ce9558b43 100644 --- a/platform/configuration-store-impl/src/DefaultProjectStoreImpl.kt +++ b/platform/configuration-store-impl/src/DefaultProjectStoreImpl.kt @@ -3,6 +3,7 @@ package com.intellij.configurationStore import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.* +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.newvfs.events.VFileEvent import com.intellij.platform.settings.SettingsController diff --git a/platform/configuration-store-impl/src/ExportSettingsAction.kt b/platform/configuration-store-impl/src/ExportSettingsAction.kt index 9d54e24b265b..73f06820f0e7 100644 --- a/platform/configuration-store-impl/src/ExportSettingsAction.kt +++ b/platform/configuration-store-impl/src/ExportSettingsAction.kt @@ -17,6 +17,7 @@ import com.intellij.openapi.actionSystem.remoting.ActionRemoteBehaviorSpecificat import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.PathManager import com.intellij.openapi.components.* +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.extensions.PluginDescriptor import com.intellij.openapi.options.OptionsBundle import com.intellij.openapi.options.SchemeManagerFactory diff --git a/platform/configuration-store-impl/src/HeadlessSaveAndSyncHandler.kt b/platform/configuration-store-impl/src/HeadlessSaveAndSyncHandler.kt index dd68ceba93cc..46c356ada1d7 100644 --- a/platform/configuration-store-impl/src/HeadlessSaveAndSyncHandler.kt +++ b/platform/configuration-store-impl/src/HeadlessSaveAndSyncHandler.kt @@ -1,12 +1,12 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.configurationStore import com.intellij.openapi.components.ComponentManager -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.platform.ide.progress.ModalTaskOwner import com.intellij.platform.ide.progress.runWithModalProgressBlocking -internal class HeadlessSaveAndSyncHandler : NoOpSaveAndSyncHandler() { +private class HeadlessSaveAndSyncHandler : NoOpSaveAndSyncHandler() { override fun saveSettingsUnderModalProgress(componentManager: ComponentManager): Boolean { runInAutoSaveDisabledMode { runWithModalProgressBlocking(ModalTaskOwner.guess(), "") { diff --git a/platform/configuration-store-impl/src/ProjectStoreImpl.kt b/platform/configuration-store-impl/src/ProjectStoreImpl.kt index b49cf2476bcd..c992b1a04a25 100644 --- a/platform/configuration-store-impl/src/ProjectStoreImpl.kt +++ b/platform/configuration-store-impl/src/ProjectStoreImpl.kt @@ -10,6 +10,7 @@ import com.intellij.openapi.application.EDT import com.intellij.openapi.application.PathManager import com.intellij.openapi.components.* import com.intellij.openapi.components.impl.stores.IProjectStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.diagnostic.getOrLogException import com.intellij.openapi.project.* import com.intellij.openapi.project.ex.ProjectEx diff --git a/platform/configuration-store-impl/src/StorageVirtualFileTracker.kt b/platform/configuration-store-impl/src/StorageVirtualFileTracker.kt index e5396ea4e61c..b0477cf3557d 100644 --- a/platform/configuration-store-impl/src/StorageVirtualFileTracker.kt +++ b/platform/configuration-store-impl/src/StorageVirtualFileTracker.kt @@ -8,7 +8,7 @@ import com.intellij.openapi.components.StateStorage import com.intellij.openapi.components.impl.stores.ComponentStorageUtil import com.intellij.openapi.components.impl.stores.IComponentStore import com.intellij.openapi.components.service -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.AsyncFileListener diff --git a/platform/configuration-store-impl/src/StoreReloadManagerImpl.kt b/platform/configuration-store-impl/src/StoreReloadManagerImpl.kt index 6bc9d954b429..f3f8d0e2456d 100644 --- a/platform/configuration-store-impl/src/StoreReloadManagerImpl.kt +++ b/platform/configuration-store-impl/src/StoreReloadManagerImpl.kt @@ -12,7 +12,7 @@ import com.intellij.openapi.application.ex.ApplicationManagerEx import com.intellij.openapi.components.StateStorage import com.intellij.openapi.components.impl.stores.IComponentStore import com.intellij.openapi.components.impl.stores.IProjectStore -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.diagnostic.debug import com.intellij.openapi.diagnostic.getOrLogException import com.intellij.openapi.options.Scheme diff --git a/platform/configuration-store-impl/src/schemeManager/SchemeManagerFactoryImpl.kt b/platform/configuration-store-impl/src/schemeManager/SchemeManagerFactoryImpl.kt index a9e04159b846..05912b80a846 100644 --- a/platform/configuration-store-impl/src/schemeManager/SchemeManagerFactoryImpl.kt +++ b/platform/configuration-store-impl/src/schemeManager/SchemeManagerFactoryImpl.kt @@ -8,7 +8,7 @@ import com.intellij.openapi.components.ComponentManager import com.intellij.openapi.components.RoamingType import com.intellij.openapi.components.SettingsCategory import com.intellij.openapi.components.impl.stores.IProjectStore -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.options.Scheme import com.intellij.openapi.options.SchemeManager import com.intellij.openapi.options.SchemeManagerFactory diff --git a/platform/configuration-store-impl/src/statistic/eventLog/FeatureUsageSettingsEventScheduler.kt b/platform/configuration-store-impl/src/statistic/eventLog/FeatureUsageSettingsEventScheduler.kt index dc95f54a6c4d..7efc774a4044 100644 --- a/platform/configuration-store-impl/src/statistic/eventLog/FeatureUsageSettingsEventScheduler.kt +++ b/platform/configuration-store-impl/src/statistic/eventLog/FeatureUsageSettingsEventScheduler.kt @@ -9,7 +9,11 @@ import com.intellij.configurationStore.getStateForComponent import com.intellij.internal.statistic.eventLog.fus.FeatureUsageLogger import com.intellij.internal.statistic.eventLog.fus.FeatureUsageStateEventTracker import com.intellij.openapi.application.ApplicationManager -import com.intellij.openapi.components.* +import com.intellij.openapi.components.ComponentManager +import com.intellij.openapi.components.ComponentManagerEx +import com.intellij.openapi.components.PersistentStateComponent +import com.intellij.openapi.components.impl.stores.stateStore +import com.intellij.openapi.components.service import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.project.Project import com.intellij.openapi.project.ex.ProjectManagerEx diff --git a/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt b/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt index f92dd81590dd..0c12c6615b16 100644 --- a/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt +++ b/platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt @@ -5,6 +5,7 @@ import com.intellij.configurationStore.schemeManager.ROOT_CONFIG import com.intellij.ide.plugins.PluginManagerCore import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.* +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.options.OptionsBundle import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.openapi.project.ProjectBundle diff --git a/platform/configuration-store-impl/testSrc/DefaultProjectStoreTest.kt b/platform/configuration-store-impl/testSrc/DefaultProjectStoreTest.kt index 459246c8f73b..29b1a6a264f3 100644 --- a/platform/configuration-store-impl/testSrc/DefaultProjectStoreTest.kt +++ b/platform/configuration-store-impl/testSrc/DefaultProjectStoreTest.kt @@ -7,7 +7,7 @@ import com.intellij.openapi.application.EDT import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.components.Service import com.intellij.openapi.components.service -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.project.Project import com.intellij.openapi.project.ProjectManager import com.intellij.openapi.project.ex.ProjectManagerEx diff --git a/platform/configuration-store-impl/testSrc/DoNotSaveDefaultsTest.kt b/platform/configuration-store-impl/testSrc/DoNotSaveDefaultsTest.kt index b2a2ee0af6c0..9c81f0d04540 100644 --- a/platform/configuration-store-impl/testSrc/DoNotSaveDefaultsTest.kt +++ b/platform/configuration-store-impl/testSrc/DoNotSaveDefaultsTest.kt @@ -5,7 +5,7 @@ import com.intellij.ide.util.PropertiesComponent import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.EDT import com.intellij.openapi.components.PersistentStateComponent -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.project.Project import com.intellij.project.ProjectStoreOwner import com.intellij.serviceContainer.ComponentManagerImpl diff --git a/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt b/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt index 320b39ce9b64..f6444ce62ae6 100644 --- a/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt +++ b/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt @@ -7,7 +7,7 @@ import com.intellij.openapi.application.EDT import com.intellij.openapi.application.writeAction import com.intellij.openapi.components.StoragePathMacros import com.intellij.openapi.components.service -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.module.Module import com.intellij.openapi.project.ModuleListener import com.intellij.openapi.project.Project diff --git a/platform/configuration-store-impl/testSrc/ModuleStoreTest.kt b/platform/configuration-store-impl/testSrc/ModuleStoreTest.kt index ee9633848914..ecb8d2f47bd2 100644 --- a/platform/configuration-store-impl/testSrc/ModuleStoreTest.kt +++ b/platform/configuration-store-impl/testSrc/ModuleStoreTest.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.application.EDT import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.application.writeAction import com.intellij.openapi.components.StoragePathMacros -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.roots.ModuleRootManager diff --git a/platform/configuration-store-impl/testSrc/ProjectStoreTest.kt b/platform/configuration-store-impl/testSrc/ProjectStoreTest.kt index f14dab459a7a..717074c3a4b8 100644 --- a/platform/configuration-store-impl/testSrc/ProjectStoreTest.kt +++ b/platform/configuration-store-impl/testSrc/ProjectStoreTest.kt @@ -4,7 +4,11 @@ package com.intellij.configurationStore import com.intellij.ide.highlighter.ProjectFileType import com.intellij.ide.impl.OpenProjectTask import com.intellij.ide.plugins.PluginManagerCore -import com.intellij.openapi.components.* +import com.intellij.openapi.components.ComponentManager +import com.intellij.openapi.components.PersistentStateComponent +import com.intellij.openapi.components.State +import com.intellij.openapi.components.Storage +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.project.Project import com.intellij.openapi.project.ex.ProjectEx import com.intellij.openapi.project.ex.ProjectManagerEx diff --git a/platform/projectModel-impl/src/com/intellij/openapi/components/service.kt b/platform/core-api/src/com/intellij/openapi/components/service.kt similarity index 89% rename from platform/projectModel-impl/src/com/intellij/openapi/components/service.kt rename to platform/core-api/src/com/intellij/openapi/components/service.kt index 24e479206894..516b8cb95787 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/components/service.kt +++ b/platform/core-api/src/com/intellij/openapi/components/service.kt @@ -4,9 +4,7 @@ package com.intellij.openapi.components import com.intellij.codeWithMe.ClientId import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.client.ClientKind -import com.intellij.openapi.components.impl.stores.IComponentStore import org.jetbrains.annotations.ApiStatus -import org.jetbrains.annotations.ApiStatus.Internal /** * This is primarily intended to be used by the service implementation. When introducing a new service, @@ -61,13 +59,4 @@ inline fun serviceIfCreated(): T? = ApplicationManager.getAppl @Deprecated("Use override accepting {@link ClientKind} for better control over kinds of clients the services are requested for") inline fun services(includeLocal: Boolean): List { return ApplicationManager.getApplication().getServices(T::class.java, if (includeLocal) ClientKind.ALL else ClientKind.REMOTE) -} - -@Internal -interface ComponentStoreOwner { - val componentStore: IComponentStore -} - -@get:Internal -val ComponentManager.stateStore: IComponentStore - get() = if (this is ComponentStoreOwner) this.componentStore else service() \ No newline at end of file +} \ No newline at end of file diff --git a/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt b/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt index e7a510dd970b..a0c3a11e8c2d 100644 --- a/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt +++ b/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt @@ -21,6 +21,7 @@ import com.intellij.openapi.application.ModalityState import com.intellij.openapi.application.ReadAction import com.intellij.openapi.application.readAction import com.intellij.openapi.components.* +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.diagnostic.runAndLogException @@ -60,7 +61,6 @@ import com.intellij.util.containers.nullize import com.intellij.util.containers.toMutableSmartList import com.intellij.util.text.UniqueNameGenerator import com.intellij.util.ui.JBUI -import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.jdom.Element diff --git a/platform/lang-impl/api-dump-unreviewed.txt b/platform/lang-impl/api-dump-unreviewed.txt index e8af8247eb83..5f2850807315 100644 --- a/platform/lang-impl/api-dump-unreviewed.txt +++ b/platform/lang-impl/api-dump-unreviewed.txt @@ -24717,10 +24717,6 @@ c:com.intellij.psi.search.scope.packageSet.FilePackageSetParserExtension - ps:parseFilePattern(com.intellij.lexer.Lexer):java.lang.String - parsePackageSet(com.intellij.lexer.Lexer,java.lang.String,java.lang.String):com.intellij.psi.search.scope.packageSet.PackageSet - parseScope(com.intellij.lexer.Lexer):java.lang.String -f:com.intellij.psi.search.scope.packageSet.PackageSetFactoryImpl -- com.intellij.psi.search.scope.packageSet.PackageSetFactory -- ():V -- compile(java.lang.String):com.intellij.psi.search.scope.packageSet.PackageSet com.intellij.psi.search.scope.packageSet.PackageSetParserExtension - sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName - a:parsePackageSet(com.intellij.lexer.Lexer,java.lang.String,java.lang.String):com.intellij.psi.search.scope.packageSet.PackageSet diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplatesLoader.kt b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplatesLoader.kt index b195c990c174..e5b0a97aa77c 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplatesLoader.kt +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplatesLoader.kt @@ -13,7 +13,7 @@ import com.intellij.l10n.LocalizationUtil import com.intellij.openapi.Disposable import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.PathManager -import com.intellij.openapi.components.ComponentStoreOwner +import com.intellij.openapi.components.impl.stores.ComponentStoreOwner import com.intellij.openapi.diagnostic.getOrLogException import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.extensions.PluginDescriptor diff --git a/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/PackageSetFactoryImpl.java b/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/PackageSetFactoryImpl.java index 2e578eaa89e5..105c119efac0 100644 --- a/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/PackageSetFactoryImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/PackageSetFactoryImpl.java @@ -6,7 +6,7 @@ import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.icons.AllIcons; import com.intellij.lexer.Lexer; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.components.ServiceKt; +import com.intellij.openapi.components.impl.stores.IComponentStoreKt; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.ExtensionPointListener; import com.intellij.openapi.extensions.PluginDescriptor; @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; -public final class PackageSetFactoryImpl extends PackageSetFactory { +final class PackageSetFactoryImpl extends PackageSetFactory { private static final Logger LOG = Logger.getInstance(PackageSetFactoryImpl.class); public PackageSetFactoryImpl() { @@ -30,7 +30,7 @@ public final class PackageSetFactoryImpl extends PackageSetFactory { public void extensionAdded(@NotNull PackageSetParserExtension extension, @NotNull PluginDescriptor pluginDescriptor) { for (Project project : ProjectManager.getInstance().getOpenProjects()) { for (NamedScopesHolder holder : NamedScopesHolder.getAllNamedScopeHolders(project)) { - ServiceKt.getStateStore(project).reloadState(holder.getClass()); + IComponentStoreKt.getStateStore(project).reloadState(holder.getClass()); holder.fireScopeListeners(); } } diff --git a/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/FileReferenceInWorkspaceEntityUpdater.kt b/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/FileReferenceInWorkspaceEntityUpdater.kt index 6fd25bb11a23..1d2f0054bf35 100644 --- a/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/FileReferenceInWorkspaceEntityUpdater.kt +++ b/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/FileReferenceInWorkspaceEntityUpdater.kt @@ -4,7 +4,7 @@ package com.intellij.workspaceModel.ide.impl import com.google.common.io.Files import com.intellij.ide.highlighter.ModuleFileType import com.intellij.openapi.components.StateStorage -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.project.Project diff --git a/platform/platform-impl/api-dump-unreviewed.txt b/platform/platform-impl/api-dump-unreviewed.txt index 2d43fb5dff23..6c5ef7b33429 100644 --- a/platform/platform-impl/api-dump-unreviewed.txt +++ b/platform/platform-impl/api-dump-unreviewed.txt @@ -18080,9 +18080,9 @@ f:com.intellij.openapi.project.impl.UndefinedMacrosConfigurable - reset():V com.intellij.openapi.project.impl.shared.ConfigFolderChangedListener - sf:Companion:com.intellij.openapi.project.impl.shared.ConfigFolderChangedListener$Companion +- sf:TOPIC:com.intellij.util.messages.Topic - a:onChange(java.util.Set,java.util.Set):V f:com.intellij.openapi.project.impl.shared.ConfigFolderChangedListener$Companion -- f:getTOPIC():com.intellij.util.messages.Topic f:com.intellij.openapi.project.impl.shared.SharedConfigFolderUtil - sf:INSTANCE:com.intellij.openapi.project.impl.shared.SharedConfigFolderUtil - f:deleteSharedFile(java.nio.file.Path):V diff --git a/platform/platform-impl/src/com/intellij/configurationStore/storageUtil.kt b/platform/platform-impl/src/com/intellij/configurationStore/storageUtil.kt index b6c82ab30b53..b718dc3e4901 100644 --- a/platform/platform-impl/src/com/intellij/configurationStore/storageUtil.kt +++ b/platform/platform-impl/src/com/intellij/configurationStore/storageUtil.kt @@ -1,4 +1,6 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +@file:Suppress("ReplacePutWithAssignment") + package com.intellij.configurationStore import com.intellij.ide.IdeBundle @@ -9,7 +11,7 @@ import com.intellij.openapi.application.PathMacros import com.intellij.openapi.components.ComponentManager import com.intellij.openapi.components.TrackingPathMacroSubstitutor import com.intellij.openapi.components.impl.stores.IComponentStore -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.project.Project import com.intellij.openapi.project.ProjectBundle diff --git a/platform/platform-impl/src/com/intellij/configurationStore/storeUtil.kt b/platform/platform-impl/src/com/intellij/configurationStore/storeUtil.kt index 16f7b0e55ca6..3962acfb5576 100644 --- a/platform/platform-impl/src/com/intellij/configurationStore/storeUtil.kt +++ b/platform/platform-impl/src/com/intellij/configurationStore/storeUtil.kt @@ -14,6 +14,7 @@ import com.intellij.openapi.application.PathManager import com.intellij.openapi.application.ex.ApplicationManagerEx import com.intellij.openapi.components.* import com.intellij.openapi.components.impl.stores.IComponentStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.progress.ProcessCanceledException diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/shared/SharedConfigFolderUtil.kt b/platform/platform-impl/src/com/intellij/openapi/project/impl/shared/SharedConfigFolderUtil.kt index 23bcd60925cd..59fed271313b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/impl/shared/SharedConfigFolderUtil.kt +++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/shared/SharedConfigFolderUtil.kt @@ -2,7 +2,7 @@ package com.intellij.openapi.project.impl.shared import com.intellij.openapi.application.Application -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.diagnostic.debug import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.vfs.VfsUtil @@ -26,7 +26,8 @@ import kotlin.random.Random interface ConfigFolderChangedListener { companion object { - val TOPIC = Topic(ConfigFolderChangedListener::class.java.simpleName, ConfigFolderChangedListener::class.java) + @JvmField + val TOPIC: Topic = Topic(ConfigFolderChangedListener::class.java.simpleName, ConfigFolderChangedListener::class.java) } fun onChange(changedFileSpecs: Set, deletedFileSpecs: Set) @@ -113,9 +114,7 @@ object SharedConfigFolderUtil { } } - private fun ioWithRetries(open: () -> T): T { - return ioWithRetries(open, { it }) - } + private fun ioWithRetries(open: () -> T): T = ioWithRetries(open) { it } private fun writeWithRetries(file: Path, vararg options: OpenOption, task: (FileChannel) -> T): T { return ioWithRetries( diff --git a/platform/platform-impl/src/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsGlobalModelSynchronizerImpl.kt b/platform/platform-impl/src/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsGlobalModelSynchronizerImpl.kt index b2aec4424a63..72431b56baf8 100644 --- a/platform/platform-impl/src/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsGlobalModelSynchronizerImpl.kt +++ b/platform/platform-impl/src/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsGlobalModelSynchronizerImpl.kt @@ -1,8 +1,8 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.workspaceModel.ide.impl.jps.serialization import com.intellij.openapi.application.* -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.util.JDOMUtil diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/application/ConfigImportHelperTest.kt b/platform/platform-tests/testSrc/com/intellij/openapi/application/ConfigImportHelperTest.kt index 330f72641d76..13d7840fc0f6 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/application/ConfigImportHelperTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/openapi/application/ConfigImportHelperTest.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.application import com.intellij.configurationStore.getPerOsSettingsStorageFolderName @@ -10,7 +10,7 @@ import com.intellij.ide.startup.StartupActionScriptManager import com.intellij.ide.util.PropertiesComponent import com.intellij.idea.TestFor import com.intellij.openapi.components.StoragePathMacros -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.progress.ProgressIndicator diff --git a/platform/projectModel-api/src/com/intellij/openapi/components/StateStorage.kt b/platform/projectModel-api/src/com/intellij/openapi/components/StateStorage.kt index b7dd0270888d..29ea34a184ee 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/components/StateStorage.kt +++ b/platform/projectModel-api/src/com/intellij/openapi/components/StateStorage.kt @@ -40,4 +40,4 @@ interface StateStorageChooserEx { enum class Resolution { DO, SKIP, CLEAR } fun getResolution(storage: Storage, operation: StateStorageOperation): Resolution -} +} \ No newline at end of file diff --git a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/IComponentStore.kt b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/IComponentStore.kt index d4c309d3d083..66694cc31b0c 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/IComponentStore.kt +++ b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/IComponentStore.kt @@ -2,15 +2,17 @@ package com.intellij.openapi.components.impl.stores import com.intellij.configurationStore.StateStorageManager +import com.intellij.openapi.components.ComponentManager import com.intellij.openapi.components.PersistentStateComponent import com.intellij.openapi.components.ServiceDescriptor +import com.intellij.openapi.components.service import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.util.NlsSafe -import org.jetbrains.annotations.ApiStatus +import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.annotations.TestOnly import java.nio.file.Path -@ApiStatus.Internal +@Internal interface IComponentStore { val storageManager: StateStorageManager @@ -40,4 +42,13 @@ interface IComponentStore { fun clearCaches() fun release() -} \ No newline at end of file +} + +@Internal +interface ComponentStoreOwner { + val componentStore: IComponentStore +} + +@get:Internal +val ComponentManager.stateStore: IComponentStore + get() = if (this is ComponentStoreOwner) this.componentStore else this.service() \ No newline at end of file diff --git a/platform/projectModel-impl/src/com/intellij/project/project.kt b/platform/projectModel-impl/src/com/intellij/project/project.kt index 76061ea380a0..62bcd7c34a31 100644 --- a/platform/projectModel-impl/src/com/intellij/project/project.kt +++ b/platform/projectModel-impl/src/com/intellij/project/project.kt @@ -1,10 +1,11 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.project -import com.intellij.openapi.components.ComponentStoreOwner import com.intellij.openapi.components.StorageScheme +import com.intellij.openapi.components.impl.stores.ComponentStoreOwner import com.intellij.openapi.components.impl.stores.IProjectStore -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore +import com.intellij.openapi.components.service import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.annotations.ApiStatus @@ -19,7 +20,14 @@ interface ProjectStoreOwner : ComponentStoreOwner { } val Project.isDirectoryBased: Boolean - get() = !isDefault && StorageScheme.DIRECTORY_BASED == (stateStore as? IProjectStore)?.storageScheme + get() { + if (isDefault) { + return false + } + + val stateStore = if (this is ComponentStoreOwner) this.componentStore else service() + return (stateStore as? IProjectStore)?.storageScheme == StorageScheme.DIRECTORY_BASED + } fun getProjectStoreDirectory(file: VirtualFile): VirtualFile? { return if (file.isDirectory) file.findChild(Project.DIRECTORY_STORE_FOLDER) else null diff --git a/platform/service-container/src/com/intellij/serviceContainer/ComponentManagerImpl.kt b/platform/service-container/src/com/intellij/serviceContainer/ComponentManagerImpl.kt index be17ec8131fe..4063dd68029b 100644 --- a/platform/service-container/src/com/intellij/serviceContainer/ComponentManagerImpl.kt +++ b/platform/service-container/src/com/intellij/serviceContainer/ComponentManagerImpl.kt @@ -17,6 +17,7 @@ import com.intellij.openapi.Disposable import com.intellij.openapi.application.* import com.intellij.openapi.components.* import com.intellij.openapi.components.ServiceDescriptor.PreloadMode +import com.intellij.openapi.components.impl.stores.ComponentStoreOwner import com.intellij.openapi.components.impl.stores.IComponentStore import com.intellij.openapi.diagnostic.Attachment import com.intellij.openapi.diagnostic.ControlFlowException diff --git a/platform/testFramework/src/com/intellij/openapi/components/PersistentStateComponentUtil.kt b/platform/testFramework/src/com/intellij/openapi/components/PersistentStateComponentUtil.kt index b041d5b0e6cf..217968e9baab 100644 --- a/platform/testFramework/src/com/intellij/openapi/components/PersistentStateComponentUtil.kt +++ b/platform/testFramework/src/com/intellij/openapi/components/PersistentStateComponentUtil.kt @@ -2,6 +2,7 @@ package com.intellij.openapi.components import com.intellij.openapi.application.ApplicationManager +import com.intellij.openapi.components.impl.stores.stateStore import org.jetbrains.annotations.TestOnly import java.lang.System.identityHashCode diff --git a/platform/testFramework/src/com/intellij/testFramework/OpenProjectTaskBuilder.kt b/platform/testFramework/src/com/intellij/testFramework/OpenProjectTaskBuilder.kt index acde703a30c3..363565f1f6c9 100644 --- a/platform/testFramework/src/com/intellij/testFramework/OpenProjectTaskBuilder.kt +++ b/platform/testFramework/src/com/intellij/testFramework/OpenProjectTaskBuilder.kt @@ -5,7 +5,7 @@ import com.intellij.configurationStore.StoreReloadManager import com.intellij.ide.impl.OpenProjectTask import com.intellij.ide.impl.runUnderModalProgressIfIsEdt import com.intellij.openapi.components.impl.stores.IProjectStore -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.project.Project import com.intellij.openapi.project.impl.ProjectImpl import com.intellij.util.ThreeState diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/BrowseCommittedChangesAction.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/BrowseCommittedChangesAction.kt index d23f21089e10..d4b6f8d4ac98 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/BrowseCommittedChangesAction.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/BrowseCommittedChangesAction.kt @@ -6,7 +6,7 @@ import com.intellij.ide.plugins.PluginManagerCore import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.CommonDataKeys.VIRTUAL_FILE -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.project.DumbAwareAction import com.intellij.openapi.project.Project import com.intellij.openapi.ui.MessageType diff --git a/platform/workspace/jps/tests/testSrc/com/intellij/workspaceModel/ide/impl/jps/serialization/jpsTestUtils.kt b/platform/workspace/jps/tests/testSrc/com/intellij/workspaceModel/ide/impl/jps/serialization/jpsTestUtils.kt index 6271aa41cd95..d57529fb87e9 100644 --- a/platform/workspace/jps/tests/testSrc/com/intellij/workspaceModel/ide/impl/jps/serialization/jpsTestUtils.kt +++ b/platform/workspace/jps/tests/testSrc/com/intellij/workspaceModel/ide/impl/jps/serialization/jpsTestUtils.kt @@ -12,7 +12,7 @@ import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.components.PathMacroMap import com.intellij.openapi.components.impl.ModulePathMacroManager import com.intellij.openapi.components.impl.ProjectPathMacroManager -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.module.impl.UnloadedModulesNameHolderImpl import com.intellij.openapi.project.ExternalStorageConfigurationManager import com.intellij.openapi.util.JDOMUtil diff --git a/plugins/configuration-script/src/providers/ConfigurationScriptProjectStoreFactory.kt b/plugins/configuration-script/src/providers/ConfigurationScriptProjectStoreFactory.kt index 8cda1e8485c6..ebd68ac68df0 100644 --- a/plugins/configuration-script/src/providers/ConfigurationScriptProjectStoreFactory.kt +++ b/plugins/configuration-script/src/providers/ConfigurationScriptProjectStoreFactory.kt @@ -7,7 +7,7 @@ import com.intellij.ide.plugins.PluginManagerCore import com.intellij.openapi.components.BaseState import com.intellij.openapi.components.PersistentStateComponent import com.intellij.openapi.components.StateStorage -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.project.Project diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/testUtils.kt b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/testUtils.kt index 930a113baa71..7d8a2b274754 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/testUtils.kt +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/testUtils.kt @@ -5,7 +5,7 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.EDT import com.intellij.openapi.application.PathMacros import com.intellij.openapi.application.PluginPathManager -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.project.Project import com.intellij.openapi.roots.ModuleRootManager diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbSettingsImporter.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbSettingsImporter.kt index bc0c46c37f03..f07c485bc9c0 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbSettingsImporter.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbSettingsImporter.kt @@ -18,6 +18,7 @@ import com.intellij.ide.ui.LafManager import com.intellij.ide.ui.laf.LafManagerImpl import com.intellij.openapi.application.* import com.intellij.openapi.components.* +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.editor.colors.EditorColorsManager import com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl diff --git a/plugins/settings-repository/src/IcsManager.kt b/plugins/settings-repository/src/IcsManager.kt index 552f942526db..504ec1b875a8 100644 --- a/plugins/settings-repository/src/IcsManager.kt +++ b/plugins/settings-repository/src/IcsManager.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.settingsRepository import com.intellij.configurationStore.StreamProvider @@ -8,7 +8,11 @@ import com.intellij.ide.ApplicationLoadListener import com.intellij.openapi.application.Application import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ex.ApplicationManagerEx -import com.intellij.openapi.components.* +import com.intellij.openapi.components.RoamingType +import com.intellij.openapi.components.Service +import com.intellij.openapi.components.impl.stores.stateStore +import com.intellij.openapi.components.service +import com.intellij.openapi.components.serviceAsync import com.intellij.openapi.diagnostic.getOrLogException import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.options.SchemeManagerFactory diff --git a/plugins/settings-repository/src/actions/ConfigureIcsAction.kt b/plugins/settings-repository/src/actions/ConfigureIcsAction.kt index c874da431dab..a61d23d4edf7 100644 --- a/plugins/settings-repository/src/actions/ConfigureIcsAction.kt +++ b/plugins/settings-repository/src/actions/ConfigureIcsAction.kt @@ -5,7 +5,7 @@ import com.intellij.openapi.actionSystem.ActionPlaces import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.application.ApplicationManager -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory import com.intellij.openapi.project.DumbAwareAction import com.intellij.openapi.ui.TextFieldWithBrowseButton diff --git a/plugins/settings-repository/src/autoSync.kt b/plugins/settings-repository/src/autoSync.kt index ce4becfdf727..a69f440729c1 100644 --- a/plugins/settings-repository/src/autoSync.kt +++ b/plugins/settings-repository/src/autoSync.kt @@ -7,7 +7,7 @@ import com.intellij.openapi.application.EDT import com.intellij.openapi.application.ModalityState import com.intellij.openapi.application.asContextElement import com.intellij.openapi.components.ComponentManagerEx -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.openapi.progress.runBlockingMaybeCancellable import com.intellij.platform.util.progress.reportRawProgress diff --git a/plugins/settings-repository/src/copyAppSettingsToRepository.kt b/plugins/settings-repository/src/copyAppSettingsToRepository.kt index b7e10c76851d..d163258142af 100644 --- a/plugins/settings-repository/src/copyAppSettingsToRepository.kt +++ b/plugins/settings-repository/src/copyAppSettingsToRepository.kt @@ -7,7 +7,7 @@ import com.intellij.configurationStore.* import com.intellij.configurationStore.schemeManager.ROOT_CONFIG import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.RoamingType -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.util.containers.forEachGuaranteed import com.intellij.util.io.directoryStreamIfExists import org.jetbrains.annotations.VisibleForTesting diff --git a/plugins/settings-repository/src/repositoryListEditor.kt b/plugins/settings-repository/src/repositoryListEditor.kt index 79dc1fbd5a88..a744b2c9f059 100644 --- a/plugins/settings-repository/src/repositoryListEditor.kt +++ b/plugins/settings-repository/src/repositoryListEditor.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.settingsRepository import com.intellij.configurationStore.ComponentStoreImpl @@ -6,7 +6,7 @@ import com.intellij.configurationStore.StateStorageManagerImpl import com.intellij.configurationStore.reloadAppStore import com.intellij.configurationStore.schemeManager.SchemeManagerFactoryBase import com.intellij.openapi.application.ApplicationManager -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.options.SchemeManagerFactory import com.intellij.openapi.progress.runBlockingModalWithRawProgressReporter import com.intellij.openapi.progress.runModalTask diff --git a/plugins/settings-repository/src/sync.kt b/plugins/settings-repository/src/sync.kt index a0641ba0e783..7a54e1fb5a53 100644 --- a/plugins/settings-repository/src/sync.kt +++ b/plugins/settings-repository/src/sync.kt @@ -6,7 +6,7 @@ import com.intellij.configurationStore.schemeManager.SchemeManagerImpl import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.EDT import com.intellij.openapi.components.StateStorage -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.util.SmartList import com.intellij.util.containers.CollectionFactory import kotlinx.coroutines.CancellationException diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncMain.kt b/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncMain.kt index 286e7fe52856..56e97d50ce3d 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncMain.kt +++ b/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncMain.kt @@ -7,7 +7,7 @@ import com.intellij.openapi.application.PathManager import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.components.serviceIfCreated -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.settingsSync.auth.SettingsSyncAuthService import com.intellij.util.SystemProperties import org.jetbrains.annotations.ApiStatus diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncConfigurable.kt b/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncConfigurable.kt index e32651f6403e..f39455692d61 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncConfigurable.kt +++ b/plugins/settings-sync/src/com/intellij/settingsSync/config/SettingsSyncConfigurable.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationNamesInfo import com.intellij.openapi.application.ex.ApplicationEx import com.intellij.openapi.application.runInEdt -import com.intellij.openapi.components.stateStore +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 diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/migration/SettingsRepositoryToSettingsSyncMigration.kt b/plugins/settings-sync/src/com/intellij/settingsSync/migration/SettingsRepositoryToSettingsSyncMigration.kt index fccc98da1554..b6050b13428d 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/migration/SettingsRepositoryToSettingsSyncMigration.kt +++ b/plugins/settings-sync/src/com/intellij/settingsSync/migration/SettingsRepositoryToSettingsSyncMigration.kt @@ -9,7 +9,7 @@ import com.intellij.notification.NotificationType import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ConfigBackup import com.intellij.openapi.application.PathManager -import com.intellij.openapi.components.stateStore +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.util.io.FileUtil diff --git a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncIdeMediatorTest.kt b/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncIdeMediatorTest.kt index 292cbe2f547d..fdecee0d52c5 100644 --- a/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncIdeMediatorTest.kt +++ b/plugins/settings-sync/tests/com/intellij/settingsSync/SettingsSyncIdeMediatorTest.kt @@ -7,6 +7,7 @@ import com.intellij.ide.plugins.PluginManagerCore import com.intellij.idea.TestFor import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.* +import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.serviceContainer.ComponentManagerImpl import com.intellij.testFramework.fixtures.BasePlatformTestCase import com.intellij.testFramework.rules.InMemoryFsRule