From c25ea62fae8f4a2b8884cf66e6df1003e1ce1898 Mon Sep 17 00:00:00 2001 From: Konstantin Nisht Date: Tue, 18 Jun 2024 18:05:51 +0200 Subject: [PATCH] [platform] IJPL-156117: Create child context for highlighting passes. If we pass context as-is, then the completion of the enclosing `BlockingJob` would not be prevented by the pass. GitOrigin-RevId: 22a80bad3f2a2dbff6f0f0bca81ad7dd48ffc65d --- .../intellij/codeInsight/daemon/impl/PassExecutorService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java index 5af94fdb66eb..806fd13a1900 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java @@ -41,6 +41,7 @@ import com.intellij.platform.diagnostic.telemetry.helpers.TraceUtil; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.util.Functions; +import com.intellij.util.concurrency.Propagation; import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashingStrategy; @@ -368,7 +369,7 @@ final class PassExecutorService implements Disposable { myThreadsToStartCountdown = threadsToStartCountdown; myUpdateProgress = progressIndicator; myOpenTelemetryContext = openTelemetryContext; - myContext = ThreadContext.currentThreadContext().minusKey(kotlinx.coroutines.Job.Key); + myContext = Propagation.createChildContext().getContext(); } @Override