From ddb1066c50eb38d2c7ce891e98253fd14edaca35 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <Alexey.Kudravtsev@jetbrains.com>
Date: Wed, 4 Feb 2026 14:54:39 +0100
Subject: [PATCH] cleanup tests: fix NPE in light editors

GitOrigin-RevId: 3d2b8a95b899dbf3de1adbb59e132a6d8d15d8c4
---
 .../openapi/fileEditor/impl/FileEditorProviderManagerImpl.kt  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.kt b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.kt
index 39d2bfd204c2..98f37254ea68 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.kt
@@ -205,7 +205,9 @@ class FileEditorProviderManagerImpl
     }
 
     updateState {
-      FileEditorProviderManagerState(it.selectedProviders + (computeKey(list) to composite.selectedWithProvider!!.provider.editorTypeId))
+      val selectedWithProvider = composite.selectedWithProvider
+      val selected = if (selectedWithProvider == null) it.selectedProviders else it.selectedProviders + (computeKey(list) to selectedWithProvider.provider.editorTypeId)
+      FileEditorProviderManagerState(selected)
     }
   }