remove intellij.platform.externalSystem.impl dependency

GitOrigin-RevId: 3d6edae754c4c2be0b503c3084bd85ec33987719
This commit is contained in:
Vladimir Krivosheev
2024-09-23 08:43:09 +00:00
committed by intellij-monorepo-bot
parent 5f44eb434c
commit 2041cd0e2b
4 changed files with 16 additions and 7 deletions
@@ -87,6 +87,8 @@ private val PLATFORM_IMPLEMENTATION_MODULES = java.util.List.of(
"intellij.platform.markdown.utils",
"intellij.platform.util.commonsLangV2Shim",
"intellij.platform.externalSystem.impl",
// do we need it?
"intellij.platform.sqlite",
//"fleet.rpc.server",
@@ -69,7 +69,6 @@
<orderEntry type="module" module-name="intellij.platform.util.ui" exported="" />
<orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.instanceContainer" />
<orderEntry type="module" module-name="intellij.platform.serviceContainer" />
<orderEntry type="library" name="jcef" level="project" />
@@ -36,8 +36,8 @@ internal class IdeSerializationContext(
override val virtualFileUrlManager: VirtualFileUrlManager,
override val fileContentReader: JpsFileContentReader,
override val fileInDirectorySourceNames: FileInDirectorySourceNames,
private val externalStorageConfigurationManager: ExternalStorageConfigurationManager
private val externalStorageConfigurationManager: ExternalStorageConfigurationManager?
) : BaseIdeSerializationContext() {
override val isExternalStorageEnabled: Boolean
get() = externalStorageConfigurationManager.isEnabled
get() = externalStorageConfigurationManager?.isEnabled == true
}
@@ -12,6 +12,7 @@ import com.intellij.openapi.application.writeAction
import com.intellij.openapi.components.Service
import com.intellij.openapi.components.service
import com.intellij.openapi.components.serviceIfCreated
import com.intellij.openapi.components.serviceOrNull
import com.intellij.openapi.diagnostic.debug
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.module.ProjectLoadingErrorsNotifier
@@ -38,7 +39,10 @@ import com.intellij.platform.workspace.jps.*
import com.intellij.platform.workspace.jps.entities.ModuleEntity
import com.intellij.platform.workspace.jps.serialization.impl.*
import com.intellij.platform.workspace.jps.serialization.impl.JpsProjectEntitiesLoader.createProjectSerializers
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.DummyParentEntitySource
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.VersionedStorageChange
import com.intellij.platform.workspace.storage.impl.VersionedStorageChangeInternal
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
@@ -424,10 +428,14 @@ class JpsProjectModelSynchronizer(private val project: Project) : Disposable {
val configLocation: JpsProjectConfigLocation = getJpsProjectConfigLocation(project)!!
fileContentReader = (project.stateStore as ProjectStoreWithJpsContentReader).createContentReader()
val externalStoragePath = project.getExternalConfigurationDir()
val externalStorageConfigurationManager = ExternalStorageConfigurationManager.getInstance(project)
val externalStorageConfigurationManager = project.serviceOrNull<ExternalStorageConfigurationManager>()
val fileInDirectorySourceNames = FileInDirectorySourceNames.from(WorkspaceModel.getInstance(project).currentSnapshot)
val context = IdeSerializationContext(virtualFileManager, fileContentReader, fileInDirectorySourceNames,
externalStorageConfigurationManager)
val context = IdeSerializationContext(
virtualFileUrlManager = virtualFileManager,
fileContentReader = fileContentReader,
fileInDirectorySourceNames = fileInDirectorySourceNames,
externalStorageConfigurationManager = externalStorageConfigurationManager,
)
return createProjectSerializers(configLocation, externalStoragePath, context)
}