diff --git a/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleManagerComponentBridge.kt b/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleManagerComponentBridge.kt index f7a19e820de97..980433e87a03e 100644 --- a/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleManagerComponentBridge.kt +++ b/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleManagerComponentBridge.kt @@ -2,7 +2,6 @@ package com.intellij.workspaceModel.ide.impl.legacyBridge.module import com.intellij.facet.impl.FacetEventsPublisher -import com.intellij.openapi.components.service import com.intellij.openapi.components.serviceAsync import com.intellij.openapi.diagnostic.debug import com.intellij.openapi.diagnostic.logger @@ -34,7 +33,6 @@ import com.intellij.workspaceModel.ide.getJpsProjectConfigLocation import com.intellij.workspaceModel.ide.impl.VirtualFileUrlBridge import com.intellij.workspaceModel.ide.impl.jps.serialization.BaseIdeSerializationContext import com.intellij.workspaceModel.ide.impl.jps.serialization.CachingJpsFileContentReader -import com.intellij.workspaceModel.ide.impl.legacyBridge.facet.FacetEntityChangeListener import com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeImpl.Companion.libraryMap import com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModuleLibraryTableBridgeImpl import com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.ModuleRootComponentBridge @@ -70,21 +68,22 @@ internal class ModuleManagerInitProjectActivity : InitProjectActivity { @ApiStatus.Internal open class ModuleManagerComponentBridge(private val project: Project, coroutineScope: CoroutineScope) : ModuleManagerBridgeImpl(project = project, coroutineScope = coroutineScope, moduleRootListenerBridge = ModuleRootListenerBridgeImpl) { - init { - // a default project doesn't have facets - if (!project.isDefault) { - // Instantiate facet change listener as early as possible - project.service() - } - } + // facets are disabled in rebased + // init { + // // a default project doesn't have facets + // if (!project.isDefault) { + // // Instantiate facet change listener as early as possible + // project.service() + // } + //} @Suppress("UNCHECKED_CAST") override fun initializeBridges(event: Map, List>>, builder: MutableEntityStorage) { // Initialize modules initializeModuleBridges(event, builder) - // Initialize facets - project.service().initializeFacetBridge(event, builder) + // Initialize facets (disabled in rebased) + //project.service().initializeFacetBridge(event, builder) // Initialize module libraries val moduleLibraryChanges = ((event[LibraryEntity::class.java] as? List>) ?: emptyList()) diff --git a/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml b/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml index 2d963519497a7..227d2479bdd59 100644 --- a/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml +++ b/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml @@ -127,8 +127,8 @@ topic="com.intellij.openapi.roots.ModuleRootListener"/> - + +