IJPL-15953 enable project.root.manager.over.wsm registry flag

GitOrigin-RevId: b87967be787ffcd78e828608af3cb25c446831c0
This commit is contained in:
Andrei.Kuznetsov
2025-09-04 15:42:16 +00:00
committed by intellij-monorepo-bot
parent b31beafc3a
commit e0f8b56a68
7 changed files with 8 additions and 8 deletions
@@ -45,7 +45,7 @@ final class CompilerProjectExtensionImpl extends CompilerProjectExtension implem
private LocalFileSystem.WatchRequest myCompilerOutputWatchRequest;
private final Project project;
private final boolean useWsm = Registry.is("project.root.manager.over.wsm", false);
private final boolean useWsm = Registry.is("project.root.manager.over.wsm", true);
CompilerProjectExtensionImpl(@NotNull Project project) {
this.project = project;
@@ -40,7 +40,7 @@ public final class LanguageLevelProjectExtensionImpl extends LanguageLevelProjec
private static final String DEFAULT_ATTRIBUTE = "default";
private static final Logger LOG = Logger.getInstance(LanguageLevelProjectExtensionImpl.class);
private final boolean useWsm = Registry.is("project.root.manager.over.wsm", false);
private final boolean useWsm = Registry.is("project.root.manager.over.wsm", true);
private final Project myProject;
private LanguageLevel myCurrentLevel;
@@ -137,7 +137,7 @@ final class CustomEntitiesCausingReindexTracker {
} else if (entity instanceof SdkEntity) {
return hasDependencyOn((SdkEntity) entity, project);
}
else if (entity instanceof ProjectSettingsEntity && Registry.is("project.root.manager.over.wsm", false)) {
else if (entity instanceof ProjectSettingsEntity && Registry.is("project.root.manager.over.wsm", true)) {
return true; // don't care if there are references from modules or not: project sdk is always indexed
}
return isEntityToRescan(entity);
@@ -125,7 +125,7 @@
<registryKey key="unknown.sdk.show.editor.actions" defaultValue="true" description="Show editor suggestions to fix missing SKDs"/>
<registryKey key="psi.vfs.listener.over.wsm" defaultValue="true" restartRequired="true"
description="Use WSM listeners to invalidate PSI caches (new) in addition to legacy ModuleRootListener"/>
<registryKey key="project.root.manager.over.wsm" defaultValue="false" restartRequired="true"
<registryKey key="project.root.manager.over.wsm" defaultValue="true" restartRequired="true"
description="Use WSM to hold project settings (java language level, project sdk, compiler outputs)"/>
<editorNotificationProvider implementation="com.intellij.openapi.projectRoots.impl.UnknownSdkEditorNotificationsProvider"/>
@@ -169,7 +169,7 @@ open class ProjectRootManagerImpl(
// This field is not used when useWsm set to `true`
private val stateComponent = ProjectRootManagerStateComponentImpl(this::projectJdkChanged, this::notifyExtensions)
protected val useWsm: Boolean = Registry.`is`("project.root.manager.over.wsm", false)
protected val useWsm: Boolean = Registry.`is`("project.root.manager.over.wsm", true)
private val rootCache: OrderRootsCache
@@ -17,7 +17,7 @@ import com.intellij.workspaceModel.ide.legacyBridge.ModuleDependencyIndex
class SdkEntityFileIndexContributor : WorkspaceFileIndexContributor<SdkEntity>, PlatformInternalWorkspaceFileIndexContributor {
private val useWsmForProjectSdk: Boolean = Registry.`is`("project.root.manager.over.wsm", false)
private val useWsmForProjectSdk: Boolean = Registry.`is`("project.root.manager.over.wsm", true)
override val entityClass: Class<SdkEntity>
get() = SdkEntity::class.java
@@ -51,7 +51,7 @@ class ProjectSettingsSerializer(
errorReporter: ErrorReporter,
virtualFileManager: VirtualFileUrlManager,
): LoadingResult<Map<Class<out WorkspaceEntity>, Collection<WorkspaceEntity.Builder<out WorkspaceEntity>>>> = loadEntitiesTimeMs.addMeasuredTime {
if (!Registry.`is`("project.root.manager.over.wsm", false)) {
if (!Registry.`is`("project.root.manager.over.wsm", true)) {
return@addMeasuredTime LoadingResult(emptyMap())
}
@@ -102,7 +102,7 @@ class ProjectSettingsSerializer(
storage: EntityStorage,
writer: JpsFileContentWriter,
): Unit = saveEntitiesTimeMs.addMeasuredTime {
if (!Registry.`is`("project.root.manager.over.wsm", false)) {
if (!Registry.`is`("project.root.manager.over.wsm", true)) {
thisLogger().error( // severity error because we don't expect these entities to exist in the first place
"ProjectSettingsEntity and JavaProjectSettingsEntity will not be saved, because registry flag " +
"`project.root.manager.over.wsm` is false"