Compiler&plugin deprecations cleanup: length, size, indices, tail and other collection operations.

This commit is contained in:
Ilya Gorbunov
2015-06-25 18:49:25 +03:00
parent f3a19ebe11
commit 32144257ec
23 changed files with 46 additions and 45 deletions
@@ -131,7 +131,7 @@ public class CapturedTypeApproximationTest() : JetLiteFixture() {
private fun getTestTypesForOneTypeVariable(): List<String> {
val typePatterns = getTypePatternsForOneTypeVariable()
val range = typePatterns.size().indices
val range = typePatterns.indices
val variants = ArrayList<List<Int>>()
for (i in range) variants.add(listOf(i))
for (i in range) for (j in range) variants.add(listOf(i, j))
@@ -152,7 +152,7 @@ public class CapturedTypeApproximationTest() : JetLiteFixture() {
private fun getTestTypesForTwoTypeVariables(): List<String> {
val typePatterns = getTypePatternsForOneTypeVariable()
val range = typePatterns.size().indices
val range = typePatterns.indices
val result = ArrayList<String>()
for (pattern in getTypePatternsForTwoTypeVariables()) {
for (i in range) {
@@ -66,10 +66,10 @@ public fun String.trimIndent(): String {
else {
if (!line.startsWith(trimmedPrefix)) {
throw IllegalArgumentException(
"""Invalid line "$line", ${trimmedPrefix.size} whitespace character are expected""")
"""Invalid line "$line", ${trimmedPrefix.length()} whitespace character are expected""")
}
line.substring(trimmedPrefix.length)
line.substring(trimmedPrefix.length())
}
}.joinToString(separator = "\n")
}
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
import org.jetbrains.kotlin.psi.JetCallableDeclaration
import org.jetbrains.kotlin.psi.JetDeclaration
import org.jetbrains.kotlin.utils.Printer
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.test.JetTestUtils.*
@@ -37,7 +38,7 @@ abstract class AbstractJetTypeBindingTest : JetLiteFixture() {
val analyzeResult = JvmResolveUtil.analyzeFilesWithJavaIntegration(getProject(), listOf(testKtFile))
val testDeclaration = testKtFile.getDeclarations().last!! as JetCallableDeclaration
val testDeclaration = testKtFile.getDeclarations().last()!! as JetCallableDeclaration
val typeBinding = testDeclaration.createTypeBindingForReturnType(analyzeResult.bindingContext)