From fc9411f1f0287c8c861f0d0d2f6af3c518e8fc92 Mon Sep 17 00:00:00 2001
From: Karol Lewandowski <karol.lewandowski@jetbrains.com>
Date: Mon, 8 Sep 2025 17:59:06 +0200
Subject: [PATCH] [devkit] IJPL-197281: Expire an NBRA in
 PluginDescriptorDomFileSearchScopeProvider when a project is disposed

GitOrigin-RevId: e3f80d3c3e3efcf7f2d41130af9666c97e935dbc
---
 .../dom/ide/PluginDescriptorDomFileSearchScopeProvider.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorDomFileSearchScopeProvider.java b/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorDomFileSearchScopeProvider.java
index e58f19b0ea87..aa7d6e13eba8 100644
--- a/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorDomFileSearchScopeProvider.java
+++ b/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorDomFileSearchScopeProvider.java
@@ -50,7 +50,9 @@ final class PluginDescriptorDomFileSearchScopeProvider implements SearchScopePro
       if (ApplicationManager.getApplication().isReadAccessAllowed()) {
         return getDomFileCandidates(project);
       }
-      return ReadAction.nonBlocking(() -> getDomFileCandidates(project)).executeSynchronously();
+      return ReadAction.nonBlocking(() -> getDomFileCandidates(project))
+        .expireWhen(() -> project.isDisposed())
+        .executeSynchronously();
     };
   }