From 3db60a3e9ddf5ccab05dfb613b812d0faf9aa057 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Fri, 17 Oct 2025 05:30:53 +0400
Subject: [PATCH] [service view] IJPL-211147 Test navigation does nothing

(cherry picked from commit 99d27c8fe447b837d8b8b06cbb8766ac399c8cc9)

IJ-CR-178950

GitOrigin-RevId: 4f1824b4ee2303af196e091d2ffc89fb820b7580
---
 .../execution.serviceView/src/ServiceViewSelectionDataRule.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/execution.serviceView/src/ServiceViewSelectionDataRule.kt b/platform/execution.serviceView/src/ServiceViewSelectionDataRule.kt
index ae58cbddc103..6896c3f8cabd 100644
--- a/platform/execution.serviceView/src/ServiceViewSelectionDataRule.kt
+++ b/platform/execution.serviceView/src/ServiceViewSelectionDataRule.kt
@@ -10,7 +10,9 @@ class ServiceViewSelectionDataRule : UiDataRule {
   override fun uiDataSnapshot(sink: DataSink, snapshot: DataSnapshot) {
     val project = snapshot[CommonDataKeys.PROJECT] ?: return
     val ids = snapshot[SERVICES_SELECTED_DESCRIPTOR_IDS] ?: return
-    sink[CommonDataKeys.NAVIGATABLE_ARRAY] = ids.mapNotNull { it.getNavigatable(project) }.toTypedArray()
+    val navigatables = ids.mapNotNull { it.getNavigatable(project) }.toTypedArray()
+    sink.lazy(CommonDataKeys.NAVIGATABLE) { navigatables.firstOrNull() }
+    sink.lazy(CommonDataKeys.NAVIGATABLE_ARRAY) { navigatables }
     sink[PlatformCoreDataKeys.SELECTED_ITEMS] = ids.mapNotNull { it.getSelectedItem(project) }.toTypedArray()
   }
 }