Skip to content

yet another attempt at preventing facet related errors #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DetachHead merged 1 commit into from
Jul 6, 2026
Merged

yet another attempt at preventing facet related errors #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions .../com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleManagerComponentBridge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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<FacetEntityChangeListener>()
}
}
// 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<FacetEntityChangeListener>()
// }
//}

@Suppress("UNCHECKED_CAST")
override fun initializeBridges(event: Map<Class<*>, List<EntityChange<*>>>, builder: MutableEntityStorage) {
// Initialize modules
initializeModuleBridges(event, builder)

// Initialize facets
project.service<FacetEntityChangeListener>().initializeFacetBridge(event, builder)
// Initialize facets (disabled in rebased)
//project.service<FacetEntityChangeListener>().initializeFacetBridge(event, builder)

// Initialize module libraries
val moduleLibraryChanges = ((event[LibraryEntity::class.java] as? List<EntityChange<LibraryEntity>>) ?: emptyList())
Expand Down
4 changes: 2 additions & 2 deletions platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@
topic="com.intellij.openapi.roots.ModuleRootListener"/>
<listener class="com.intellij.psi.impl.file.impl.PsiWsmListener"
topic="com.intellij.platform.backend.workspace.WorkspaceModelChangeListener"/>
<listener class="com.intellij.workspaceModel.ide.impl.legacyBridge.facet.FacetEntityChangeListener$WorkspaceModelListener"
topic="com.intellij.platform.backend.workspace.WorkspaceModelChangeListener"/>
<!--<listener class="com.intellij.workspaceModel.ide.impl.legacyBridge.facet.FacetEntityChangeListener$WorkspaceModelListener"-->
<!-- topic="com.intellij.platform.backend.workspace.WorkspaceModelChangeListener"/>-->
<listener class="com.intellij.workspaceModel.ide.impl.legacyBridge.module.ModuleBridgeCleaner"
topic="com.intellij.platform.backend.workspace.WorkspaceModelChangeListener"/>
</projectListeners>
Expand Down
Loading