[Workspace Model] Move VersionedStorageChangeInternal into the impl subpackage

After the review note in https://jetbrains.team/p/ij/reviews/138027/timeline?chat-panel-active=true

GitOrigin-RevId: 976f2d79906d7b206d308621cfad22b7bd76351d
This commit is contained in:
Alex Plate
2024-06-27 12:06:17 +03:00
committed by intellij-monorepo-bot
parent 6d74f7f193
commit a5fcf97ba3
13 changed files with 19 additions and 17 deletions

View File

@@ -11,7 +11,7 @@ import com.intellij.platform.backend.workspace.WorkspaceModelChangeListener;
import com.intellij.platform.workspace.jps.entities.*; import com.intellij.platform.workspace.jps.entities.*;
import com.intellij.platform.workspace.storage.EntityChange; import com.intellij.platform.workspace.storage.EntityChange;
import com.intellij.platform.workspace.storage.VersionedStorageChange; import com.intellij.platform.workspace.storage.VersionedStorageChange;
import com.intellij.platform.workspace.storage.VersionedStorageChangeInternal; import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal;
import com.intellij.platform.workspace.storage.WorkspaceEntity; import com.intellij.platform.workspace.storage.WorkspaceEntity;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@@ -7,7 +7,7 @@ import com.intellij.openapi.diagnostic.trace
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.platform.workspace.storage.VersionedStorageChange import com.intellij.platform.workspace.storage.VersionedStorageChange
import com.intellij.platform.workspace.storage.VersionedStorageChangeInternal import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal
import com.intellij.util.indexing.EntityIndexingServiceEx import com.intellij.util.indexing.EntityIndexingServiceEx
import com.intellij.workspaceModel.ide.impl.legacyBridge.module.ModuleRootListenerBridge import com.intellij.workspaceModel.ide.impl.legacyBridge.module.ModuleRootListenerBridge
import com.intellij.workspaceModel.ide.impl.legacyBridge.watcher.VirtualFileUrlWatcher import com.intellij.workspaceModel.ide.impl.legacyBridge.watcher.VirtualFileUrlWatcher

View File

@@ -9,7 +9,7 @@ import com.intellij.platform.backend.workspace.WorkspaceModelChangeListener;
import com.intellij.platform.backend.workspace.WorkspaceModelTopics; import com.intellij.platform.backend.workspace.WorkspaceModelTopics;
import com.intellij.platform.workspace.storage.EntityChange; import com.intellij.platform.workspace.storage.EntityChange;
import com.intellij.platform.workspace.storage.VersionedStorageChange; import com.intellij.platform.workspace.storage.VersionedStorageChange;
import com.intellij.platform.workspace.storage.VersionedStorageChangeInternal; import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal;
import com.intellij.platform.workspace.storage.url.VirtualFileUrl; import com.intellij.platform.workspace.storage.url.VirtualFileUrl;
import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager; import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager;
import com.intellij.testFramework.HeavyPlatformTestCase; import com.intellij.testFramework.HeavyPlatformTestCase;

View File

@@ -39,6 +39,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleEntity
import com.intellij.platform.workspace.jps.serialization.impl.* import com.intellij.platform.workspace.jps.serialization.impl.*
import com.intellij.platform.workspace.jps.serialization.impl.JpsProjectEntitiesLoader.createProjectSerializers import com.intellij.platform.workspace.jps.serialization.impl.JpsProjectEntitiesLoader.createProjectSerializers
import com.intellij.platform.workspace.storage.* import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager

View File

@@ -6,6 +6,7 @@ import com.intellij.openapi.project.Project
import com.intellij.platform.backend.workspace.WorkspaceModel import com.intellij.platform.backend.workspace.WorkspaceModel
import com.intellij.platform.workspace.jps.entities.* import com.intellij.platform.workspace.jps.entities.*
import com.intellij.platform.workspace.storage.* import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.ApiStatus

View File

@@ -5,7 +5,7 @@ import com.intellij.openapi.project.Project
import com.intellij.platform.backend.workspace.WorkspaceModelChangeListener import com.intellij.platform.backend.workspace.WorkspaceModelChangeListener
import com.intellij.platform.workspace.jps.JpsGlobalFileEntitySource import com.intellij.platform.workspace.jps.JpsGlobalFileEntitySource
import com.intellij.platform.workspace.storage.VersionedStorageChange import com.intellij.platform.workspace.storage.VersionedStorageChange
import com.intellij.platform.workspace.storage.VersionedStorageChangeInternal import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal
import com.intellij.workspaceModel.ide.impl.legacyBridge.library.LegacyCustomLibraryEntitySource import com.intellij.workspaceModel.ide.impl.legacyBridge.library.LegacyCustomLibraryEntitySource
internal class GlobalWorkspaceModelSynchronizerListener(private val project: Project) : WorkspaceModelChangeListener { internal class GlobalWorkspaceModelSynchronizerListener(private val project: Project) : WorkspaceModelChangeListener {

View File

@@ -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. // 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.reactive package com.intellij.workspaceModel.ide.impl.reactive
import com.intellij.platform.workspace.storage.VersionedStorageChangeInternal import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal
import com.intellij.platform.workspace.storage.impl.cache.CacheProcessingStatus import com.intellij.platform.workspace.storage.impl.cache.CacheProcessingStatus
import com.intellij.platform.workspace.storage.impl.cache.ChangeOnVersionedChange import com.intellij.platform.workspace.storage.impl.cache.ChangeOnVersionedChange
import com.intellij.platform.workspace.storage.impl.cache.cache import com.intellij.platform.workspace.storage.impl.cache.cache

View File

@@ -14,7 +14,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.EntityChange import com.intellij.platform.workspace.storage.EntityChange
import com.intellij.platform.workspace.storage.EntitySource import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.VersionedStorageChange import com.intellij.platform.workspace.storage.VersionedStorageChange
import com.intellij.platform.workspace.storage.VersionedStorageChangeInternal import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal
import com.intellij.platform.workspace.storage.testEntities.entities.MySource import com.intellij.platform.workspace.storage.testEntities.entities.MySource
import com.intellij.testFramework.ApplicationRule import com.intellij.testFramework.ApplicationRule
import com.intellij.testFramework.assertInstanceOf import com.intellij.testFramework.assertInstanceOf

View File

@@ -61,11 +61,3 @@ public interface VersionedStorageChange {
*/ */
public fun <T : WorkspaceEntity> getChanges(entityClass: Class<T>): List<EntityChange<T>> public fun <T : WorkspaceEntity> getChanges(entityClass: Class<T>): List<EntityChange<T>>
} }
@ApiStatus.Internal
public interface VersionedStorageChangeInternal : VersionedStorageChange {
/** Use [getChanges] to process changes of the specific entities. */
@ApiStatus.Internal
@ApiStatus.Obsolete
public fun getAllChanges(): Sequence<EntityChange<*>>
}

View File

@@ -248,6 +248,14 @@ public open class VersionedEntityStorageImpl(initialStorage: ImmutableEntityStor
} }
} }
@ApiStatus.Internal
public interface VersionedStorageChangeInternal : VersionedStorageChange {
/** Use [getChanges] to process changes of the specific entities. */
@ApiStatus.Internal
@ApiStatus.Obsolete
public fun getAllChanges(): Sequence<EntityChange<*>>
}
private class VersionedStorageChangeImpl( private class VersionedStorageChangeImpl(
override val storageBefore: ImmutableEntityStorage, override val storageBefore: ImmutableEntityStorage,
override val storageAfter: ImmutableEntityStorage, override val storageAfter: ImmutableEntityStorage,

View File

@@ -15,7 +15,7 @@ import com.intellij.platform.workspace.jps.entities.LibraryEntity
import com.intellij.platform.workspace.jps.entities.LibraryRootTypeId import com.intellij.platform.workspace.jps.entities.LibraryRootTypeId
import com.intellij.platform.workspace.storage.EntityChange import com.intellij.platform.workspace.storage.EntityChange
import com.intellij.platform.workspace.storage.VersionedStorageChange import com.intellij.platform.workspace.storage.VersionedStorageChange
import com.intellij.platform.workspace.storage.VersionedStorageChangeInternal import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal
import com.intellij.psi.JavaPsiFacade import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat

View File

@@ -7,7 +7,7 @@ import com.intellij.openapi.roots.ModuleRootListener
import com.intellij.platform.backend.workspace.WorkspaceModelChangeListener import com.intellij.platform.backend.workspace.WorkspaceModelChangeListener
import com.intellij.platform.backend.workspace.WorkspaceModelTopics import com.intellij.platform.backend.workspace.WorkspaceModelTopics
import com.intellij.platform.workspace.storage.VersionedStorageChange import com.intellij.platform.workspace.storage.VersionedStorageChange
import com.intellij.platform.workspace.storage.VersionedStorageChangeInternal import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal
import com.intellij.util.messages.MessageBusConnection import com.intellij.util.messages.MessageBusConnection
import org.junit.Assert import org.junit.Assert

View File

@@ -8,7 +8,7 @@ import com.intellij.openapi.util.Disposer
import com.intellij.platform.backend.workspace.WorkspaceModelChangeListener import com.intellij.platform.backend.workspace.WorkspaceModelChangeListener
import com.intellij.platform.backend.workspace.WorkspaceModelTopics import com.intellij.platform.backend.workspace.WorkspaceModelTopics
import com.intellij.platform.workspace.storage.VersionedStorageChange import com.intellij.platform.workspace.storage.VersionedStorageChange
import com.intellij.platform.workspace.storage.VersionedStorageChangeInternal import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal
import com.intellij.platform.workspace.storage.WorkspaceEntity import com.intellij.platform.workspace.storage.WorkspaceEntity
import com.intellij.platform.workspace.storage.WorkspaceEntityWithSymbolicId import com.intellij.platform.workspace.storage.WorkspaceEntityWithSymbolicId
import com.intellij.testFramework.ExtensionTestUtil.maskExtensions import com.intellij.testFramework.ExtensionTestUtil.maskExtensions