Update kotlinx-coroutines-core/jvm/src/ThreadContextElement.kt

qwwdfsad · dkhalanskyjb · web-flow · commit 20bedf9314cb · 2022-04-01T19:37:33.000+03:00
Co-authored-by: dkhalanskyjb &lt;52952525+dkhalanskyjb@users.noreply.github.com&gt;
diff --git a/kotlinx-coroutines-core/jvm/src/ThreadContextElement.kt b/kotlinx-coroutines-core/jvm/src/ThreadContextElement.kt
@@ -155,8 +155,8 @@ public interface CopyableThreadContextElement<S> : ThreadContextElement<S> {
      * coroutine's context when the child coroutine's context contains an element with the same [key] as the
      * current one.
      *
-     * This function is called on current element, supplied with an element retrieved from child's
-     * coroutine context by the current [key].
+     * This method is invoked on the original element, accepting as the parameter
+     * the element that is supposed to overwrite it.
      */
     public fun mergeForChild(overwritingElement: CoroutineContext.Element): CoroutineContext
 }

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,8 @@ public interface CopyableThreadContextElement<S> : ThreadContextElement<S> {`
`155`	`155`	`* coroutine's context when the child coroutine's context contains an element with the same [key] as the`
`156`	`156`	`* current one.`
`157`	`157`	`*`
`158`		`- * This function is called on current element, supplied with an element retrieved from child's`
`159`		`- * coroutine context by the current [key].`
	`158`	`+ * This method is invoked on the original element, accepting as the parameter`
	`159`	`+ * the element that is supposed to overwrite it.`
`160`	`160`	`*/`
`161`	`161`	`public fun mergeForChild(overwritingElement: CoroutineContext.Element): CoroutineContext`
`162`	`162`	`}`