From 738219d53e12a30cd40540236fa2b0bbdc408419 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 17 May 2016 19:28:30 +0300
Subject: [PATCH] Make Map.toSortedMap accept Map out-projected by key type as
 the receiver. Update related completion testData.

---
 .../testData/basic/java/ExtensionFromStandardLibrary.kt       | 4 ++--
 libraries/stdlib/src/kotlin/collections/MapsJVM.kt            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt b/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt
index b03a4ce51c2..c46a2d2c944 100644
--- a/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt
+++ b/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt
@@ -8,6 +8,6 @@ fun firstFun() {
 }
 
 // INVOCATION_COUNT: 1
-// EXIST: { lookupString:"toSortedMap", itemText:"toSortedMap", tailText:"() for Map<K, V> in kotlin.collections" }
-// EXIST: { lookupString:"toSortedMap", itemText:"toSortedMap", tailText:"(comparator: Comparator<in Int>) for Map<K, V> in kotlin.collections" }
+// EXIST: { lookupString:"toSortedMap", itemText:"toSortedMap", tailText:"() for Map<out K, V> in kotlin.collections" }
+// EXIST: { lookupString:"toSortedMap", itemText:"toSortedMap", tailText:"(comparator: Comparator<in Int>) for Map<out K, V> in kotlin.collections" }
 // NOTHING_ELSE
diff --git a/libraries/stdlib/src/kotlin/collections/MapsJVM.kt b/libraries/stdlib/src/kotlin/collections/MapsJVM.kt
index 52d7e79d1a7..ef01623f745 100644
--- a/libraries/stdlib/src/kotlin/collections/MapsJVM.kt
+++ b/libraries/stdlib/src/kotlin/collections/MapsJVM.kt
@@ -41,7 +41,7 @@ public inline fun <K, V> ConcurrentMap<K, V>.getOrPut(key: K, defaultValue: () -
  *
  * @sample test.collections.MapJVMTest.toSortedMap
  */
-public fun <K : Comparable<K>, V> Map<K, V>.toSortedMap(): SortedMap<K, V> = TreeMap(this)
+public fun <K : Comparable<K>, V> Map<out K, V>.toSortedMap(): SortedMap<K, V> = TreeMap(this)
 
 /**
  * Converts this [Map] to a [SortedMap] using the given [comparator] so that iteration order will be in the order
@@ -49,7 +49,7 @@ public fun <K : Comparable<K>, V> Map<K, V>.toSortedMap(): SortedMap<K, V> = Tre
  *
  * @sample test.collections.MapJVMTest.toSortedMapWithComparator
  */
-public fun <K, V> Map<K, V>.toSortedMap(comparator: Comparator<in K>): SortedMap<K, V>
+public fun <K, V> Map<out K, V>.toSortedMap(comparator: Comparator<in K>): SortedMap<K, V>
         = TreeMap<K, V>(comparator).apply { putAll(this@toSortedMap) }
 
 /**