From 53d6cb84095bec475ca453b1f6f7a87e50d9cea4 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Thu, 17 Aug 2023 16:04:38 +0200
Subject: [PATCH] clean up after conversion to Kotlin

GitOrigin-RevId: 482389d8ca2bfeff0fc305db3ba8dd639484f06d
---
 .../util/concurrency/CancellationBiConsumer.kt      | 10 +++++-----
 .../util/concurrency/CancellationCallable.kt        | 10 +++++-----
 .../util/concurrency/CancellationFunction.kt        | 12 ++++++------
 .../util/concurrency/CancellationRunnable.kt        | 13 ++++++-------
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/platform/util/src/com/intellij/util/concurrency/CancellationBiConsumer.kt b/platform/util/src/com/intellij/util/concurrency/CancellationBiConsumer.kt
index 88836e1c1a32..89e19ef2677a 100644
--- a/platform/util/src/com/intellij/util/concurrency/CancellationBiConsumer.kt
+++ b/platform/util/src/com/intellij/util/concurrency/CancellationBiConsumer.kt
@@ -5,12 +5,12 @@ import kotlinx.coroutines.CompletableJob
 import java.util.function.BiConsumer
 
 internal class CancellationBiConsumer<T, U>(
-  private val myJob: CompletableJob,
-  private val myRunnable: BiConsumer<T, U>,
-  ) : BiConsumer<T, U> {
+  private val job: CompletableJob,
+  private val runnable: BiConsumer<T, U>,
+) : BiConsumer<T, U> {
   override fun accept(t: T, u: U) {
-    runAsCoroutine(myJob) {
-      myRunnable.accept(t, u)
+    runAsCoroutine(job) {
+      runnable.accept(t, u)
     }
   }
 }
diff --git a/platform/util/src/com/intellij/util/concurrency/CancellationCallable.kt b/platform/util/src/com/intellij/util/concurrency/CancellationCallable.kt
index b1c7159c7b34..b417f120736f 100644
--- a/platform/util/src/com/intellij/util/concurrency/CancellationCallable.kt
+++ b/platform/util/src/com/intellij/util/concurrency/CancellationCallable.kt
@@ -13,13 +13,13 @@ import java.util.concurrent.Callable
  * @see CancellationRunnable
  */
 internal class CancellationCallable<V>(
-  private val myJob: CompletableJob,
-  private val myCallable: Callable<out V>,
-  ) : Callable<V> {
+  private val job: CompletableJob,
+  private val callable: Callable<out V>,
+) : Callable<V> {
 
   override fun call(): V {
-    return runAsCoroutine(myJob) {
-      myCallable.call()
+    return runAsCoroutine(job) {
+      callable.call()
     }
   }
 }
diff --git a/platform/util/src/com/intellij/util/concurrency/CancellationFunction.kt b/platform/util/src/com/intellij/util/concurrency/CancellationFunction.kt
index 0cf78cbfd8d8..8182e717c5fa 100644
--- a/platform/util/src/com/intellij/util/concurrency/CancellationFunction.kt
+++ b/platform/util/src/com/intellij/util/concurrency/CancellationFunction.kt
@@ -7,17 +7,17 @@ import java.util.function.Function
 
 @ApiStatus.Internal
 class CancellationFunction<T, U> internal constructor(
-  private val myJob: CompletableJob,
-  private val myFunction: Function<T, U>,
-  ) : Function<T, U> {
+  private val job: CompletableJob,
+  private val function: Function<T, U>,
+) : Function<T, U> {
 
   override fun apply(t: T): U {
-    return runAsCoroutine(myJob) {
-      myFunction.apply(t)
+    return runAsCoroutine(job) {
+      function.apply(t)
     }
   }
 
   override fun toString(): String {
-    return myFunction.toString()
+    return function.toString()
   }
 }
diff --git a/platform/util/src/com/intellij/util/concurrency/CancellationRunnable.kt b/platform/util/src/com/intellij/util/concurrency/CancellationRunnable.kt
index 0a2cb0f83ead..4a789660c0a0 100644
--- a/platform/util/src/com/intellij/util/concurrency/CancellationRunnable.kt
+++ b/platform/util/src/com/intellij/util/concurrency/CancellationRunnable.kt
@@ -1,8 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.concurrency
 
-import kotlinx.coroutines.*
-import java.lang.Runnable
+import kotlinx.coroutines.CompletableJob
 
 /**
  * A Runnable, which, when run, associates the calling thread with a job,
@@ -11,15 +10,15 @@ import java.lang.Runnable
  * @see CancellationCallable
  */
 internal class CancellationRunnable(
-  private val myJob: CompletableJob,
-  private val myRunnable: Runnable,
-  ) : Runnable {
+  private val job: CompletableJob,
+  private val runnable: Runnable,
+) : Runnable {
 
   override fun run() {
-    runAsCoroutine(myJob, myRunnable)
+    runAsCoroutine(job, runnable)
   }
 
   override fun toString(): String {
-    return myRunnable.toString()
+    return runnable.toString()
   }
 }