MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

clean up: rename locals

Browse Source 
GitOrigin-RevId: af91ade4cc207a745c55750e5141084283d9f2b0
This commit is contained in:
Daniil Ovchinnikov
2023-08-17 19:02:24 +02:00
committed by intellij-monorepo-bot
parent e07d23cd62
commit caa4ad0a0c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
platform/core-impl/src/com/intellij/openapi/progress/impl/ProgressRunner.java
View File

@@ -440,12 +440,12 @@ public final class ProgressRunner<R> {
@NotNull CompletableFuture<? extends @NotNull ProgressIndicator> progressIndicatorFuture
) {
CompletableFuture<R> resultFuture = new CompletableFuture<>();
ChildContext childContextAndJob = Propagation.createChildContext();
CoroutineContext childContext = childContextAndJob.getContext();
CompletableJob childJob = childContextAndJob.getJob();
if (childJob != null) {
ChildContext childContext = Propagation.createChildContext();
CoroutineContext context = childContext.getContext();
CompletableJob job = childContext.getJob();
if (job != null) {
// cancellation of the Job cancels the future
childJob.invokeOnCompletion(true, true, (throwable) -> {
job.invokeOnCompletion(true, true, (throwable) -> {
if (throwable != null) {
resultFuture.completeExceptionally(throwable);
}
@@ -458,11 +458,11 @@ public final class ProgressRunner<R> {
return;
}
Runnable runnable = new ProgressRunnable<>(resultFuture, task, progressIndicator);
Runnable contextRunnable = childContext.equals(EmptyCoroutineContext.INSTANCE) ? runnable : (ContextAwareRunnable)() -> {
CoroutineContext effectiveContext = childContext.plus(asContextElement(progressIndicator.getModalityState()));
Runnable contextRunnable = context.equals(EmptyCoroutineContext.INSTANCE) ? runnable : (ContextAwareRunnable)() -> {
CoroutineContext effectiveContext = context.plus(asContextElement(progressIndicator.getModalityState()));
try (AccessToken ignored = ThreadContext.installThreadContext(effectiveContext, false)) {
if (childJob != null) {
Propagation.runAsCoroutine(childJob, runnable);
if (job != null) {
Propagation.runAsCoroutine(job, runnable);
}
else {
runnable.run();