From 3aedf0d79f7ff5740884caab0995fa63c0c10048 Mon Sep 17 00:00:00 2001
From: shiraji <isogai.shiraji@gmail.com>
Date: Fri, 23 Sep 2016 13:33:58 +0900
Subject: [PATCH] Add intention to replace Math.max/min with
 coerceAtLeast/coerceAtMost #KT-13945 Fixed

---
 .../after.kt.template                         |  1 +
 .../before.kt.template                        |  1 +
 .../description.html                          |  5 ++
 .../after.kt.template                         |  1 +
 .../before.kt.template                        |  1 +
 .../description.html                          |  5 ++
 idea/src/META-INF/plugin.xml                  | 10 +++
 ...eplaceMathMaxWithCoerceAtLeastIntention.kt | 20 +++++
 ...MethodsWithKotlinNativeMethodsIntention.kt | 44 +++++++++
 ...ReplaceMathMinWithCoerceAtMostIntention.kt | 20 +++++
 .../ReplaceSingleLineLetIntention.kt          |  7 +-
 .../jetbrains/kotlin/idea/intentions/Utils.kt |  6 ++
 .../.intention                                |  1 +
 .../customMaxMethod.kt                        | 10 +++
 .../doubles.kt                                |  7 ++
 .../doubles.kt.after                          |  7 ++
 .../moreThan2ValueArg.kt                      |  9 ++
 .../noImport.kt                               |  5 ++
 .../noImport.kt.after                         |  5 ++
 .../oneValueArg.kt                            |  9 ++
 .../replaceMathMaxWithCoerceAtLeast/simple.kt |  7 ++
 .../simple.kt.after                           |  7 ++
 .../replaceMathMinWithCoerceAtMost/.intention |  1 +
 .../customMinMethod.kt                        | 10 +++
 .../replaceMathMinWithCoerceAtMost/doubles.kt |  7 ++
 .../doubles.kt.after                          |  7 ++
 .../moreThan2ValueArg.kt                      |  9 ++
 .../noImport.kt                               |  5 ++
 .../noImport.kt.after                         |  5 ++
 .../oneValueArg.kt                            |  9 ++
 .../replaceMathMinWithCoerceAtMost/simple.kt  |  7 ++
 .../simple.kt.after                           |  7 ++
 .../intentions/IntentionTestGenerated.java    | 90 +++++++++++++++++++
 33 files changed, 339 insertions(+), 6 deletions(-)
 create mode 100644 idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/after.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/before.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/description.html
 create mode 100644 idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/after.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/before.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/description.html
 create mode 100644 idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMaxWithCoerceAtLeastIntention.kt
 create mode 100644 idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMethodsWithKotlinNativeMethodsIntention.kt
 create mode 100644 idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMinWithCoerceAtMostIntention.kt
 create mode 100644 idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/.intention
 create mode 100644 idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/customMaxMethod.kt
 create mode 100644 idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/doubles.kt
 create mode 100644 idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/doubles.kt.after
 create mode 100644 idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/moreThan2ValueArg.kt
 create mode 100644 idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/noImport.kt
 create mode 100644 idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/noImport.kt.after
 create mode 100644 idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/oneValueArg.kt
 create mode 100644 idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/simple.kt
 create mode 100644 idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/simple.kt.after
 create mode 100644 idea/testData/intentions/replaceMathMinWithCoerceAtMost/.intention
 create mode 100644 idea/testData/intentions/replaceMathMinWithCoerceAtMost/customMinMethod.kt
 create mode 100644 idea/testData/intentions/replaceMathMinWithCoerceAtMost/doubles.kt
 create mode 100644 idea/testData/intentions/replaceMathMinWithCoerceAtMost/doubles.kt.after
 create mode 100644 idea/testData/intentions/replaceMathMinWithCoerceAtMost/moreThan2ValueArg.kt
 create mode 100644 idea/testData/intentions/replaceMathMinWithCoerceAtMost/noImport.kt
 create mode 100644 idea/testData/intentions/replaceMathMinWithCoerceAtMost/noImport.kt.after
 create mode 100644 idea/testData/intentions/replaceMathMinWithCoerceAtMost/oneValueArg.kt
 create mode 100644 idea/testData/intentions/replaceMathMinWithCoerceAtMost/simple.kt
 create mode 100644 idea/testData/intentions/replaceMathMinWithCoerceAtMost/simple.kt.after

diff --git a/idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/after.kt.template b/idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/after.kt.template
new file mode 100644
index 00000000000..517ba05ebe5
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/after.kt.template
@@ -0,0 +1 @@
+<spot>1.coerceAtLeast(2)</spot>
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/before.kt.template b/idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/before.kt.template
new file mode 100644
index 00000000000..12524d65bb3
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/before.kt.template
@@ -0,0 +1 @@
+<spot>Math.max(1, 2)</spot>
diff --git a/idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/description.html b/idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/description.html
new file mode 100644
index 00000000000..516a29dafd4
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ReplaceMathMaxWithCoerceAtLeastIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+    This intention replaces 'Math.max' calls with 'coerceAtLeast'
+</body>
+</html>
diff --git a/idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/after.kt.template b/idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/after.kt.template
new file mode 100644
index 00000000000..f8fde5d7fc0
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/after.kt.template
@@ -0,0 +1 @@
+<spot>1.coerceAtMost(2)</spot>
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/before.kt.template b/idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/before.kt.template
new file mode 100644
index 00000000000..cdc5686ecf9
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/before.kt.template
@@ -0,0 +1 @@
+<spot>Math.min(1, 2)</spot>
diff --git a/idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/description.html b/idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/description.html
new file mode 100644
index 00000000000..ca8649230c7
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ReplaceMathMinWithCoerceAtMostIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+    This intention replaces 'Math.min' calls with 'coerceAtMost'
+</body>
+</html>
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 0feb8f069ee..5a3edac338d 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1354,6 +1354,16 @@
       <category>Kotlin</category>
     </intentionAction>
 
+    <intentionAction>
+      <className>org.jetbrains.kotlin.idea.intentions.ReplaceMathMaxWithCoerceAtLeastIntention</className>
+      <category>Kotlin</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>org.jetbrains.kotlin.idea.intentions.ReplaceMathMinWithCoerceAtMostIntention</className>
+      <category>Kotlin</category>
+    </intentionAction>
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ObjectLiteralToLambdaInspection"
                      displayName="Object literal can be converted to lambda"
                      groupName="Kotlin"
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMaxWithCoerceAtLeastIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMaxWithCoerceAtLeastIntention.kt
new file mode 100644
index 00000000000..022e1cb767f
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMaxWithCoerceAtLeastIntention.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.intentions
+
+class ReplaceMathMaxWithCoerceAtLeastIntention() :
+        ReplaceMathMethodsWithKotlinNativeMethodsIntention("Replace Math.max with coerceAtLeast", "coerceAtLeast", "max")
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMethodsWithKotlinNativeMethodsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMethodsWithKotlinNativeMethodsIntention.kt
new file mode 100644
index 00000000000..f7b16364fc1
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMethodsWithKotlinNativeMethodsIntention.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.intentions
+
+import com.intellij.openapi.editor.Editor
+import org.jetbrains.kotlin.idea.core.replaced
+import org.jetbrains.kotlin.psi.KtCallExpression
+import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
+import org.jetbrains.kotlin.psi.KtPsiFactory
+import org.jetbrains.kotlin.psi.createExpressionByPattern
+import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
+
+abstract class ReplaceMathMethodsWithKotlinNativeMethodsIntention(
+        text: String, val replacedMethodName: String, val mathMethodName: String
+) : SelfTargetingOffsetIndependentIntention<KtCallExpression>(KtCallExpression::class.java, text) {
+
+    override fun applyTo(element: KtCallExpression, editor: Editor?) {
+        val target = element.getStrictParentOfType<KtDotQualifiedExpression>() ?: element
+        val valueArguments = element.valueArguments
+        val methodName = replacedMethodName
+        val newExpression = KtPsiFactory(element).createExpressionByPattern("$0.$methodName($1)",
+                                                                            valueArguments[0].text, valueArguments[1].text)
+        target.replaced(newExpression)
+    }
+
+    override fun isApplicableTo(element: KtCallExpression) =
+            element.calleeExpression?.text == mathMethodName &&
+            element.valueArguments.size == 2 &&
+            element.isMethodCall("java.lang.Math.${mathMethodName}")
+}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMinWithCoerceAtMostIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMinWithCoerceAtMostIntention.kt
new file mode 100644
index 00000000000..5f466e71e71
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMinWithCoerceAtMostIntention.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.intentions
+
+class ReplaceMathMinWithCoerceAtMostIntention :
+        ReplaceMathMethodsWithKotlinNativeMethodsIntention("Replace Math.min with coerceAtMost", "coerceAtMost", "min")
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceSingleLineLetIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceSingleLineLetIntention.kt
index 44566d6103f..35a8713b779 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceSingleLineLetIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceSingleLineLetIntention.kt
@@ -90,12 +90,7 @@ class ReplaceSingleLineLetIntention : SelfTargetingOffsetIndependentIntention<Kt
     }
 
     private fun isLetMethod(element: KtCallExpression) =
-            element.calleeExpression?.text == "let" && isMethodCall(element, "kotlin.let")
-
-    private fun isMethodCall(expression: KtExpression, fqMethodName: String): Boolean {
-        val resolvedCall = expression.getResolvedCall(expression.analyze()) ?: return false
-        return resolvedCall.resultingDescriptor.fqNameUnsafe.asString() == fqMethodName
-    }
+            element.calleeExpression?.text == "let" && element.isMethodCall("kotlin.let")
 
     private fun KtLambdaExpression.getParameterName(): String? {
         val parameters = valueParameters
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt
index 2c24454b6a0..d00332c1b9b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.psi.typeRefHelpers.setReceiverTypeReference
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
+import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.isFlexible
@@ -72,6 +73,11 @@ fun KtContainerNode.description(): String? {
     return null
 }
 
+fun KtCallExpression.isMethodCall(fqMethodName: String): Boolean {
+    val resolvedCall = this.getResolvedCall(this.analyze()) ?: return false
+    return resolvedCall.resultingDescriptor.fqNameUnsafe.asString() == fqMethodName
+}
+
 fun isAutoCreatedItUsage(expression: KtNameReferenceExpression): Boolean {
     if (expression.getReferencedName() != "it") return false
     val context = expression.analyze(BodyResolveMode.PARTIAL)
diff --git a/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/.intention b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/.intention
new file mode 100644
index 00000000000..122ef763e5d
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ReplaceMathMaxWithCoerceAtLeastIntention
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/customMaxMethod.kt b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/customMaxMethod.kt
new file mode 100644
index 00000000000..5a5b42c9e8b
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/customMaxMethod.kt
@@ -0,0 +1,10 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+
+fun foo() {
+    Math.max(1, 2)<caret>
+}
+
+object Math {
+    fun max(a: Int, b: Int) = 0
+}
diff --git a/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/doubles.kt b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/doubles.kt
new file mode 100644
index 00000000000..988be24442e
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/doubles.kt
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+import java.lang.Math.max
+
+fun foo() {
+    max(1.1, 1.2)<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/doubles.kt.after b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/doubles.kt.after
new file mode 100644
index 00000000000..f5df5c26201
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/doubles.kt.after
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+import java.lang.Math.max
+
+fun foo() {
+    1.1.coerceAtLeast(1.2)
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/moreThan2ValueArg.kt b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/moreThan2ValueArg.kt
new file mode 100644
index 00000000000..4cd0e0efa6b
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/moreThan2ValueArg.kt
@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun max(p0: Double, p1: Double): Double defined in java.lang.Math<br>public open fun max(p0: Float, p1: Float): Float defined in java.lang.Math<br>public open fun max(p0: Int, p1: Int): Int defined in java.lang.Math<br>public open fun max(p0: Long, p1: Long): Long defined in java.lang.Math
+
+import java.lang.Math.max
+
+fun foo() {
+    max(1.1, 1.2, 1.3)<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/noImport.kt b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/noImport.kt
new file mode 100644
index 00000000000..68a05d49418
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/noImport.kt
@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun foo() {
+    Math.max(2, 1)<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/noImport.kt.after b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/noImport.kt.after
new file mode 100644
index 00000000000..55c5baa66b1
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/noImport.kt.after
@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun foo() {
+    2.coerceAtLeast(1)
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/oneValueArg.kt b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/oneValueArg.kt
new file mode 100644
index 00000000000..0ce5d335cf5
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/oneValueArg.kt
@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun max(p0: Double, p1: Double): Double defined in java.lang.Math<br>public open fun max(p0: Float, p1: Float): Float defined in java.lang.Math<br>public open fun max(p0: Int, p1: Int): Int defined in java.lang.Math<br>public open fun max(p0: Long, p1: Long): Long defined in java.lang.Math
+
+import java.lang.Math.max
+
+fun foo() {
+    max(1.1)<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/simple.kt b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/simple.kt
new file mode 100644
index 00000000000..86540ae647f
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/simple.kt
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+import java.lang.Math.max
+
+fun foo() {
+    max(1, 2)<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/simple.kt.after b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/simple.kt.after
new file mode 100644
index 00000000000..f8631458189
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/simple.kt.after
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+import java.lang.Math.max
+
+fun foo() {
+    1.coerceAtLeast(2)
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMinWithCoerceAtMost/.intention b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/.intention
new file mode 100644
index 00000000000..fcc06d057f4
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ReplaceMathMinWithCoerceAtMostIntention
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMinWithCoerceAtMost/customMinMethod.kt b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/customMinMethod.kt
new file mode 100644
index 00000000000..fe831ae9cb6
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/customMinMethod.kt
@@ -0,0 +1,10 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+
+fun foo() {
+    Math.min(1, 2)<caret>
+}
+
+object Math {
+    fun min(a: Int, b: Int) = 0
+}
diff --git a/idea/testData/intentions/replaceMathMinWithCoerceAtMost/doubles.kt b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/doubles.kt
new file mode 100644
index 00000000000..45f308c0b4e
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/doubles.kt
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+import java.lang.Math.min
+
+fun foo() {
+    min(1.1, 1.2)<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMinWithCoerceAtMost/doubles.kt.after b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/doubles.kt.after
new file mode 100644
index 00000000000..279c32e840e
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/doubles.kt.after
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+import java.lang.Math.min
+
+fun foo() {
+    1.1.coerceAtMost(1.2)
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMinWithCoerceAtMost/moreThan2ValueArg.kt b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/moreThan2ValueArg.kt
new file mode 100644
index 00000000000..d3d74881b48
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/moreThan2ValueArg.kt
@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun min(p0: Double, p1: Double): Double defined in java.lang.Math<br>public open fun min(p0: Float, p1: Float): Float defined in java.lang.Math<br>public open fun min(p0: Int, p1: Int): Int defined in java.lang.Math<br>public open fun min(p0: Long, p1: Long): Long defined in java.lang.Math
+
+import java.lang.Math.min
+
+fun foo() {
+    min(1.1, 1.2, 1.3)<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMinWithCoerceAtMost/noImport.kt b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/noImport.kt
new file mode 100644
index 00000000000..5f520414b7b
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/noImport.kt
@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun foo() {
+    Math.min(2, 1)<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMinWithCoerceAtMost/noImport.kt.after b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/noImport.kt.after
new file mode 100644
index 00000000000..10f915aadec
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/noImport.kt.after
@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun foo() {
+    2.coerceAtMost(1)
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMinWithCoerceAtMost/oneValueArg.kt b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/oneValueArg.kt
new file mode 100644
index 00000000000..bfad8b0344a
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/oneValueArg.kt
@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun min(p0: Double, p1: Double): Double defined in java.lang.Math<br>public open fun min(p0: Float, p1: Float): Float defined in java.lang.Math<br>public open fun min(p0: Int, p1: Int): Int defined in java.lang.Math<br>public open fun min(p0: Long, p1: Long): Long defined in java.lang.Math
+
+import java.lang.Math.min
+
+fun foo() {
+    min(1.1)<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMinWithCoerceAtMost/simple.kt b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/simple.kt
new file mode 100644
index 00000000000..b4a3649f7fb
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/simple.kt
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+import java.lang.Math.min
+
+fun foo() {
+    min(1, 2)<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceMathMinWithCoerceAtMost/simple.kt.after b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/simple.kt.after
new file mode 100644
index 00000000000..79ee55d839a
--- /dev/null
+++ b/idea/testData/intentions/replaceMathMinWithCoerceAtMost/simple.kt.after
@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+import java.lang.Math.min
+
+fun foo() {
+    1.coerceAtMost(2)
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 70572bb0625..f668d9ddb7c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -10526,6 +10526,96 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
     }
 
+    @TestMetadata("idea/testData/intentions/replaceMathMaxWithCoerceAtLeast")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ReplaceMathMaxWithCoerceAtLeast extends AbstractIntentionTest {
+        public void testAllFilesPresentInReplaceMathMaxWithCoerceAtLeast() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceMathMaxWithCoerceAtLeast"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+        }
+
+        @TestMetadata("customMaxMethod.kt")
+        public void testCustomMaxMethod() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/customMaxMethod.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("doubles.kt")
+        public void testDoubles() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/doubles.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("moreThan2ValueArg.kt")
+        public void testMoreThan2ValueArg() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/moreThan2ValueArg.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("noImport.kt")
+        public void testNoImport() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/noImport.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("oneValueArg.kt")
+        public void testOneValueArg() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/oneValueArg.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/simple.kt");
+            doTest(fileName);
+        }
+    }
+
+    @TestMetadata("idea/testData/intentions/replaceMathMinWithCoerceAtMost")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ReplaceMathMinWithCoerceAtMost extends AbstractIntentionTest {
+        public void testAllFilesPresentInReplaceMathMinWithCoerceAtMost() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceMathMinWithCoerceAtMost"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+        }
+
+        @TestMetadata("customMinMethod.kt")
+        public void testCustomMinMethod() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMinWithCoerceAtMost/customMinMethod.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("doubles.kt")
+        public void testDoubles() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMinWithCoerceAtMost/doubles.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("moreThan2ValueArg.kt")
+        public void testMoreThan2ValueArg() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMinWithCoerceAtMost/moreThan2ValueArg.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("noImport.kt")
+        public void testNoImport() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMinWithCoerceAtMost/noImport.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("oneValueArg.kt")
+        public void testOneValueArg() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMinWithCoerceAtMost/oneValueArg.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceMathMinWithCoerceAtMost/simple.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("idea/testData/intentions/replaceRangeToWithUntil")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)