From f313e649fdff0ea0c36272ad51ddb2f945700fa2 Mon Sep 17 00:00:00 2001
From: Andrey Zaytsev <andrey.zaytsev@jetbrains.com>
Date: Wed, 26 Mar 2025 14:10:13 +0100
Subject: [PATCH] [analyzer] register missing kotlin services to resolve
 against WorkspaceModel

GitOrigin-RevId: 6fa3af75cade31270719c0e3d90a9909febf067f
---
 .../openapi/roots/impl/ProjectPackageIndexImpl.java        | 7 +++++--
 .../kotlin/idea/base/analysis/RootKindMatcherImpl.kt       | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/java/java-indexing-impl/src/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java b/java/java-indexing-impl/src/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java
index d9ce4eac6959..a6a19c82d315 100644
--- a/java/java-indexing-impl/src/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java
+++ b/java/java-indexing-impl/src/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java
@@ -7,14 +7,17 @@ import com.intellij.openapi.roots.PackageIndex;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.Query;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-final class ProjectPackageIndexImpl extends PackageIndex {
+@ApiStatus.Internal
+public final class ProjectPackageIndexImpl extends PackageIndex {
   private static final Logger LOG = Logger.getInstance(ProjectPackageIndexImpl.class);
   private final DirectoryIndex myDirectoryIndex;
 
-  ProjectPackageIndexImpl(@NotNull Project project) {
+  @ApiStatus.Internal
+  public ProjectPackageIndexImpl(@NotNull Project project) {
     myDirectoryIndex = DirectoryIndex.getInstance(project);
   }
 
diff --git a/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/base/analysis/RootKindMatcherImpl.kt b/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/base/analysis/RootKindMatcherImpl.kt
index 2347bc92b966..465aaeff5fe8 100644
--- a/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/base/analysis/RootKindMatcherImpl.kt
+++ b/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/base/analysis/RootKindMatcherImpl.kt
@@ -12,6 +12,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.originalFileOrSelf
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.base.projectStructure.RootKindFilter
 import org.jetbrains.kotlin.idea.base.projectStructure.RootKindMatcher
@@ -28,7 +29,8 @@ import kotlin.script.experimental.api.ScriptCompilationConfiguration
 import kotlin.script.experimental.api.acceptedLocations
 import kotlin.script.experimental.api.ide
 
-internal class RootKindMatcherImpl(private val project: Project) : RootKindMatcher {
+@ApiStatus.Internal
+class RootKindMatcherImpl(private val project: Project) : RootKindMatcher {
     private val fileIndex by lazy { ProjectRootManager.getInstance(project).fileIndex }
 
     override fun matches(filter: RootKindFilter, virtualFile: VirtualFile): Boolean {