azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ReplaceMathMaxWithCoerceAtLeastIntention & ReplaceMathMinWithCoerceAtMostIntention with ReplaceJavaStaticMethodWithKotlinAnalogInspection

Browse Source 
Relates to #KT-31502
This commit is contained in:
Dmitry Gridin
2019-05-27 18:01:53 +07:00
parent 26478b1374
commit d3339cae46
51 changed files with 36 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.ReplaceMathMaxWithCoerceAtLeastIntention
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/KT-19232-1.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.max
fun foo() {
Pair(<caret>max(1, 3), max(2, 4)).let { println(it) }
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/KT-19232-1.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.max
fun foo() {
Pair(<caret>1.coerceAtLeast(3), max(2, 4)).let { println(it) }
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/KT-19232-2.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo() {
Pair(Math.max(1, 3)<caret>, Math.max(2, 4)).let { println(it) }
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/KT-19232-2.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo() {
Pair(1.coerceAtLeast(3)<caret>, Math.max(2, 4)).let { println(it) }
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/customMaxMethod.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// WITH_RUNTIME
// IS_APPLICABLE: false
fun foo() {
Math.max(1, 2)<caret>
}
object Math {
fun max(a: Int, b: Int) = 0
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/doubles.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.max
fun foo() {
max(1.1, 1.2)<caret>
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/doubles.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.max
fun foo() {
1.1.coerceAtLeast(1.2)
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/maxInMax.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.max
fun foo() {
Math.max(max(1, 3)<caret>, max(2, 4))
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/maxInMax.kt.after
Vendored
-6
View File
@@ -1,6 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.max
fun foo() {
Math.max(1.coerceAtLeast(3), max(2, 4))
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/moreThan2ValueArg.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// WITH_RUNTIME
// IS_APPLICABLE: false
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun max(a: Double, b: Double): Double defined in java.lang.Math<br>public open fun max(a: Float, b: Float): Float defined in java.lang.Math<br>public open fun max(a: Int, b: Int): Int defined in java.lang.Math<br>public open fun max(a: Long, b: Long): Long defined in java.lang.Math
import java.lang.Math.max
fun foo() {
max(1.1, 1.2, 1.3)<caret>
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/noImport.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo() {
Math.max(2, 1)<caret>
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/noImport.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo() {
2.coerceAtLeast(1)
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/oneValueArg.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// WITH_RUNTIME
// IS_APPLICABLE: false
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun max(a: Double, b: Double): Double defined in java.lang.Math<br>public open fun max(a: Float, b: Float): Float defined in java.lang.Math<br>public open fun max(a: Int, b: Int): Int defined in java.lang.Math<br>public open fun max(a: Long, b: Long): Long defined in java.lang.Math
import java.lang.Math.max
fun foo() {
max(1.1)<caret>
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/simple.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.max
fun foo() {
max(1, 2)<caret>
}
idea/testData/intentions/replaceMathMaxWithCoerceAtLeast/simple.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.max
fun foo() {
1.coerceAtLeast(2)
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.ReplaceMathMinWithCoerceAtMostIntention
idea/testData/intentions/replaceMathMinWithCoerceAtMost/KT-19232-1.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.min
fun foo() {
Pair(<caret>min(1, 3), min(2, 4)).let { println(it) }
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/KT-19232-1.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.min
fun foo() {
Pair(<caret>1.coerceAtMost(3), min(2, 4)).let { println(it) }
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/KT-19232-2.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo() {
Pair(Math.min(1, 3)<caret>, Math.min(2, 4)).let { println(it) }
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/KT-19232-2.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo() {
Pair(1.coerceAtMost(3)<caret>, Math.min(2, 4)).let { println(it) }
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/customMinMethod.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// WITH_RUNTIME
// IS_APPLICABLE: false
fun foo() {
Math.min(1, 2)<caret>
}
object Math {
fun min(a: Int, b: Int) = 0
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/doubles.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.min
fun foo() {
min(1.1, 1.2)<caret>
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/doubles.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.min
fun foo() {
1.1.coerceAtMost(1.2)
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/moreThan2ValueArg.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// WITH_RUNTIME
// IS_APPLICABLE: false
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun min(a: Double, b: Double): Double defined in java.lang.Math<br>public open fun min(a: Float, b: Float): Float defined in java.lang.Math<br>public open fun min(a: Int, b: Int): Int defined in java.lang.Math<br>public open fun min(a: Long, b: Long): Long defined in java.lang.Math
import java.lang.Math.min
fun foo() {
min(1.1, 1.2, 1.3)<caret>
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/noImport.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo() {
Math.min(2, 1)<caret>
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/noImport.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun foo() {
2.coerceAtMost(1)
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/oneValueArg.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// WITH_RUNTIME
// IS_APPLICABLE: false
// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun min(a: Double, b: Double): Double defined in java.lang.Math<br>public open fun min(a: Float, b: Float): Float defined in java.lang.Math<br>public open fun min(a: Int, b: Int): Int defined in java.lang.Math<br>public open fun min(a: Long, b: Long): Long defined in java.lang.Math
import java.lang.Math.min
fun foo() {
min(1.1)<caret>
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/simple.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.min
fun foo() {
min(1, 2)<caret>
}
idea/testData/intentions/replaceMathMinWithCoerceAtMost/simple.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
import java.lang.Math.min
fun foo() {
1.coerceAtMost(2)
}