From af3abb4a55a90631964e28df8c7eb211d20481d0 Mon Sep 17 00:00:00 2001
From: Nikolay Chashnikov <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 13 Mar 2023 17:44:41 +0100
Subject: [PATCH] [workspace file index] remove registry key which allows users
 to switch back to the old implementation (IDEA-276394)

It was enabled by default in all JetBrains IDEs (except Rider) in 2022.3 releases, and Rider also enabled this option by default in 2023.1. No major regressions were found, so now we can remove this option. This will allow us to use WorkspaceFileIndex in new code without providing a fallback. Also, we'll be able to remove the old implementation later.

GitOrigin-RevId: 8ca9fea12b81c87302d710946e236bb61ce6a359
---
 .../resources/META-INF/ProjectModelImpl.xml                | 3 ---
 .../core/fileIndex/impl/WorkspaceFileIndexEx.kt            | 7 +++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml b/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml
index 4f3d12399e63..d8ff3b7938be 100644
--- a/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml
+++ b/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml
@@ -78,9 +78,6 @@
     <workspaceModel.fileIndexContributor implementation="com.intellij.workspaceModel.core.fileIndex.impl.LibraryRootFileIndexContributor"/>
     <workspaceModel.fileIndexContributor implementation="com.intellij.workspaceModel.core.fileIndex.impl.ExcludedRootFileIndexContributor"/>
     <workspaceModel.fileIndexContributor implementation="com.intellij.workspaceModel.core.fileIndex.impl.UnloadedContentRootFileIndexContributor"/>
-    <registryKey key="platform.projectModel.workspace.model.file.index" defaultValue="true"
-                 description="Use new implementation of ProjectFileIndex based on WorkspaceModel with incremental updates"
-                 restartRequired="true"/>
     <registryKey key="ide.new.project.model.strict.mode.rbs" defaultValue="true" restartRequired="true"
                  description="Enable additional checks after replaceBySource and addDiff"/>
     <registryKey key="ide.workspace.model.assertions.on.update" defaultValue="false" restartRequired="false"
diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/core/fileIndex/impl/WorkspaceFileIndexEx.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/core/fileIndex/impl/WorkspaceFileIndexEx.kt
index 7033cc01050d..30d2f0e9ccc5 100644
--- a/platform/projectModel-impl/src/com/intellij/workspaceModel/core/fileIndex/impl/WorkspaceFileIndexEx.kt
+++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/core/fileIndex/impl/WorkspaceFileIndexEx.kt
@@ -2,7 +2,6 @@
 package com.intellij.workspaceModel.core.fileIndex.impl
 
 import com.intellij.openapi.roots.ContentIteratorEx
-import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.vfs.AsyncFileListener
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileFilter
@@ -83,8 +82,12 @@ interface WorkspaceFileIndexEx : WorkspaceFileIndex {
   fun reset()
 
   companion object {
+    /**
+     * WorkspaceFileIndex is now always enabled. Usages of this constant will be inlined later.
+     */
+    @Suppress("MayBeConstant")
     @JvmField
-    val IS_ENABLED: Boolean = Registry.`is`("platform.projectModel.workspace.model.file.index", true)
+    val IS_ENABLED: Boolean = true
   }
 }