Add INVISIBLE_REFERENCE to every INVISIBLE_MEMBER suppression

dkhalanskyjb · qwwdfsad · commit 2ec8c2811475 · 2023-11-27T11:50:47.000+01:00
diff --git a/kotlinx-coroutines-test/common/src/TestCoroutineDispatchers.kt b/kotlinx-coroutines-test/common/src/TestCoroutineDispatchers.kt
@@ -93,7 +93,7 @@ private class UnconfinedTestDispatcherImpl(
 
     override fun isDispatchNeeded(context: CoroutineContext): Boolean = false
 
-    @Suppress("INVISIBLE_MEMBER")
+    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
     override fun dispatch(context: CoroutineContext, block: Runnable) {
         checkSchedulerInContext(scheduler, context)
         scheduler.sendDispatchEvent(context)
diff --git a/kotlinx-coroutines-test/common/src/TestScope.kt b/kotlinx-coroutines-test/common/src/TestScope.kt
@@ -231,7 +231,7 @@ internal class TestScopeImpl(context: CoroutineContext) :
              * However, we also want [uncaughtExceptions] to be queried after the callback is registered,
              * because the exception collector will be able to report the exceptions that arrived before this test but
              * after the previous one, and learning about such exceptions as soon is possible is nice. */
-            @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
+            @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
             run { ensurePlatformExceptionHandlerLoaded(ExceptionCollector) }
             if (catchNonTestRelatedExceptions) {
                 ExceptionCollector.addOnExceptionCallback(lock, this::reportException)
@@ -288,7 +288,7 @@ internal class TestScopeImpl(context: CoroutineContext) :
             if (finished) {
                 throw throwable
             } else {
-                @Suppress("INVISIBLE_MEMBER")
+                @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
                 for (existingThrowable in uncaughtExceptions) {
                     // avoid reporting exceptions that already were reported.
                     if (unwrap(throwable) == unwrap(existingThrowable))
diff --git a/kotlinx-coroutines-test/common/src/internal/ExceptionCollector.kt b/kotlinx-coroutines-test/common/src/internal/ExceptionCollector.kt
@@ -81,7 +81,7 @@ internal object ExceptionCollector : AbstractCoroutineContextElement(CoroutineEx
         return executedACallback
     }
 
-    @Suppress("INVISIBLE_MEMBER")
+    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
     override fun handleException(context: CoroutineContext, exception: Throwable) {
         if (handleException(exception)) {
             throw ExceptionSuccessfullyProcessed
diff --git a/kotlinx-coroutines-test/common/src/internal/TestMainDispatcher.kt b/kotlinx-coroutines-test/common/src/internal/TestMainDispatcher.kt
@@ -91,9 +91,9 @@ internal class TestMainDispatcher(delegate: CoroutineDispatcher):
     }
 }
 
-@Suppress("INVISIBLE_MEMBER")
+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
 private val defaultDelay
     inline get() = DefaultDelay
 
-@Suppress("INVISIBLE_MEMBER")
+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
 internal expect fun Dispatchers.getTestMainDispatcher(): TestMainDispatcher
diff --git a/kotlinx-coroutines-test/common/test/RunTestTest.kt b/kotlinx-coroutines-test/common/test/RunTestTest.kt
@@ -166,7 +166,7 @@ class RunTestTest {
             it()
             fail("unreached")
         } catch (e: UncompletedCoroutinesError) {
-            @Suppress("INVISIBLE_MEMBER")
+            @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
             val suppressed = unwrap(e).suppressedExceptions
             assertEquals(1, suppressed.size, "$suppressed")
             assertIs<TestException>(suppressed[0]).also {
@@ -207,7 +207,7 @@ class RunTestTest {
             fn()
             fail("unreached")
         } catch (e: UncompletedCoroutinesError) {
-            @Suppress("INVISIBLE_MEMBER")
+            @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
             val suppressed = unwrap(e).suppressedExceptions
             assertEquals(1, suppressed.size, "$suppressed")
             assertIs<TestException>(suppressed[0]).also {
diff --git a/kotlinx-coroutines-test/js/src/internal/TestMainDispatcher.kt b/kotlinx-coroutines-test/js/src/internal/TestMainDispatcher.kt
@@ -5,7 +5,7 @@
 package kotlinx.coroutines.test.internal
 import kotlinx.coroutines.*
 
-@Suppress("INVISIBLE_MEMBER")
+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
 internal actual fun Dispatchers.getTestMainDispatcher(): TestMainDispatcher =
     when (val mainDispatcher = Main) {
         is TestMainDispatcher -> mainDispatcher
diff --git a/kotlinx-coroutines-test/jvm/src/migration/TestCoroutineExceptionHandler.kt b/kotlinx-coroutines-test/jvm/src/migration/TestCoroutineExceptionHandler.kt
@@ -55,7 +55,7 @@ public class TestCoroutineExceptionHandler :
     private val _lock = SynchronizedObject()
     private var _coroutinesCleanedUp = false
 
-    @Suppress("INVISIBLE_MEMBER")
+    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
     override fun handleException(context: CoroutineContext, exception: Throwable) {
         synchronized(_lock) {
             if (_coroutinesCleanedUp) {
diff --git a/kotlinx-coroutines-test/jvm/test/migration/RunTestLegacyScopeTest.kt b/kotlinx-coroutines-test/jvm/test/migration/RunTestLegacyScopeTest.kt
@@ -92,7 +92,7 @@ class RunTestLegacyScopeTest {
             fn()
             fail("unreached")
         } catch (e: UncompletedCoroutinesError) {
-            @Suppress("INVISIBLE_MEMBER")
+            @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
             val suppressed = unwrap(e).suppressedExceptions
             assertEquals(1, suppressed.size)
             assertIs<TestException>(suppressed[0]).also {
diff --git a/kotlinx-coroutines-test/native/src/internal/TestMainDispatcher.kt b/kotlinx-coroutines-test/native/src/internal/TestMainDispatcher.kt
@@ -5,7 +5,7 @@
 package kotlinx.coroutines.test.internal
 import kotlinx.coroutines.*
 
-@Suppress("INVISIBLE_MEMBER")
+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
 internal actual fun Dispatchers.getTestMainDispatcher(): TestMainDispatcher =
     when (val mainDispatcher = Main) {
         is TestMainDispatcher -> mainDispatcher
diff --git a/reactive/kotlinx-coroutines-reactive/src/Publish.kt b/reactive/kotlinx-coroutines-reactive/src/Publish.kt
@@ -84,7 +84,7 @@ public class PublisherCoroutine<in T>(
     // Mutex is locked when either nRequested == 0 or while subscriber.onXXX is being invoked
     private val mutex: Mutex = Mutex(locked = true)
 
-    @Suppress("UNCHECKED_CAST", "INVISIBLE_MEMBER")
+    @Suppress("UNCHECKED_CAST", "INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
     override val onSend: SelectClause2<T, SendChannel<T>> get() = SelectClause2Impl(
         clauseObject = this,
         regFunc = PublisherCoroutine<*>::registerSelectForSend as RegistrationFunction,
diff --git a/reactive/kotlinx-coroutines-reactive/src/ReactiveFlow.kt b/reactive/kotlinx-coroutines-reactive/src/ReactiveFlow.kt
@@ -59,7 +59,7 @@ private class PublisherAsFlow<T : Any>(
      * It's too counter-intuitive to be public, and moving it to Flow companion
      * will also create undesired effect.
      */
-    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
     private val requestSize: Long
         get() =
             if (onBufferOverflow != BufferOverflow.SUSPEND) {
@@ -208,7 +208,7 @@ public class FlowSubscription<T>(
         try {
             consumeFlow()
         } catch (cause: Throwable) {
-            @Suppress("INVISIBLE_MEMBER")
+            @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
             val unwrappedCause = unwrap(cause)
             if (!cancellationRequested || isActive || unwrappedCause !== getCancellationException()) {
                 try {
diff --git a/reactive/kotlinx-coroutines-rx2/src/RxObservable.kt b/reactive/kotlinx-coroutines-rx2/src/RxObservable.kt
@@ -70,7 +70,7 @@ private class RxObservableCoroutine<T : Any>(
     // Mutex is locked when either nRequested == 0 or while subscriber.onXXX is being invoked
     private val mutex: Mutex = Mutex()
 
-    @Suppress("UNCHECKED_CAST", "INVISIBLE_MEMBER")
+    @Suppress("UNCHECKED_CAST", "INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
     override val onSend: SelectClause2<T, SendChannel<T>> get() = SelectClause2Impl(
         clauseObject = this,
         regFunc = RxObservableCoroutine<*>::registerSelectForSend as RegistrationFunction,
@@ -165,7 +165,7 @@ private class RxObservableCoroutine<T : Any>(
             if (_signal.value == SIGNALLED)
                 return
             _signal.value = SIGNALLED // we'll signal onError/onCompleted (that the final state -- no CAS needed)
-            @Suppress("INVISIBLE_MEMBER")
+            @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
             val unwrappedCause = cause?.let { unwrap(it) }
             if (unwrappedCause == null) {
                 try {
diff --git a/reactive/kotlinx-coroutines-rx2/src/RxScheduler.kt b/reactive/kotlinx-coroutines-rx2/src/RxScheduler.kt
@@ -136,7 +136,7 @@ private fun CoroutineScope.scheduleTask(
     if (delayMillis <= 0) {
         toSchedule.run()
     } else {
-        @Suppress("INVISIBLE_MEMBER")
+        @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
         ctx.delay.invokeOnTimeout(delayMillis, toSchedule, ctx).let { handle = it }
     }
     return disposable
@@ -178,4 +178,4 @@ public class SchedulerCoroutineDispatcher(
 
     /** @suppress */
     override fun hashCode(): Int = System.identityHashCode(scheduler)
-}
+}
diff --git a/reactive/kotlinx-coroutines-rx3/src/RxObservable.kt b/reactive/kotlinx-coroutines-rx3/src/RxObservable.kt
@@ -70,7 +70,7 @@ private class RxObservableCoroutine<T : Any>(
     // Mutex is locked when either nRequested == 0 or while subscriber.onXXX is being invoked
     private val mutex: Mutex = Mutex()
 
-    @Suppress("UNCHECKED_CAST", "INVISIBLE_MEMBER")
+    @Suppress("UNCHECKED_CAST", "INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
     override val onSend: SelectClause2<T, SendChannel<T>> get() = SelectClause2Impl(
         clauseObject = this,
         regFunc = RxObservableCoroutine<*>::registerSelectForSend as RegistrationFunction,
@@ -165,7 +165,7 @@ private class RxObservableCoroutine<T : Any>(
             if (_signal.value == SIGNALLED)
                 return
             _signal.value = SIGNALLED // we'll signal onError/onCompleted (that the final state -- no CAS needed)
-            @Suppress("INVISIBLE_MEMBER")
+            @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
             val unwrappedCause = cause?.let { unwrap(it) }
             if (unwrappedCause == null) {
                 try {
diff --git a/reactive/kotlinx-coroutines-rx3/src/RxScheduler.kt b/reactive/kotlinx-coroutines-rx3/src/RxScheduler.kt
@@ -136,7 +136,7 @@ private fun CoroutineScope.scheduleTask(
     if (delayMillis <= 0) {
         toSchedule.run()
     } else {
-        @Suppress("INVISIBLE_MEMBER")
+        @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2
         ctx.delay.invokeOnTimeout(delayMillis, toSchedule, ctx).let { handle = it }
     }
     return disposable

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ internal object ExceptionCollector : AbstractCoroutineContextElement(CoroutineEx`
`81`	`81`	`return executedACallback`
`82`	`82`	`}`
`83`	`83`
`84`		`- @Suppress("INVISIBLE_MEMBER")`
	`84`	`+ @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2`
`85`	`85`	`override fun handleException(context: CoroutineContext, exception: Throwable) {`
`86`	`86`	`if (handleException(exception)) {`
`87`	`87`	`throw ExceptionSuccessfullyProcessed`
Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,9 @@ internal class TestMainDispatcher(delegate: CoroutineDispatcher):`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`-@Suppress("INVISIBLE_MEMBER")`
	`94`	`+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2`
`95`	`95`	`private val defaultDelay`
`96`	`96`	`inline get() = DefaultDelay`
`97`	`97`
`98`		`-@Suppress("INVISIBLE_MEMBER")`
	`98`	`+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") // do not remove the INVISIBLE_REFERENCE suppression: required in K2`
`99`	`99`	`internal expect fun Dispatchers.getTestMainDispatcher(): TestMainDispatcher`