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

Fix "Should be replaced with Kotlin function" warnings

Browse Source
This commit is contained in:
Dmitry Gridin
2019-04-16 12:12:06 +07:00
parent d738a12b86
commit 3bed360c98
77 changed files with 161 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt
+1 -1
View File
@@ -48,7 +48,7 @@ class ConditionalJumpInstruction(
}
override val nextInstructions: Collection<Instruction>
get() = Arrays.asList(nextOnFalse, nextOnTrue)
get() = listOf(nextOnFalse, nextOnTrue)
override val inputValues: List<PseudoValue>
get() = listOfNotNull(conditionValue)
compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
+3 -2
View File
@@ -56,6 +56,7 @@ import org.jetbrains.kotlin.types.typeUtil.containsTypeAliasParameters
import org.jetbrains.kotlin.types.typeUtil.containsTypeAliases
import org.jetbrains.kotlin.types.typeUtil.isArrayOfNothing
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
import kotlin.math.min
class TypeResolver(
private val annotationResolver: AnnotationResolver,
@@ -699,7 +700,7 @@ class TypeResolver(
var wasStatic = false
val result = SmartList<KtTypeProjection>()
val classifierChainLastIndex = Math.min(classifierDescriptorChain.size, reversedQualifierParts.size) - 1
val classifierChainLastIndex = min(classifierDescriptorChain.size, reversedQualifierParts.size) - 1
for (index in 0..classifierChainLastIndex) {
val qualifierPart = reversedQualifierParts[index]
@@ -729,7 +730,7 @@ class TypeResolver(
val nonClassQualifierParts =
reversedQualifierParts.subList(
Math.min(classifierChainLastIndex + 1, reversedQualifierParts.size),
min(classifierChainLastIndex + 1, reversedQualifierParts.size),
reversedQualifierParts.size
)
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt
+3 -2
View File
@@ -45,6 +45,7 @@ import org.jetbrains.kotlin.types.expressions.DoubleColonExpressionResolver
import org.jetbrains.kotlin.types.typeUtil.containsTypeProjectionsInTopLevelArguments
import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
import java.util.*
import kotlin.math.min
class CandidateResolver(
private val argumentTypeResolver: ArgumentTypeResolver,
@@ -591,7 +592,7 @@ class CandidateResolver(
}
val typeParameters = functionDescriptor.typeParameters
for (i in 0..Math.min(typeParameters.size, ktTypeArguments.size) - 1) {
for (i in 0..min(typeParameters.size, ktTypeArguments.size) - 1) {
val typeParameterDescriptor = typeParameters[i]
val typeArgument = typeArguments[i]
val typeReference = ktTypeArguments[i].typeReference
@@ -686,7 +687,7 @@ class CandidateResolver(
// TODO do not perform substitution for type arguments multiple times
val substitutedTypeArguments = typeAliasParametersSubstitutor.safeSubstitute(unsubstitutedType, Variance.INVARIANT).arguments
for (i in 0..Math.min(typeParameters.size, substitutedTypeArguments.size) - 1) {
for (i in 0..min(typeParameters.size, substitutedTypeArguments.size) - 1) {
val substitutedTypeProjection = substitutedTypeArguments[i]
if (substitutedTypeProjection.isStarProjection) continue