diff --git a/platform/projectModel-impl/api-dump-unreviewed.txt b/platform/projectModel-impl/api-dump-unreviewed.txt index 5d0c4598337f..3535a135ac1e 100644 --- a/platform/projectModel-impl/api-dump-unreviewed.txt +++ b/platform/projectModel-impl/api-dump-unreviewed.txt @@ -903,10 +903,6 @@ f:com.intellij.util.modules.CircularModuleDependenciesDetector *:com.intellij.workspaceModel.core.fileIndex.WorkspaceFileSetWithCustomData - com.intellij.workspaceModel.core.fileIndex.WorkspaceFileSet - a:getData():com.intellij.workspaceModel.core.fileIndex.WorkspaceFileSetData -f:com.intellij.workspaceModel.ide.JpsEntitySourcesKt -- sf:toExternalSource(com.intellij.platform.workspace.jps.JpsImportedEntitySource):com.intellij.openapi.roots.ProjectModelExternalSource -f:com.intellij.workspaceModel.ide.JpsProjectConfigLocationUtilKt -- sf:getJpsProjectConfigLocation(com.intellij.openapi.project.Project):com.intellij.platform.workspace.jps.JpsProjectConfigLocation f:com.intellij.workspaceModel.ide.NonPersistentEntitySource - com.intellij.platform.workspace.storage.EntitySource - sf:INSTANCE:com.intellij.workspaceModel.ide.NonPersistentEntitySource @@ -922,101 +918,6 @@ f:com.intellij.workspaceModel.ide.impl.CachedValuesDisposer f:com.intellij.workspaceModel.ide.impl.CachedValuesDisposer$Companion - f:getInstance(com.intellij.openapi.project.Project):com.intellij.workspaceModel.ide.impl.CachedValuesDisposer - f:getLog():com.intellij.openapi.diagnostic.Logger -f:com.intellij.workspaceModel.ide.impl.ConstantEntitiesDisposableService -- com.intellij.openapi.Disposable -- ():V -- dispose():V -f:com.intellij.workspaceModel.ide.impl.EntityTracingLogger -- sf:Companion:com.intellij.workspaceModel.ide.impl.EntityTracingLogger$Companion -- ():V -- f:printInfoAboutTracedEntity(com.intellij.platform.workspace.storage.EntityStorage,java.lang.String):V -- f:subscribe(com.intellij.openapi.project.Project,kotlinx.coroutines.CoroutineScope):V -f:com.intellij.workspaceModel.ide.impl.EntityTracingLogger$Companion -f:com.intellij.workspaceModel.ide.impl.GlobalWorkspaceModelSynchronizerListener -- com.intellij.platform.backend.workspace.WorkspaceModelChangeListener -- (com.intellij.openapi.project.Project):V -- changed(com.intellij.platform.workspace.storage.VersionedStorageChange):V -f:com.intellij.workspaceModel.ide.impl.JpsProjectLoadingManagerImpl -- com.intellij.workspaceModel.ide.JpsProjectLoadingManager -- ():V -- f:isProjectLoaded():Z -- jpsProjectLoaded(java.lang.Runnable):V -- f:loaded():V -f:com.intellij.workspaceModel.ide.impl.LegacyBridgeJpsEntitySourceFactory -- sf:INSTANCE:com.intellij.workspaceModel.ide.impl.LegacyBridgeJpsEntitySourceFactory -- f:createEntitySourceForArtifact(com.intellij.openapi.project.Project,com.intellij.openapi.roots.ProjectModelExternalSource):com.intellij.platform.workspace.storage.EntitySource -- f:createEntitySourceForGlobalLibrary():com.intellij.platform.workspace.storage.EntitySource -- f:createEntitySourceForModule(com.intellij.openapi.project.Project,com.intellij.platform.workspace.storage.url.VirtualFileUrl,com.intellij.openapi.roots.ProjectModelExternalSource,com.intellij.platform.workspace.jps.serialization.impl.FileInDirectorySourceNames,java.lang.String):com.intellij.platform.workspace.storage.EntitySource -- bs:createEntitySourceForModule$default(com.intellij.workspaceModel.ide.impl.LegacyBridgeJpsEntitySourceFactory,com.intellij.openapi.project.Project,com.intellij.platform.workspace.storage.url.VirtualFileUrl,com.intellij.openapi.roots.ProjectModelExternalSource,com.intellij.platform.workspace.jps.serialization.impl.FileInDirectorySourceNames,java.lang.String,I,java.lang.Object):com.intellij.platform.workspace.storage.EntitySource -- f:createEntitySourceForProjectLibrary(com.intellij.openapi.project.Project,com.intellij.openapi.roots.ProjectModelExternalSource,com.intellij.platform.workspace.jps.serialization.impl.FileInDirectorySourceNames,java.lang.String):com.intellij.platform.workspace.storage.EntitySource -- bs:createEntitySourceForProjectLibrary$default(com.intellij.workspaceModel.ide.impl.LegacyBridgeJpsEntitySourceFactory,com.intellij.openapi.project.Project,com.intellij.openapi.roots.ProjectModelExternalSource,com.intellij.platform.workspace.jps.serialization.impl.FileInDirectorySourceNames,java.lang.String,I,java.lang.Object):com.intellij.platform.workspace.storage.EntitySource -f:com.intellij.workspaceModel.ide.impl.ModulePreUpdateHandler -- ():V -- update(com.intellij.platform.workspace.storage.EntityStorage,com.intellij.platform.workspace.storage.MutableEntityStorage):Z -f:com.intellij.workspaceModel.ide.impl.OrphanService -- sf:Companion:com.intellij.workspaceModel.ide.impl.OrphanService$Companion -- (com.intellij.openapi.project.Project,kotlinx.coroutines.CoroutineScope):V -- f:start():V -f:com.intellij.workspaceModel.ide.impl.OrphanService$Companion -f:com.intellij.workspaceModel.ide.impl.WorkspaceEntitiesLifecycleActivity -- com.intellij.openapi.startup.ProjectActivity -- ():V -- execute(com.intellij.openapi.project.Project,kotlin.coroutines.Continuation):java.lang.Object -f:com.intellij.workspaceModel.ide.impl.WorkspaceEntityLifecycleSupporterUtils -- sf:INSTANCE:com.intellij.workspaceModel.ide.impl.WorkspaceEntityLifecycleSupporterUtils -- f:ensureAllEntitiesInWorkspaceAreAsProvidersDefined(com.intellij.openapi.project.Project,kotlin.coroutines.Continuation):java.lang.Object -- f:ensureEntitiesInWorkspaceAreAsProviderDefined(com.intellij.openapi.project.Project,com.intellij.platform.backend.workspace.WorkspaceEntityLifecycleSupporter):V -f:com.intellij.workspaceModel.ide.impl.WorkspaceMetricsKt -- sf:getWorkspaceModelMetrics():com.intellij.workspaceModel.ide.impl.WorkspaceModelMetrics -f:com.intellij.workspaceModel.ide.impl.WorkspaceModelInitialTestContent -- sf:INSTANCE:com.intellij.workspaceModel.ide.impl.WorkspaceModelInitialTestContent -- f:getHasInitialContent():Z -- f:peek():com.intellij.platform.workspace.storage.ImmutableEntityStorage -- f:withInitialContent(com.intellij.platform.workspace.storage.ImmutableEntityStorage,kotlin.jvm.functions.Function0):java.lang.Object -f:com.intellij.workspaceModel.ide.impl.WorkspaceModelMetrics -- sf:Companion:com.intellij.workspaceModel.ide.impl.WorkspaceModelMetrics$Companion -- ():V -f:com.intellij.workspaceModel.ide.impl.WorkspaceModelMetrics$Companion -- f:getInstance():com.intellij.util.concurrency.SynchronizedClearableLazy -a:com.intellij.workspaceModel.ide.impl.legacyBridge.LegacyBridgeModifiableBase -- sf:Companion:com.intellij.workspaceModel.ide.impl.legacyBridge.LegacyBridgeModifiableBase$Companion -- (com.intellij.platform.workspace.storage.MutableEntityStorage,Z):V -- f:assertModelIsLive():V -- sf:getAssertChangesApplied():Z -- f:getDiff():com.intellij.platform.workspace.storage.MutableEntityStorage -- f:getEntityStorageOnDiff():com.intellij.platform.workspace.storage.VersionedEntityStorage -- pf:getModelIsCommittedOrDisposed():Z -- pf:setModelIsCommittedOrDisposed(Z):V -f:com.intellij.workspaceModel.ide.impl.legacyBridge.LegacyBridgeModifiableBase$Companion -- f:getAssertChangesApplied():Z -- f:serializeComponentAsString(java.lang.String,com.intellij.openapi.components.PersistentStateComponent):java.lang.String -f:com.intellij.workspaceModel.ide.impl.legacyBridge.library.GlobalAndCustomLibraryTableBridgeInitializer -- ():V -- initializeBridges(com.intellij.openapi.project.Project,java.util.Map,com.intellij.platform.workspace.storage.MutableEntityStorage):V -- isEnabled():Z -f:com.intellij.workspaceModel.ide.impl.legacyBridge.library.GlobalLibraryTableBridgeImpl -- com.intellij.openapi.Disposable -- com.intellij.openapi.roots.libraries.LibraryTable -- sf:Companion:com.intellij.workspaceModel.ide.impl.legacyBridge.library.GlobalLibraryTableBridgeImpl$Companion -- ():V -- addListener(com.intellij.openapi.roots.libraries.LibraryTable$Listener):V -- addListener(com.intellij.openapi.roots.libraries.LibraryTable$Listener,com.intellij.openapi.Disposable):V -- createLibrary():com.intellij.openapi.roots.libraries.Library -- createLibrary(java.lang.String):com.intellij.openapi.roots.libraries.Library -- dispose():V -- getLibraries():com.intellij.openapi.roots.libraries.Library[] -- getLibraryByName(java.lang.String):com.intellij.openapi.roots.libraries.Library -- getLibraryIterator():java.util.Iterator -- getModifiableModel():com.intellij.openapi.roots.libraries.LibraryTable$ModifiableModel -- getPresentation():com.intellij.openapi.roots.libraries.LibraryTablePresentation -- getTableLevel():java.lang.String -- handleBeforeChangeEvents(com.intellij.platform.workspace.storage.VersionedStorageChange):V -- handleChangedEvents(com.intellij.platform.workspace.storage.VersionedStorageChange):V -- initializeBridges(java.util.Map,com.intellij.platform.workspace.storage.MutableEntityStorage):V -- initializeBridgesAfterLoading(com.intellij.platform.workspace.storage.MutableEntityStorage,com.intellij.platform.workspace.storage.VersionedEntityStorage):kotlin.jvm.functions.Function0 -- removeLibrary(com.intellij.openapi.roots.libraries.Library):V -- removeListener(com.intellij.openapi.roots.libraries.LibraryTable$Listener):V -f:com.intellij.workspaceModel.ide.impl.legacyBridge.library.GlobalLibraryTableBridgeImpl$Companion f:com.intellij.workspaceModel.ide.impl.legacyBridge.library.LegacyCustomLibraryEntitySource - com.intellij.platform.workspace.storage.EntitySource - (java.lang.String):V @@ -1028,245 +929,13 @@ com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryBridge - com.intellij.openapi.roots.impl.libraries.LibraryEx - a:getLibraryId():com.intellij.platform.workspace.jps.entities.LibraryId f:com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryEntityUtils -- sf:findLibraryBridge(com.intellij.platform.workspace.jps.entities.LibraryEntity,com.intellij.platform.workspace.storage.EntityStorage):com.intellij.openapi.roots.libraries.Library -- sf:findLibraryBridge(com.intellij.platform.workspace.jps.entities.LibraryId,com.intellij.platform.workspace.storage.EntityStorage,com.intellij.openapi.project.Project):com.intellij.openapi.roots.libraries.Library - sf:findLibraryId(com.intellij.openapi.roots.libraries.Library):com.intellij.platform.workspace.jps.entities.LibraryId -f:com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryStateSnapshot -- sf:Companion:com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryStateSnapshot$Companion -- (com.intellij.platform.workspace.jps.entities.LibraryEntity,com.intellij.platform.workspace.storage.EntityStorage,com.intellij.openapi.roots.libraries.LibraryTable):V -- f:getExcludedRootUrls():java.lang.String[] -- f:getExcludedRoots():com.intellij.openapi.vfs.VirtualFile[] -- f:getExternalSource():com.intellij.openapi.roots.ProjectModelExternalSource -- f:getFiles(com.intellij.openapi.roots.OrderRootType):com.intellij.openapi.vfs.VirtualFile[] -- f:getInvalidRootUrls(com.intellij.openapi.roots.OrderRootType):java.util.List -- f:getKind():com.intellij.openapi.roots.libraries.PersistentLibraryKind -- f:getLibraryEntity():com.intellij.platform.workspace.jps.entities.LibraryEntity -- f:getLibraryTable():com.intellij.openapi.roots.libraries.LibraryTable -- f:getModule():com.intellij.openapi.module.Module -- f:getName():java.lang.String -- f:getProperties():com.intellij.openapi.roots.libraries.LibraryProperties -- f:getStorage():com.intellij.platform.workspace.storage.EntityStorage -- f:getUrls(com.intellij.openapi.roots.OrderRootType):java.lang.String[] -- f:isJarDirectory(java.lang.String):Z -- f:isJarDirectory(java.lang.String,com.intellij.openapi.roots.OrderRootType):Z -- f:isValid(java.lang.String,com.intellij.openapi.roots.OrderRootType):Z -f:com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryStateSnapshot$Companion -f:com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeImpl -- com.intellij.openapi.Disposable -- com.intellij.openapi.roots.libraries.LibraryTable -- sf:Companion:com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeImpl$Companion -- (com.intellij.openapi.project.Project):V -- addListener(com.intellij.openapi.roots.libraries.LibraryTable$Listener):V -- addListener(com.intellij.openapi.roots.libraries.LibraryTable$Listener,com.intellij.openapi.Disposable):V -- createLibrary():com.intellij.openapi.roots.libraries.Library -- createLibrary(java.lang.String):com.intellij.openapi.roots.libraries.Library -- dispose():V -- getLibraries():com.intellij.openapi.roots.libraries.Library[] -- getLibraryByName(java.lang.String):com.intellij.openapi.roots.libraries.Library -- getLibraryIterator():java.util.Iterator -- getModifiableModel():com.intellij.openapi.roots.libraries.LibraryTable$ModifiableModel -- getModifiableModel(com.intellij.platform.workspace.storage.MutableEntityStorage):com.intellij.openapi.roots.libraries.LibraryTable$ModifiableModel -- getPresentation():com.intellij.openapi.roots.libraries.LibraryTablePresentation -- getProject():com.intellij.openapi.project.Project -- getTableLevel():java.lang.String -- f:loadLibraries(com.intellij.platform.workspace.storage.MutableEntityStorage,kotlin.coroutines.Continuation):java.lang.Object -- removeLibrary(com.intellij.openapi.roots.libraries.Library):V -- removeListener(com.intellij.openapi.roots.libraries.LibraryTable$Listener):V -f:com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeImpl$Companion -- f:findLibraryEntity(com.intellij.platform.workspace.storage.EntityStorage,com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryBridge):com.intellij.platform.workspace.jps.entities.LibraryEntity -- f:getLibraryMap(com.intellij.platform.workspace.storage.EntityStorage):com.intellij.platform.workspace.storage.ExternalEntityMapping -- f:getMutableLibraryMap(com.intellij.platform.workspace.storage.MutableEntityStorage):com.intellij.platform.workspace.storage.MutableExternalEntityMapping -f:com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeInitializer -- ():V -- initializeBridges(com.intellij.openapi.project.Project,java.util.Map,com.intellij.platform.workspace.storage.MutableEntityStorage):V -- isEnabled():Z f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.ModuleBridgeUtils - sf:findModuleEntity(com.intellij.workspaceModel.ide.legacyBridge.ModuleBridge,com.intellij.platform.workspace.storage.EntityStorage):com.intellij.platform.workspace.jps.entities.ModuleEntity f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.ModuleEntityUtils -- sf:findModule(com.intellij.platform.workspace.jps.entities.ModuleEntity,com.intellij.platform.workspace.storage.EntityStorage):com.intellij.workspaceModel.ide.legacyBridge.ModuleBridge - sf:getModuleLevelLibraries(com.intellij.platform.workspace.jps.entities.ModuleEntity,com.intellij.platform.workspace.storage.EntityStorage):kotlin.sequences.Sequence -f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.ModuleManagerComponentBridgeInitializer -- ():V -- initializeBridges(com.intellij.openapi.project.Project,java.util.Map,com.intellij.platform.workspace.storage.MutableEntityStorage):V -- isEnabled():Z -f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.UnloadedModuleDescriptionBridge -- com.intellij.openapi.module.UnloadedModuleDescription -- sf:Companion:com.intellij.workspaceModel.ide.impl.legacyBridge.module.UnloadedModuleDescriptionBridge$Companion -- getContentRoots():java.util.List -- getDependencyModuleNames():java.util.List -- getGroupPath():java.util.List -- getName():java.lang.String -f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.UnloadedModuleDescriptionBridge$Companion -- f:createDescription(com.intellij.platform.workspace.jps.entities.ModuleEntity):com.intellij.openapi.module.UnloadedModuleDescription -- f:createDescriptions(java.util.List):java.util.List -f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModifiableRootModelBridgeImpl -- com.intellij.openapi.roots.ModifiableRootModel -- com.intellij.openapi.roots.ModuleRootModel -- com.intellij.openapi.util.ModificationTracker -- com.intellij.workspaceModel.ide.impl.legacyBridge.LegacyBridgeModifiableBase -- sf:Companion:com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModifiableRootModelBridgeImpl$Companion -- (com.intellij.platform.workspace.storage.MutableEntityStorage,com.intellij.workspaceModel.ide.legacyBridge.ModuleBridge,com.intellij.openapi.roots.impl.RootConfigurationAccessor,Z):V -- b:(com.intellij.platform.workspace.storage.MutableEntityStorage,com.intellij.workspaceModel.ide.legacyBridge.ModuleBridge,com.intellij.openapi.roots.impl.RootConfigurationAccessor,Z,I,kotlin.jvm.internal.DefaultConstructorMarker):V -- addContentEntry(com.intellij.openapi.vfs.VirtualFile):com.intellij.openapi.roots.ContentEntry -- addContentEntry(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.roots.ProjectModelExternalSource):com.intellij.openapi.roots.ContentEntry -- addContentEntry(java.lang.String):com.intellij.openapi.roots.ContentEntry -- addContentEntry(java.lang.String,com.intellij.openapi.roots.ProjectModelExternalSource):com.intellij.openapi.roots.ContentEntry -- addContentEntry(java.lang.String,Z):com.intellij.openapi.roots.ContentEntry -- addInvalidLibrary(java.lang.String,java.lang.String):com.intellij.openapi.roots.LibraryOrderEntry -- addInvalidModuleEntry(java.lang.String):com.intellij.openapi.roots.ModuleOrderEntry -- addLibraryEntries(java.util.List,com.intellij.openapi.roots.DependencyScope,Z):V -- addLibraryEntry(com.intellij.openapi.roots.libraries.Library):com.intellij.openapi.roots.LibraryOrderEntry -- addModuleEntries(java.util.List,com.intellij.openapi.roots.DependencyScope,Z):V -- addModuleOrderEntry(com.intellij.openapi.module.Module):com.intellij.openapi.roots.ModuleOrderEntry -- addOrderEntry(com.intellij.openapi.roots.OrderEntry):V -- clear():V -- f:collectChangesAndDispose():com.intellij.platform.workspace.storage.MutableEntityStorage -- commit():V -- dispose():V -- findLibraryOrderEntry(com.intellij.openapi.roots.libraries.Library):com.intellij.openapi.roots.LibraryOrderEntry -- findModuleOrderEntry(com.intellij.openapi.module.Module):com.intellij.openapi.roots.ModuleOrderEntry -- getAccessor():com.intellij.openapi.roots.impl.RootConfigurationAccessor -- getContentEntries():com.intellij.openapi.roots.ContentEntry[] -- getContentRootUrls():java.lang.String[] -- getContentRoots():com.intellij.openapi.vfs.VirtualFile[] -- getDependencyModuleNames():java.lang.String[] -- getExcludeRootUrls():java.lang.String[] -- getExcludeRoots():com.intellij.openapi.vfs.VirtualFile[] -- getModificationCount():J -- getModule():com.intellij.workspaceModel.ide.legacyBridge.ModuleBridge -- getModuleBridge():com.intellij.workspaceModel.ide.legacyBridge.ModuleBridge -- getModuleDependencies():com.intellij.openapi.module.Module[] -- getModuleDependencies(Z):com.intellij.openapi.module.Module[] -- getModuleExtension(java.lang.Class):java.lang.Object -- getModuleLibraryTable():com.intellij.openapi.roots.libraries.LibraryTable -- getOrCreateJpsRootProperties(com.intellij.platform.workspace.storage.url.VirtualFileUrl,kotlin.jvm.functions.Function0):org.jetbrains.jps.model.module.JpsModuleSourceRoot -- getOrderEntries():com.intellij.openapi.roots.OrderEntry[] -- getProject():com.intellij.openapi.project.Project -- getSdk():com.intellij.openapi.projectRoots.Sdk -- getSdkName():java.lang.String -- getSourceRootUrls():java.lang.String[] -- getSourceRootUrls(Z):java.lang.String[] -- getSourceRoots():com.intellij.openapi.vfs.VirtualFile[] -- getSourceRoots(java.util.Set):java.util.List -- getSourceRoots(org.jetbrains.jps.model.module.JpsModuleSourceRootType):java.util.List -- getSourceRoots(Z):com.intellij.openapi.vfs.VirtualFile[] -- getStorage():com.intellij.platform.workspace.storage.EntityStorage -- inheritSdk():V -- isChanged():Z -- isDisposed():Z -- isSdkInherited():Z -- isWritable():Z -- orderEntries():com.intellij.openapi.roots.OrderEnumerator -- postCommit():V -- prepareForCommit():V -- processOrder(com.intellij.openapi.roots.RootPolicy,java.lang.Object):java.lang.Object -- rearrangeOrderEntries(com.intellij.openapi.roots.OrderEntry[]):V -- removeCachedJpsRootProperties(com.intellij.platform.workspace.storage.url.VirtualFileUrl):V -- removeContentEntry(com.intellij.openapi.roots.ContentEntry):V -- removeOrderEntry(com.intellij.openapi.roots.OrderEntry):V -- setInvalidSdk(java.lang.String,java.lang.String):V -- setSdk(com.intellij.openapi.projectRoots.Sdk):V -f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModifiableRootModelBridgeImpl$Companion -com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModuleLibraryTableBridge -- com.intellij.openapi.roots.libraries.LibraryTable -- a:getModule():com.intellij.openapi.module.Module -f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModuleRootComponentBridge -- com.intellij.openapi.Disposable -- com.intellij.openapi.roots.ModuleRootManagerEx -- com.intellij.openapi.roots.ModuleRootModel -- sf:Companion:com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModuleRootComponentBridge$Companion -- (com.intellij.openapi.module.Module):V -- dispose():V -- dropCaches():V -- getAccessor():com.intellij.openapi.roots.impl.RootConfigurationAccessor -- getContentEntries():com.intellij.openapi.roots.ContentEntry[] -- getContentRootUrls():java.lang.String[] -- getContentRoots():com.intellij.openapi.vfs.VirtualFile[] -- getDependencies():com.intellij.openapi.module.Module[] -- getDependencies(Z):com.intellij.openapi.module.Module[] -- getDependencyModuleNames():java.lang.String[] -- getExcludeRootUrls():java.lang.String[] -- getExcludeRoots():com.intellij.openapi.vfs.VirtualFile[] -- getExternalSource():com.intellij.openapi.roots.ProjectModelExternalSource -- getFileIndex():com.intellij.openapi.roots.ModuleFileIndex -- sf:getInstance(com.intellij.openapi.module.Module):com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModuleRootComponentBridge -- getModifiableModel():com.intellij.openapi.roots.ModifiableRootModel -- getModifiableModel(com.intellij.openapi.roots.impl.RootConfigurationAccessor):com.intellij.openapi.roots.ModifiableRootModel -- f:getModifiableModel(com.intellij.platform.workspace.storage.MutableEntityStorage,com.intellij.openapi.roots.impl.RootConfigurationAccessor):com.intellij.openapi.roots.ModifiableRootModel -- getModifiableModelForMultiCommit(com.intellij.openapi.roots.impl.RootConfigurationAccessor):com.intellij.openapi.roots.ModifiableRootModel -- getModificationCountForTests():J -- getModule():com.intellij.openapi.module.Module -- getModuleBridge():com.intellij.workspaceModel.ide.legacyBridge.ModuleBridge -- getModuleDependencies():com.intellij.openapi.module.Module[] -- getModuleDependencies(Z):com.intellij.openapi.module.Module[] -- getModuleExtension(java.lang.Class):java.lang.Object -- f:getModuleLibraryTable():com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModuleLibraryTableBridge -- getOrCreateJpsRootProperties(com.intellij.platform.workspace.storage.url.VirtualFileUrl,kotlin.jvm.functions.Function0):org.jetbrains.jps.model.module.JpsModuleSourceRoot -- getOrderEntries():com.intellij.openapi.roots.OrderEntry[] -- getSdk():com.intellij.openapi.projectRoots.Sdk -- getSourceRootUrls():java.lang.String[] -- getSourceRootUrls(Z):java.lang.String[] -- getSourceRoots():com.intellij.openapi.vfs.VirtualFile[] -- getSourceRoots(java.util.Set):java.util.List -- getSourceRoots(org.jetbrains.jps.model.module.JpsModuleSourceRootType):java.util.List -- getSourceRoots(Z):com.intellij.openapi.vfs.VirtualFile[] -- getStorage():com.intellij.platform.workspace.storage.EntityStorage -- isDependsOn(com.intellij.openapi.module.Module):Z -- isSdkInherited():Z -- orderEntries():com.intellij.openapi.roots.OrderEnumerator -- processOrder(com.intellij.openapi.roots.RootPolicy,java.lang.Object):java.lang.Object -- removeCachedJpsRootProperties(com.intellij.platform.workspace.storage.url.VirtualFileUrl):V -f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModuleRootComponentBridge$Companion -- f:getInstance(com.intellij.openapi.module.Module):com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModuleRootComponentBridge -f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.OrderEntriesBridgeKt -- sf:toDependencyScope(com.intellij.platform.workspace.jps.entities.DependencyScope):com.intellij.openapi.roots.DependencyScope -- sf:toEntityDependencyScope(com.intellij.openapi.roots.DependencyScope):com.intellij.platform.workspace.jps.entities.DependencyScope -f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.OrderRootsCacheBridge -- (com.intellij.openapi.project.Project,com.intellij.openapi.Disposable):V -- clearCache():V -- getOrComputeRoots(com.intellij.openapi.roots.OrderRootType,I,java.util.function.Supplier):com.intellij.openapi.vfs.VirtualFile[] -- getOrComputeUrls(com.intellij.openapi.roots.OrderRootType,I,java.util.function.Supplier):java.lang.String[] -- f:getProject():com.intellij.openapi.project.Project -f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.SourceRootPropertiesHelper -- sf:INSTANCE:com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.SourceRootPropertiesHelper -- sf:createPropertiesCopy(org.jetbrains.jps.model.JpsElement,org.jetbrains.jps.model.module.JpsModuleSourceRootType):org.jetbrains.jps.model.JpsElement -- f:findSerializer(org.jetbrains.jps.model.module.JpsModuleSourceRootType):org.jetbrains.jps.model.serialization.module.JpsModuleSourceRootPropertiesSerializer -f:com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.TestModulePropertiesBridge -- com.intellij.openapi.roots.TestModuleProperties -- (com.intellij.openapi.module.Module):V -- getProductionModule():com.intellij.openapi.module.Module -- getProductionModuleName():java.lang.String -- setProductionModuleName(java.lang.String):V -- f:setProductionModuleNameToBuilder(java.lang.String,java.lang.String,com.intellij.platform.workspace.storage.MutableEntityStorage):V f:com.intellij.workspaceModel.ide.impl.legacyBridge.sdk.SdkBridgeImplKt - sf:getCustomName(com.intellij.openapi.roots.OrderRootType):java.lang.String -f:com.intellij.workspaceModel.ide.impl.legacyBridge.sdk.SdkModificatorBridgeImpl -- com.intellij.openapi.projectRoots.SdkModificator -- (com.intellij.platform.workspace.jps.entities.SdkEntity$Builder,com.intellij.openapi.projectRoots.impl.ProjectJdkImpl,com.intellij.workspaceModel.ide.impl.legacyBridge.sdk.SdkBridgeImpl):V -- addRoot(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.roots.OrderRootType):V -- applyChangesWithoutWriteAction():V -- commitChanges():V -- getHomePath():java.lang.String -- getName():java.lang.String -- getRoots(com.intellij.openapi.roots.OrderRootType):com.intellij.openapi.vfs.VirtualFile[] -- getSdkAdditionalData():com.intellij.openapi.projectRoots.SdkAdditionalData -- getVersionString():java.lang.String -- isWritable():Z -- removeAllRoots():V -- removeRoot(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.roots.OrderRootType):V -- removeRoots(com.intellij.openapi.roots.OrderRootType):V -- setHomePath(java.lang.String):V -- setName(java.lang.String):V -- setSdkAdditionalData(com.intellij.openapi.projectRoots.SdkAdditionalData):V -- setVersionString(java.lang.String):V -f:com.intellij.workspaceModel.ide.impl.legacyBridge.watcher.FileContainerDescription -- (java.util.List,java.util.List):V -- f:findByUrl(java.lang.String):com.intellij.openapi.vfs.pointers.VirtualFilePointer -- f:getFiles():com.intellij.openapi.vfs.VirtualFile[] -- f:getList():java.util.List -- f:getUrls():java.util.List -- f:getUrls():java.lang.String[] -- f:isJarDirectory(java.lang.String):Z f:com.intellij.workspaceModel.ide.impl.legacyBridge.watcher.JarDirectoryDescription - (com.intellij.platform.workspace.storage.url.VirtualFileUrl,Z):V - f:component1():com.intellij.platform.workspace.storage.url.VirtualFileUrl diff --git a/platform/projectModel-impl/exposed-private-api.txt b/platform/projectModel-impl/exposed-private-api.txt index 25f6dc3c8ffe..5668b7a1b1fd 100644 --- a/platform/projectModel-impl/exposed-private-api.txt +++ b/platform/projectModel-impl/exposed-private-api.txt @@ -1,8 +1,5 @@ com/intellij/ide/plugins/IdeaPluginDescriptorImpl com/intellij/openapi/roots/impl/ProjectRootManagerImpl$BatchSession com/intellij/openapi/roots/impl/RootConfigurationAccessor -com/intellij/platform/workspace/jps/serialization/impl/FileInDirectorySourceNames com/intellij/platform/workspace/jps/serialization/impl/ModulePath -com/intellij/platform/workspace/storage/VersionedEntityStorage -com/intellij/workspaceModel/ide/impl/legacyBridge/sdk/SdkBridgeImpl com/intellij/workspaceModel/ide/legacyBridge/ModuleBridge diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/JpsProjectConfigLocationUtil.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/JpsProjectConfigLocationUtil.kt index 14eaba028c88..611d4d4560eb 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/JpsProjectConfigLocationUtil.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/JpsProjectConfigLocationUtil.kt @@ -8,10 +8,12 @@ import com.intellij.platform.workspace.jps.JpsProjectConfigLocation import com.intellij.platform.workspace.storage.impl.url.toVirtualFileUrl import com.intellij.project.isDirectoryBased import com.intellij.project.stateStore +import org.jetbrains.annotations.ApiStatus /** * Returns `null` for the default project */ +@ApiStatus.Internal fun getJpsProjectConfigLocation(project: Project): JpsProjectConfigLocation? { val virtualFileUrlManager = WorkspaceModel.getInstance(project).getVirtualFileUrlManager() return if (project.isDirectoryBased) { diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/EntityTracingLogger.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/EntityTracingLogger.kt index c5a7b7ff4760..316d4d53df83 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/EntityTracingLogger.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/EntityTracingLogger.kt @@ -11,7 +11,9 @@ import com.intellij.platform.workspace.storage.WorkspaceEntity import com.intellij.platform.workspace.storage.WorkspaceEntityWithSymbolicId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch +import org.jetbrains.annotations.ApiStatus +@ApiStatus.Internal class EntityTracingLogger { /** specifies ID of an entity which changes should be printed to the log */ private val entityToTrace = System.getProperty("idea.workspace.model.track.entity.id")?.let { diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/GlobalWorkspaceModelSynchronizerListener.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/GlobalWorkspaceModelSynchronizerListener.kt index 0d1a3bd10f39..2b4ff50cf701 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/GlobalWorkspaceModelSynchronizerListener.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/GlobalWorkspaceModelSynchronizerListener.kt @@ -7,7 +7,7 @@ import com.intellij.platform.workspace.jps.JpsGlobalFileEntitySource import com.intellij.platform.workspace.storage.VersionedStorageChange import com.intellij.workspaceModel.ide.impl.legacyBridge.library.LegacyCustomLibraryEntitySource -class GlobalWorkspaceModelSynchronizerListener(private val project: Project) : WorkspaceModelChangeListener { +internal class GlobalWorkspaceModelSynchronizerListener(private val project: Project) : WorkspaceModelChangeListener { override fun changed(event: VersionedStorageChange) { val globalWorkspaceModel = GlobalWorkspaceModel.getInstance() // Avoid handling events if change was made by global workspace model diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/JpsProjectLoadingManagerImpl.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/JpsProjectLoadingManagerImpl.kt index dc6bd8b8abb9..9410fa11ce4f 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/JpsProjectLoadingManagerImpl.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/JpsProjectLoadingManagerImpl.kt @@ -5,9 +5,11 @@ import com.intellij.openapi.project.Project import com.intellij.util.containers.ContainerUtil import com.intellij.workspaceModel.ide.JpsProjectLoadedListener import com.intellij.workspaceModel.ide.JpsProjectLoadingManager +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.TestOnly import java.util.concurrent.atomic.AtomicBoolean +@ApiStatus.Internal class JpsProjectLoadingManagerImpl : JpsProjectLoadingManager { @TestOnly fun isProjectLoaded(): Boolean = projectLoaded.get() diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/LegacyBridgeJpsEntitySourceFactory.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/LegacyBridgeJpsEntitySourceFactory.kt index 8948026db936..8717e49708dd 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/LegacyBridgeJpsEntitySourceFactory.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/LegacyBridgeJpsEntitySourceFactory.kt @@ -14,7 +14,9 @@ import com.intellij.platform.workspace.storage.EntitySource import com.intellij.platform.workspace.storage.url.VirtualFileUrl import com.intellij.workspaceModel.ide.NonPersistentEntitySource import com.intellij.workspaceModel.ide.getJpsProjectConfigLocation +import org.jetbrains.annotations.ApiStatus +@ApiStatus.Internal object LegacyBridgeJpsEntitySourceFactory { fun createEntitySourceForModule(project: Project, baseModuleDir: VirtualFileUrl, diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/ModulePreUpdateHandler.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/ModulePreUpdateHandler.kt index 68c5d7f65137..a0c699abeccc 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/ModulePreUpdateHandler.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/ModulePreUpdateHandler.kt @@ -12,7 +12,7 @@ import com.intellij.platform.workspace.storage.MutableEntityStorage import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation -class ModulePreUpdateHandler : WorkspaceModelPreUpdateHandler { +internal class ModulePreUpdateHandler : WorkspaceModelPreUpdateHandler { @OptIn(EntityStorageInstrumentationApi::class) override fun update(before: EntityStorage, builder: MutableEntityStorage): Boolean { // TODO: 21.12.2020 We need an api to find removed modules faster diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceEntitiesLifecycleActivity.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceEntitiesLifecycleActivity.kt index d383b3430b1a..8f09d141044e 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceEntitiesLifecycleActivity.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceEntitiesLifecycleActivity.kt @@ -10,7 +10,7 @@ import com.intellij.openapi.startup.ProjectActivity import com.intellij.platform.backend.workspace.WorkspaceEntityLifecycleSupporter import com.intellij.platform.workspace.storage.WorkspaceEntity -class WorkspaceEntitiesLifecycleActivity : ProjectActivity { +internal class WorkspaceEntitiesLifecycleActivity : ProjectActivity { override suspend fun execute(project: Project) { WorkspaceEntityLifecycleSupporter.EP_NAME.addExtensionPointListener(object : ExtensionPointListener>> { @@ -24,6 +24,6 @@ class WorkspaceEntitiesLifecycleActivity : ProjectActivity { } @Service(Service.Level.PROJECT) -class ConstantEntitiesDisposableService : Disposable { +internal class ConstantEntitiesDisposableService : Disposable { override fun dispose() {} } diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceEntityLifecycleSupporterUtils.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceEntityLifecycleSupporterUtils.kt index 128880ad547e..3f1e0ae0e57d 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceEntityLifecycleSupporterUtils.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceEntityLifecycleSupporterUtils.kt @@ -11,7 +11,9 @@ import com.intellij.platform.workspace.storage.ImmutableEntityStorage import com.intellij.platform.workspace.storage.MutableEntityStorage import com.intellij.platform.workspace.storage.WorkspaceEntity import com.intellij.platform.workspace.storage.toBuilder +import org.jetbrains.annotations.ApiStatus +@ApiStatus.Internal object WorkspaceEntityLifecycleSupporterUtils { fun ensureEntitiesInWorkspaceAreAsProviderDefined(project: Project, provider: WorkspaceEntityLifecycleSupporter<*, *>) { val workspaceModel = WorkspaceModel.getInstance(project) diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceModelInitialTestContent.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceModelInitialTestContent.kt index a1339371c27e..230cce30a9b6 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceModelInitialTestContent.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/WorkspaceModelInitialTestContent.kt @@ -4,9 +4,11 @@ package com.intellij.workspaceModel.ide.impl import com.intellij.openapi.application.ApplicationManager import com.intellij.platform.workspace.storage.ImmutableEntityStorage import com.intellij.util.PlatformUtils +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.TestOnly import java.util.concurrent.atomic.AtomicReference +@ApiStatus.Internal object WorkspaceModelInitialTestContent { private val initialContent: AtomicReference = AtomicReference(null) diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/LegacyBridgeModifiableBase.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/LegacyBridgeModifiableBase.kt index 8a45e066f9ca..a2711e6970e1 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/LegacyBridgeModifiableBase.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/LegacyBridgeModifiableBase.kt @@ -8,8 +8,10 @@ import com.intellij.openapi.util.JDOMUtil import com.intellij.platform.workspace.storage.MutableEntityStorage import com.intellij.platform.workspace.storage.impl.DummyVersionedEntityStorage import com.intellij.platform.workspace.storage.impl.VersionedEntityStorageOnBuilder +import org.jetbrains.annotations.ApiStatus //todo restore internal visibility for members of this class after other classes will be moved to this module +@ApiStatus.Internal abstract class LegacyBridgeModifiableBase(val diff: MutableEntityStorage, cacheStorageResult: Boolean) { init { SideEffectGuard.checkSideEffectAllowed(SideEffectGuard.EffectType.PROJECT_MODEL) diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/GlobalAndCustomLibraryTableBridgeInitializer.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/GlobalAndCustomLibraryTableBridgeInitializer.kt index 4071cec20a46..5d3a470de6ec 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/GlobalAndCustomLibraryTableBridgeInitializer.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/GlobalAndCustomLibraryTableBridgeInitializer.kt @@ -12,7 +12,7 @@ import com.intellij.platform.workspace.storage.MutableEntityStorage import com.intellij.workspaceModel.ide.impl.GlobalWorkspaceModel import com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeImpl.Companion.mutableLibraryMap -class GlobalAndCustomLibraryTableBridgeInitializer : BridgeInitializer { +internal class GlobalAndCustomLibraryTableBridgeInitializer : BridgeInitializer { override fun isEnabled(): Boolean = true // Handle the initialization of all global and custom libraries diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/GlobalLibraryTableBridgeImpl.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/GlobalLibraryTableBridgeImpl.kt index 7fba2041daa0..1ce2c1a513d3 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/GlobalLibraryTableBridgeImpl.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/GlobalLibraryTableBridgeImpl.kt @@ -18,7 +18,9 @@ import com.intellij.workspaceModel.ide.impl.LegacyBridgeJpsEntitySourceFactory import com.intellij.workspaceModel.ide.impl.jpsMetrics import com.intellij.workspaceModel.ide.legacyBridge.GlobalLibraryTableBridge import io.opentelemetry.api.metrics.Meter +import org.jetbrains.annotations.ApiStatus +@ApiStatus.Internal class GlobalLibraryTableBridgeImpl : GlobalLibraryTableBridge, Disposable { private val libraryTableDelegate = GlobalLibraryTableDelegate(this, LibraryTableId.GlobalLibraryTableId(LibraryTablesRegistrar.APPLICATION_LEVEL)) diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryBridgeImpl.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryBridgeImpl.kt index 7890798067e5..6b52e2e5a4d2 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryBridgeImpl.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryBridgeImpl.kt @@ -79,7 +79,7 @@ class LibraryBridgeImpl( ) } - val librarySnapshot: LibraryStateSnapshot + internal val librarySnapshot: LibraryStateSnapshot get() { checkDisposed() return entityStorage.cachedValue(librarySnapshotCached) diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryEntityUtils.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryEntityUtils.kt index cc98313d982a..f284ab815b7c 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryEntityUtils.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryEntityUtils.kt @@ -11,6 +11,7 @@ import com.intellij.platform.workspace.jps.entities.LibraryTableId import com.intellij.platform.workspace.jps.serialization.impl.LibraryNameGenerator.getLibraryTableId import com.intellij.platform.workspace.storage.EntityStorage import com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeImpl.Companion.libraryMap +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.ApiStatus.Obsolete /** @@ -21,6 +22,7 @@ import org.jetbrains.annotations.ApiStatus.Obsolete * @return [Library] or null if corresponding module is unloaded */ @Obsolete +@ApiStatus.Internal fun LibraryEntity.findLibraryBridge(snapshot: EntityStorage): Library? { return snapshot.libraryMap.getDataByEntity(this) } @@ -33,6 +35,7 @@ fun LibraryEntity.findLibraryBridge(snapshot: EntityStorage): Library? { * @return [Library] calculated base on the [LibraryId] it can be application or project level lib */ @Obsolete +@ApiStatus.Internal fun LibraryId.findLibraryBridge(snapshot: EntityStorage, project: Project): Library? { return if (tableId is LibraryTableId.GlobalLibraryTableId) { LibraryTablesRegistrar.getInstance().getLibraryTableByLevel(tableId.level, project)?.getLibraryByName(name) diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryStateSnapshot.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryStateSnapshot.kt index bceae1808be6..d31c337f2b96 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryStateSnapshot.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/LibraryStateSnapshot.kt @@ -27,7 +27,7 @@ import com.intellij.workspaceModel.ide.impl.legacyBridge.watcher.JarDirectoryDes import com.intellij.workspaceModel.ide.toExternalSource import java.io.StringReader -class LibraryStateSnapshot( +internal class LibraryStateSnapshot( val libraryEntity: LibraryEntity, val storage: EntityStorage, val libraryTable: LibraryTable, diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/ProjectLibraryTableBridgeImpl.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/ProjectLibraryTableBridgeImpl.kt index b504517fbbf8..cd01fa1a3236 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/ProjectLibraryTableBridgeImpl.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/ProjectLibraryTableBridgeImpl.kt @@ -29,8 +29,9 @@ import com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryT import com.intellij.workspaceModel.ide.legacyBridge.ProjectLibraryTableBridge import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext +import org.jetbrains.annotations.ApiStatus -class ProjectLibraryTableBridgeInitializer : BridgeInitializer { +internal class ProjectLibraryTableBridgeInitializer : BridgeInitializer { override fun isEnabled(): Boolean = true override fun initializeBridges(project: Project, changes: Map, List>>, builder: MutableEntityStorage) { @@ -53,6 +54,7 @@ class ProjectLibraryTableBridgeInitializer : BridgeInitializer { } } +@ApiStatus.Internal class ProjectLibraryTableBridgeImpl( private val parentProject: Project ) : ProjectLibraryTableBridge, Disposable { @@ -269,6 +271,7 @@ class ProjectLibraryTableBridgeImpl( private val LOG = logger() } } + private fun List>.filterProjectLibraryChanges(): List> { return filter { when (it) { diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleEntityUtils.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleEntityUtils.kt index ee40d3df24d8..c217b0123644 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleEntityUtils.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleEntityUtils.kt @@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleEntity import com.intellij.platform.workspace.storage.EntityStorage import com.intellij.workspaceModel.ide.impl.legacyBridge.module.ModuleManagerBridgeImpl.Companion.moduleMap import com.intellij.workspaceModel.ide.legacyBridge.ModuleBridge +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.ApiStatus.Obsolete /** @@ -17,6 +18,7 @@ import org.jetbrains.annotations.ApiStatus.Obsolete * @return corresponding [com.intellij.openapi.module.Module] or `null` if this entity isn't added to the project model yet. */ @Obsolete +@ApiStatus.Internal fun ModuleEntity.findModule(snapshot: EntityStorage): ModuleBridge? { return snapshot.moduleMap.getDataByEntity(this) } diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleManagerBridgeImpl.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleManagerBridgeImpl.kt index 31743947b7b7..8c30b1fe4e2e 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleManagerBridgeImpl.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleManagerBridgeImpl.kt @@ -69,7 +69,7 @@ private val getModulesTimeMs = MillisecondsMeasurer() private val LOG = logger() private val MODULE_BRIDGE_MAPPING_ID = ExternalMappingKey.create("intellij.modules.bridge") -class ModuleManagerComponentBridgeInitializer : BridgeInitializer { +internal class ModuleManagerComponentBridgeInitializer : BridgeInitializer { override fun isEnabled(): Boolean = true override fun initializeBridges(project: Project, changes: Map, List>>, builder: MutableEntityStorage) { diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/UnloadedModuleDescriptionBridge.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/UnloadedModuleDescriptionBridge.kt index e1c4401386e6..60a43e35ce42 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/UnloadedModuleDescriptionBridge.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/UnloadedModuleDescriptionBridge.kt @@ -9,7 +9,7 @@ import com.intellij.platform.workspace.jps.entities.groupPath import com.intellij.util.containers.Interner import com.intellij.workspaceModel.ide.impl.VirtualFileUrlBridge -class UnloadedModuleDescriptionBridge private constructor( +internal class UnloadedModuleDescriptionBridge private constructor( private val name: String, private val dependencyModuleNames: List, private val contentRoots: List, diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModifiableModelCommitterServiceBridge.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModifiableModelCommitterServiceBridge.kt index d44d973db072..92e3c4ed69a3 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModifiableModelCommitterServiceBridge.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModifiableModelCommitterServiceBridge.kt @@ -11,7 +11,6 @@ import com.intellij.workspaceModel.ide.legacyBridge.ModifiableModuleModelBridge import com.intellij.workspaceModel.ide.legacyBridge.ModifiableRootModelBridge import org.jetbrains.annotations.ApiStatus -@ApiStatus.Internal internal class ModifiableModelCommitterServiceBridge : ModifiableModelCommitterService { override fun multiCommit(rootModels: MutableCollection, moduleModel: ModifiableModuleModel) { ApplicationManager.getApplication().assertWriteAccessAllowed() diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModifiableRootModelBridgeImpl.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModifiableRootModelBridgeImpl.kt index c4165adfa7a0..dab5db2e9e9b 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModifiableRootModelBridgeImpl.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModifiableRootModelBridgeImpl.kt @@ -47,7 +47,7 @@ import org.jetbrains.jps.model.module.JpsModuleSourceRoot import org.jetbrains.jps.model.module.JpsModuleSourceRootType import java.util.concurrent.ConcurrentHashMap -class ModifiableRootModelBridgeImpl( +internal class ModifiableRootModelBridgeImpl( diff: MutableEntityStorage, override val moduleBridge: ModuleBridge, override val accessor: RootConfigurationAccessor, diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleLibraryTableBridge.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleLibraryTableBridge.kt index a339e73fb1cd..3efe2f068c07 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleLibraryTableBridge.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleLibraryTableBridge.kt @@ -2,7 +2,9 @@ package com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots import com.intellij.openapi.module.Module import com.intellij.openapi.roots.libraries.LibraryTable +import org.jetbrains.annotations.ApiStatus +@ApiStatus.Internal interface ModuleLibraryTableBridge : LibraryTable { val module: Module } \ No newline at end of file diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleRootComponentBridge.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleRootComponentBridge.kt index d16d4ab6d117..b2ed2d71170a 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleRootComponentBridge.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleRootComponentBridge.kt @@ -24,6 +24,7 @@ import org.jetbrains.annotations.ApiStatus import org.jetbrains.jps.model.module.JpsModuleSourceRoot import org.jetbrains.jps.model.module.JpsModuleSourceRootType +@ApiStatus.Internal class ModuleRootComponentBridge( private val currentModule: Module ) : ModuleRootManagerEx(), Disposable, ModuleRootModelBridge { diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/OrderEntriesBridge.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/OrderEntriesBridge.kt index 89850237c2fc..435aced66463 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/OrderEntriesBridge.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/OrderEntriesBridge.kt @@ -158,14 +158,14 @@ internal class ModuleOrderEntryBridge( ) } -fun EntitiesDependencyScope.toDependencyScope(): DependencyScope = when (this) { +internal fun EntitiesDependencyScope.toDependencyScope(): DependencyScope = when (this) { EntitiesDependencyScope.COMPILE -> DependencyScope.COMPILE EntitiesDependencyScope.RUNTIME -> DependencyScope.RUNTIME EntitiesDependencyScope.PROVIDED -> DependencyScope.PROVIDED EntitiesDependencyScope.TEST -> DependencyScope.TEST } -fun DependencyScope.toEntityDependencyScope(): EntitiesDependencyScope = when (this) { +internal fun DependencyScope.toEntityDependencyScope(): EntitiesDependencyScope = when (this) { DependencyScope.COMPILE -> EntitiesDependencyScope.COMPILE DependencyScope.RUNTIME -> EntitiesDependencyScope.RUNTIME DependencyScope.PROVIDED -> EntitiesDependencyScope.PROVIDED diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/OrderRootsCacheBridge.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/OrderRootsCacheBridge.kt index c6b37d7d4b56..72d3d3838089 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/OrderRootsCacheBridge.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/OrderRootsCacheBridge.kt @@ -12,11 +12,13 @@ import com.intellij.platform.backend.workspace.WorkspaceModel import com.intellij.util.ArrayUtil import com.intellij.util.ConcurrencyUtil import com.intellij.workspaceModel.ide.impl.VirtualFileUrlBridge +import org.jetbrains.annotations.ApiStatus import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentMap import java.util.concurrent.atomic.AtomicReference import java.util.function.Supplier +@ApiStatus.Internal class OrderRootsCacheBridge(val project: Project, parentDisposable: Disposable) : OrderRootsCache(parentDisposable) { private val virtualFileUrlManager = WorkspaceModel.getInstance(project).getVirtualFileUrlManager() private val myRootUrls = AtomicReference>>() diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/SourceRootPropertiesHelper.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/SourceRootPropertiesHelper.kt index 970e7ef21a29..d820695ae1eb 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/SourceRootPropertiesHelper.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/SourceRootPropertiesHelper.kt @@ -10,6 +10,7 @@ import com.intellij.platform.workspace.jps.entities.customSourceRootProperties import com.intellij.platform.workspace.jps.entities.modifyCustomSourceRootPropertiesEntity import com.intellij.platform.workspace.storage.MutableEntityStorage import org.jdom.Element +import org.jetbrains.annotations.ApiStatus import org.jetbrains.jps.model.JpsDummyElement import org.jetbrains.jps.model.JpsElement import org.jetbrains.jps.model.JpsElementFactory @@ -25,6 +26,7 @@ import org.jetbrains.jps.model.serialization.module.JpsModuleRootModelSerializer import org.jetbrains.jps.model.serialization.module.JpsModuleSourceRootPropertiesSerializer import org.jetbrains.jps.model.serialization.module.UnknownSourceRootPropertiesSerializer +@ApiStatus.Internal object SourceRootPropertiesHelper { @Suppress("UNCHECKED_CAST") fun

findSerializer(rootType: JpsModuleSourceRootType

): JpsModuleSourceRootPropertiesSerializer

? { diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/TestModulePropertiesBridge.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/TestModulePropertiesBridge.kt index a922180975cf..e39c022a797d 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/TestModulePropertiesBridge.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/TestModulePropertiesBridge.kt @@ -9,7 +9,9 @@ import com.intellij.platform.backend.workspace.WorkspaceModel import com.intellij.platform.workspace.jps.entities.* import com.intellij.platform.workspace.storage.MutableEntityStorage import com.intellij.workspaceModel.ide.impl.legacyBridge.module.findModule +import org.jetbrains.annotations.ApiStatus +@ApiStatus.Internal class TestModulePropertiesBridge(private val currentModule: Module): TestModuleProperties() { private val workspaceModel = WorkspaceModel.getInstance(currentModule.project) diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/sdk/SdkModificatorBridgeImpl.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/sdk/SdkModificatorBridgeImpl.kt index 2947ab26c562..7ce4dad11bfa 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/sdk/SdkModificatorBridgeImpl.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/sdk/SdkModificatorBridgeImpl.kt @@ -19,7 +19,8 @@ import com.intellij.workspaceModel.ide.impl.legacyBridge.sdk.SdkBridgeImpl.Compa import org.jdom.Element private val rootTypes = ConcurrentFactoryMap.createMap { SdkRootTypeId(it) } -class SdkModificatorBridgeImpl(private val originalEntity: SdkEntity.Builder, + +internal class SdkModificatorBridgeImpl(private val originalEntity: SdkEntity.Builder, private val originalSdk: ProjectJdkImpl, private val originalSdkDelegate: SdkBridgeImpl) : SdkModificator { diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/watcher/FileContainerDescription.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/watcher/FileContainerDescription.kt index 45b12e36985b..e4a3d6c69ca6 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/watcher/FileContainerDescription.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/watcher/FileContainerDescription.kt @@ -15,7 +15,7 @@ import com.intellij.util.containers.toArray import com.intellij.util.io.URLUtil import java.util.* -class FileContainerDescription(val urls: List, private val jarDirectories: List) { +internal class FileContainerDescription(val urls: List, private val jarDirectories: List) { private val virtualFilePointersList = mutableSetOf() private val virtualFilePointerManager = VirtualFilePointerManager.getInstance() diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/orphanage.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/orphanage.kt index 2a3dcd1bae8f..db616aaa8f59 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/orphanage.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/orphanage.kt @@ -94,7 +94,7 @@ internal class EntitiesOrphanageImpl(private val project: Project) : EntitiesOrp } @Service(Service.Level.PROJECT) -class OrphanService( +internal class OrphanService( private val project: Project, private val cs: CoroutineScope, ) { diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/workspaceMetrics.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/workspaceMetrics.kt index 3d7ca6984e25..0e2d67b840c6 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/workspaceMetrics.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/workspaceMetrics.kt @@ -4,9 +4,12 @@ package com.intellij.workspaceModel.ide.impl import com.intellij.platform.diagnostic.telemetry.WorkspaceModel import com.intellij.platform.diagnostic.telemetry.helpers.SharedMetrics import com.intellij.util.concurrency.SynchronizedClearableLazy +import org.jetbrains.annotations.ApiStatus +@get:ApiStatus.Internal val workspaceModelMetrics: WorkspaceModelMetrics by lazy { WorkspaceModelMetrics.instance.value } +@ApiStatus.Internal class WorkspaceModelMetrics : SharedMetrics(WorkspaceModel) { companion object { val instance: SynchronizedClearableLazy = SynchronizedClearableLazy { WorkspaceModelMetrics() } diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/jpsEntitySources.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/jpsEntitySources.kt index 4fbc43e6cc5e..648f28a4a098 100644 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/jpsEntitySources.kt +++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/jpsEntitySources.kt @@ -5,7 +5,9 @@ import com.intellij.openapi.roots.ExternalProjectSystemRegistry import com.intellij.openapi.roots.ProjectModelExternalSource import com.intellij.platform.workspace.jps.JpsImportedEntitySource import com.intellij.platform.workspace.storage.EntitySource +import org.jetbrains.annotations.ApiStatus +@ApiStatus.Internal fun JpsImportedEntitySource.toExternalSource(): ProjectModelExternalSource = ExternalProjectSystemRegistry.getInstance().getSourceById(externalSystemId) /**