From 6928cfcabb002d2dcd5c777b28128edd3dbbe39e Mon Sep 17 00:00:00 2001
From: "Aleksei.Cherepanov" <aleksei.cherepanov@jetbrains.com>
Date: Thu, 5 Feb 2026 15:13:05 +0100
Subject: [PATCH] KTIJ-37427 [CRI] Improve diagnostics when CRI is disabled or
 uninitialized

GitOrigin-RevId: 7533b3901033153bce4e1a86456a9716357dcce3
---
 .../kotlin/idea/search/refIndex/CriDiagnosticAction.kt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/kotlin/compiler-reference-index/src/org/jetbrains/kotlin/idea/search/refIndex/CriDiagnosticAction.kt b/plugins/kotlin/compiler-reference-index/src/org/jetbrains/kotlin/idea/search/refIndex/CriDiagnosticAction.kt
index 72700c8be4a8..32c167751673 100644
--- a/plugins/kotlin/compiler-reference-index/src/org/jetbrains/kotlin/idea/search/refIndex/CriDiagnosticAction.kt
+++ b/plugins/kotlin/compiler-reference-index/src/org/jetbrains/kotlin/idea/search/refIndex/CriDiagnosticAction.kt
@@ -24,7 +24,15 @@ class CriDiagnosticAction : AnAction(), DumbAware {
             appendLine("=== Kotlin CRI Diagnostics ===")
             appendLine()
 
-            val dirtyModules = KotlinCompilerReferenceIndexService.getInstanceIfEnabled(project)?.dirtyModules() ?: emptySet()
+            val kotlinCompilerReferenceIndexService = KotlinCompilerReferenceIndexService.getInstanceIfEnabled(project) ?: run {
+                appendLine("Kotlin Compiler Reference Index is disabled")
+                return@buildString
+            }
+
+            val dirtyModules = kotlinCompilerReferenceIndexService.dirtyModules() ?: run {
+                appendLine("Kotlin CRI storage is not yet initialized")
+                return@buildString
+            }
 
             appendLine("Dirty Modules (${dirtyModules.size}):")
             if (dirtyModules.isEmpty()) {