Stop using deprecated APIs

2014-12-02 15:41:22 +03:00
parent 2b8ffeda28
commit be717f48f8
45 changed files with 111 additions and 112 deletions
@@ -109,7 +109,7 @@ private fun <Function : FunctionHandle> findConcreteSuperDeclaration(function: F
    result.removeAll(toRemove)

    val concreteRelevantDeclarations = result.filter { !it.isAbstract }
-    if (concreteRelevantDeclarations.size != 1) {
+    if (concreteRelevantDeclarations.size() != 1) {
        error("Concrete fake override $function should have exactly one concrete super-declaration: $concreteRelevantDeclarations")
    }

@@ -62,7 +62,7 @@ public object CodegenUtilKt {
                                        (listOf(it) + DescriptorUtils.getAllOverriddenDescriptors(it)).map { it.getOriginal() }.contains(overriddenDescriptor.getOriginal())
                                    }
                        }
-                assert(actualDelegates.size <= 1) { "Meny delegates found for $delegatingMember: $actualDelegates" }
+                assert(actualDelegates.size() <= 1) { "Meny delegates found for $delegatingMember: $actualDelegates" }

                actualDelegates.firstOrNull()
            }
@@ -24,7 +24,7 @@ public trait OutputFileCollection {
 }

 public class SimpleOutputFileCollection(private val outputFiles: List<OutputFile>) : OutputFileCollection {
-    override fun get(relativePath: String): OutputFile? = outputFiles.find { it.relativePath == relativePath }
+    override fun get(relativePath: String): OutputFile? = outputFiles.firstOrNull { it.relativePath == relativePath }
    override fun asList(): List<OutputFile> = outputFiles
 }

@@ -183,7 +183,7 @@ class CollectionStubMethodGenerator(
    private fun Collection<JetType>.findMostSpecificTypeForClass(klass: ClassDescriptor): JetType {
        val types = this.filter { it.getConstructor().getDeclarationDescriptor() == klass }
        if (types.isEmpty()) error("No supertype of $klass in $this")
-        if (types.size == 1) return types.first()
+        if (types.size() == 1) return types.first()
        // Find the first type in the list such that it's a subtype of every other type in that list
        return types.first { type ->
            types.all { other -> JetTypeChecker.DEFAULT.isSubtypeOf(type, other) }
@@ -76,7 +76,7 @@ public abstract class SignatureCollectingClassBuilderFactory(
        override fun done() {
            var hasDuplicateSignatures = false
            for ((signature, elementsAndDescriptors) in signatures.entrySet()!!) {
-                if (elementsAndDescriptors.size == 1) continue // no clash
+                if (elementsAndDescriptors.size() == 1) continue // no clash
                handleClashingSignatures(ConflictingJvmDeclarationsData(
                        classInternalName,
                        classCreatedFor,
@@ -120,7 +120,7 @@ private class StoredStackValuesDescriptor(
        alreadyStoredValuesCount: Int
 ) {
    val nextFreeVarIndex : Int get() = firstVariableIndex + storedStackSize
-    val storedValuesCount: Int get() = values.size
+    val storedValuesCount: Int get() = values.size()
    val isStored: Boolean get() = storedValuesCount > 0
    val totalValuesCountOnStackBeforeInline = alreadyStoredValuesCount + storedValuesCount
 }
@@ -59,7 +59,7 @@ class UnreachableCodeImpl(
        acceptChildren(object : PsiElementVisitor() {
            override fun visitElement(element: PsiElement) {
                val isReachable = element is JetElement && reachableElements.contains(element) && !element.hasChildrenInSet(unreachableElements)
-                if (isReachable || element.getChildren().size == 0) {
+                if (isReachable || element.getChildren().size() == 0) {
                    children.add(element)
                }
                else {
@@ -59,14 +59,14 @@ public object AllTypes : TypePredicate {

 // todo: simplify computed type predicate when possible
 public fun and(predicates: Collection<TypePredicate>): TypePredicate =
-        when (predicates.size) {
+        when (predicates.size()) {
            0 -> AllTypes
            1 -> predicates.first()
            else -> ForAllTypes(predicates.toList())
        }

 public fun or(predicates: Collection<TypePredicate>): TypePredicate? =
-        when (predicates.size) {
+        when (predicates.size()) {
            0 -> null
            1 -> predicates.first()
            else -> ForSomeType(predicates.toList())
@@ -68,7 +68,7 @@ public class ReadValueInstruction private (
    }

    override fun toString(): String {
-        val inVal = if (receiverValues.empty) "" else "|${receiverValues.keySet().joinToString()}"
+        val inVal = if (receiverValues.isEmpty()) "" else "|${receiverValues.keySet().joinToString()}"
        return "r(${render(element)}$inVal) -> $outputValue"
    }

@@ -41,7 +41,7 @@ public abstract class OperationInstruction protected(

    protected fun renderInstruction(name: String, desc: String): String =
            "$name($desc" +
-            (if (inputValues.notEmpty) "|${inputValues.joinToString(", ")})" else ")") +
+            (if (inputValues.isNotEmpty()) "|${inputValues.joinToString(", ")})" else ")") +
            (if (resultValue != null) " -> $resultValue" else "")

    protected fun setResult(value: PseudoValue?): OperationInstruction {
@@ -366,7 +366,7 @@ public class ConstantExpressionEvaluator private (val trace: BindingTrace) : Jet

        // array()
        if (CompileTimeConstantUtils.isArrayMethodCall(call)) {
-            val varargType = resultingDescriptor.getValueParameters().first?.getVarargElementType()!!
+            val varargType = resultingDescriptor.getValueParameters().first().getVarargElementType()!!

            val arguments = call.getValueArguments().values().flatMap { resolveArguments(it.getArguments(), varargType) }
            return ArrayValue(arguments, resultingDescriptor.getReturnType()!!, true, arguments.any() { it.usesVariableAsConstant() })
@@ -427,7 +427,7 @@ public class ConstantExpressionEvaluator private (val trace: BindingTrace) : Jet
        if (argumentCompileTimeType == null) return null

        val arguments = argument.getArguments()
-        if (arguments.size != 1) return null
+        if (arguments.size() != 1) return null

        val argumentExpression = arguments.first().getArgumentExpression()
        if (argumentExpression == null) return null
@@ -61,7 +61,7 @@ object PrecedingDocCommentsBinder : WhitespacesAndCommentsBinder {
            if (tokens[idx] == JetTokens.DOC_COMMENT) return idx
        }

-        return tokens.size
+        return tokens.size()
    }
 }

@@ -61,7 +61,7 @@ import org.jetbrains.jet.lang.psi.JetDynamicType
 // invoke this instead of getText() when you need debug text to identify some place in PSI without storing the element itself
 // this is need to avoid unnecessary file parses
 // this defaults to get text if the element is not stubbed
-public fun JetElement.getDebugText(): String? {
+public fun JetElement.getDebugText(): String {
    if (this !is JetElementImplStub<*> || this.getStub() == null) {
        return getText()
    }
@@ -329,12 +329,12 @@ private object DebugTextBuildingVisitor : JetVisitor<String, Unit>() {

    fun renderChildren(element: JetElementImplStub<*>, separator: String, prefix: String = "", postfix: String = ""): String? {
        val childrenTexts = element.getStub()?.getChildrenStubs()?.map { (it?.getPsi() as? JetElement)?.getDebugText() }
-        return childrenTexts?.filterNotNull()?.makeString(separator, prefix, postfix) ?: element.getText()
+        return childrenTexts?.filterNotNull()?.join(separator, prefix, postfix) ?: element.getText()
    }

    fun render(element: JetElementImplStub<*>, vararg relevantChildren: JetElement?): String? {
        if (element.getStub() == null) return element.getText()
-        return relevantChildren.filterNotNull().map { it.getDebugText() }.makeString("", "", "")
+        return relevantChildren.filterNotNull().map { it.getDebugText() }.join("", "", "")
    }
 }

@@ -92,7 +92,7 @@ public abstract class JetCodeFragment(
    }

    override fun importsToString(): String {
-        return myImports.joinToString(IMPORT_SEPARATOR)
+        return myImports.join(IMPORT_SEPARATOR)
    }

    override fun addImportsFromString(imports: String?) {
@@ -102,7 +102,7 @@ public abstract class JetCodeFragment(
    }

    public fun importsAsImportList(): JetImportList? {
-        return JetPsiFactory(this).createFile(myImports.joinToString("\n")).getImportList()
+        return JetPsiFactory(this).createFile(myImports.join("\n")).getImportList()
    }

    override fun setVisibilityChecker(checker: JavaCodeFragment.VisibilityChecker?) { }
@@ -129,7 +129,7 @@ public abstract class JetCodeFragment(

            return containingFile.getImportList()?.getImports()
                        ?.map { it.getText() }
-                        ?.joinToString(JetCodeFragment.IMPORT_SEPARATOR) ?: ""
+                        ?.join(JetCodeFragment.IMPORT_SEPARATOR) ?: ""
        }
    }
 }
@@ -219,7 +219,7 @@ public class JetPsiFactory(private val project: Project) {
    }

    public fun createAnonymousInitializer(): JetClassInitializer {
-        return createClass("class A { {} }").getAnonymousInitializers().first!!
+        return createClass("class A { {} }").getAnonymousInitializers().first()
    }

    public fun createEmptyClassBody(): JetClassBody {
@@ -35,7 +35,7 @@ public open class KotlinStubBaseImpl<T : JetElementImplStub<*>>(parent: StubElem
        if (propertiesValues.isEmpty()) {
            return ""
        }
-        return propertiesValues.makeString(separator = ", ", prefix = "[", postfix = "]")
+        return propertiesValues.join(separator = ", ", prefix = "[", postfix = "]")
    }

    private fun renderPropertyValues(stubInterface: Class<out Any?>): List<String> {
@@ -30,7 +30,7 @@ public class CompositeBindingContext private (
    class object {
        public fun create(delegates: List<BindingContext>): BindingContext {
            if (delegates.isEmpty()) return BindingContext.EMPTY
-            if (delegates.size == 1) return delegates.first()
+            if (delegates.size() == 1) return delegates.first()
            return CompositeBindingContext(delegates)
        }
    }
@@ -52,7 +52,7 @@ public class ResolutionTaskHolder<D : CallableDescriptor, F : D>(
        if (internalTasks == null) {
            val tasks = ArrayList<ResolutionTask<D, F>>()
            for (priority in (0..priorityProvider.getMaxPriority()).reversed()) {
-                for (candidateIndex in 0..candidatesList.size - 1) {
+                for (candidateIndex in candidatesList.indices) {
                    val lazyCandidates = {
                        candidatesList[candidateIndex]().filter { priorityProvider.getPriority(it) == priority }.toReadOnlyList()
                    }
@@ -211,7 +211,7 @@ public open class LazyClassMemberScope(resolveSession: ResolveSession,
        val valueParameterDescriptors = primaryConstructor.getValueParameters()
        val primaryConstructorParameters = classInfo.getPrimaryConstructorParameters()
        assert(valueParameterDescriptors.size() == primaryConstructorParameters.size()) {
-            "From descriptor: ${valueParameterDescriptors.size} but from PSI: ${primaryConstructorParameters.size}"
+            "From descriptor: ${valueParameterDescriptors.size()} but from PSI: ${primaryConstructorParameters.size()}"
        }

        for (valueParameterDescriptor in valueParameterDescriptors) {
@@ -104,7 +104,7 @@ class FilteredJvmDiagnostics(val jvmDiagnostics: Diagnostics, val otherDiagnosti
            it.data().signature.name
        }.forEach {
            val diagnostics = it.getValue()
-            if (diagnostics.size <= 1) {
+            if (diagnostics.size() <= 1) {
                filtered.addAll(diagnostics)
            }
            else {