From 3a1ed41436281ba0a8dd312794b4ca8989476a59 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 18 Jan 2017 21:16:49 +0300
Subject: [PATCH] Create deprecated MutableList.sort extensions to guide how to
 replace them. #KT-15790 Fixed

---
 .../testsWithJava8/targetedBuiltIns/blackListed.kt | 14 ++++++++++----
 .../targetedBuiltIns/blackListed.txt               |  1 +
 .../src/kotlin/collections/MutableCollections.kt   | 10 ++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.kt b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.kt
index 89672092620..a280687db33 100644
--- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.kt
+++ b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.kt
@@ -5,9 +5,15 @@ abstract class A : MutableList<String> {
 }
 
 fun foo(x: MutableList<String>, y: java.util.ArrayList<String>, z: A, p: java.util.Comparator<in String>) {
-    // Resolved to extension with no parameters
-    x.sort(<!TOO_MANY_ARGUMENTS!>p<!>)
-    y.sort(<!TOO_MANY_ARGUMENTS!>p<!>)
+    x.<!DEPRECATION_ERROR!>sort<!>(p)
+    y.<!DEPRECATION_ERROR!>sort<!>(p)
 
-    z.sort(<!TOO_MANY_ARGUMENTS!>p<!>)
+    z.<!DEPRECATION_ERROR!>sort<!>(p)
+}
+
+fun bar(x: MutableList<String>, y: java.util.ArrayList<String>, z: A) {
+    x.<!DEPRECATION_ERROR!>sort<!> { a, b -> a.length - b.length }
+    y.<!DEPRECATION_ERROR!>sort<!> { a, b -> a.length - b.length }
+
+    z.<!DEPRECATION_ERROR!>sort<!> { a, b -> a.length - b.length }
 }
diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.txt b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.txt
index bd546a2c88e..4ccb7b18290 100644
--- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.txt
+++ b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/blackListed.txt
@@ -1,5 +1,6 @@
 package
 
+public fun bar(/*0*/ x: kotlin.collections.MutableList<kotlin.String>, /*1*/ y: java.util.ArrayList<kotlin.String>, /*2*/ z: A): kotlin.Unit
 public fun foo(/*0*/ x: kotlin.collections.MutableList<kotlin.String>, /*1*/ y: java.util.ArrayList<kotlin.String>, /*2*/ z: A, /*3*/ p: java.util.Comparator<in kotlin.String>): kotlin.Unit
 
 public abstract class A : kotlin.collections.MutableList<kotlin.String> {
diff --git a/libraries/stdlib/src/kotlin/collections/MutableCollections.kt b/libraries/stdlib/src/kotlin/collections/MutableCollections.kt
index 195dad391c9..5a1ae81c045 100644
--- a/libraries/stdlib/src/kotlin/collections/MutableCollections.kt
+++ b/libraries/stdlib/src/kotlin/collections/MutableCollections.kt
@@ -45,6 +45,16 @@ public inline fun <@kotlin.internal.OnlyInputTypes T> MutableCollection<out T>.r
 @kotlin.internal.InlineOnly
 public inline fun <T> MutableList<T>.remove(index: Int): T = removeAt(index)
 
+@Deprecated("Use sortWith(comparator) instead.", ReplaceWith("this.sortWith(comparator)"), level = DeprecationLevel.ERROR)
+@JvmVersion
+@kotlin.internal.InlineOnly
+public inline fun <T> MutableList<T>.sort(comparator: Comparator<in T>): Unit = throw NotImplementedError()
+
+@Deprecated("Use sortWith(Comparator(comparison)) instead.", ReplaceWith("this.sortWith(Comparator(comparison))"), level = DeprecationLevel.ERROR)
+@JvmVersion
+@kotlin.internal.InlineOnly
+public inline fun <T> MutableList<T>.sort(comparison: (T, T) -> Int): Unit = throw NotImplementedError()
+
 /**
  * Adds the specified [element] to this mutable collection.
  */