diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt index f364e8e9fe1..efc62cba4db 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt @@ -6,11 +6,15 @@ package org.jetbrains.kotlin.checkers.diagnostics import com.intellij.openapi.util.text.StringUtil +import com.intellij.psi.PsiElement import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.checkers.diagnostics.factories.DebugInfoDiagnosticFactory1 import org.jetbrains.kotlin.checkers.utils.CheckerTestUtil +import org.jetbrains.kotlin.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1 import org.jetbrains.kotlin.diagnostics.rendering.AbstractDiagnosticWithParametersRenderer import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages +import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticRenderer import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticWithParameters1Renderer import org.jetbrains.kotlin.diagnostics.rendering.Renderers.TO_STRING import java.util.regex.Pattern @@ -136,7 +140,7 @@ class TextDiagnostic( private fun asTextDiagnostic(actualDiagnostic: ActualDiagnostic): TextDiagnostic { val diagnostic = actualDiagnostic.diagnostic val renderer = when (diagnostic.factory) { - is DebugInfoDiagnosticFactory1 -> DiagnosticWithParameters1Renderer("{0}", TO_STRING) + is DebugInfoDiagnosticFactory1 -> DiagnosticWithParameters1Renderer("{0}", TO_STRING) as DiagnosticRenderer else -> DefaultErrorMessages.getRendererForDiagnostic(diagnostic) } val diagnosticName = actualDiagnostic.name diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinResolutionCallbacksImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinResolutionCallbacksImpl.kt index 689d76b9c53..45e5591c4e5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinResolutionCallbacksImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinResolutionCallbacksImpl.kt @@ -205,7 +205,9 @@ class KotlinResolutionCallbacksImpl( } override fun bindStubResolvedCallForCandidate(candidate: ResolvedCallAtom) { - kotlinToResolvedCallTransformer.createStubResolvedCallAndWriteItToTrace(candidate, trace, emptyList(), substitutor = null) + kotlinToResolvedCallTransformer.createStubResolvedCallAndWriteItToTrace( + candidate, trace, emptyList(), substitutor = null + ) } override fun createReceiverWithSmartCastInfo(resolvedAtom: ResolvedCallAtom): ReceiverValueWithSmartCastInfo? { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt index bc004251dd5..2eab59ff988 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt @@ -108,7 +108,7 @@ class KotlinToResolvedCallTransformer( val resultSubstitutor = baseResolvedCall.constraintSystem.buildResultingSubstitutor() if (context.inferenceSession.writeOnlyStubs()) { - val stub = createStubResolvedCallAndWriteItToTrace( + val stub = createStubResolvedCallAndWriteItToTrace( candidate, context.trace, baseResolvedCall.diagnostics, diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt index 3268afa7ab3..144c31ab227 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt @@ -261,7 +261,7 @@ open class WrappedTypeParameterDescriptor( override val supertypeLoopChecker = SupertypeLoopChecker.EMPTY - override fun getParameters() = emptyList() + override fun getParameters(): List = emptyList() override fun isFinal() = false @@ -687,7 +687,7 @@ open class WrappedEnumEntryDescriptor( TODO("not implemented") } - override fun getDeclaredTypeParameters() = emptyList() + override fun getDeclaredTypeParameters(): List = emptyList() override fun getSealedSubclasses(): Collection { TODO("not implemented") @@ -773,7 +773,7 @@ open class WrappedPropertyDescriptor( owner.setter?.descriptor as? PropertyAccessorDescriptor ).toMutableList() - override fun getTypeParameters() = emptyList() + override fun getTypeParameters(): List = emptyList() override fun getVisibility() = owner.visibility @@ -877,7 +877,7 @@ open class WrappedFieldDescriptor( override fun getAccessors(): MutableList = mutableListOf() - override fun getTypeParameters() = emptyList() + override fun getTypeParameters(): List = emptyList() override fun getVisibility() = owner.visibility diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt index e6670a61375..47f15d91c79 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid import org.jetbrains.kotlin.name.Name -val jvmDefaultArgumentStubPhase = makeIrFilePhase( +val jvmDefaultArgumentStubPhase = makeIrFilePhase( { context -> DefaultArgumentStubGenerator(context, false) }, name = "DefaultArgumentsStubGenerator", description = "Generate synthetic stubs for functions with default parameter values" diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InitializersLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InitializersLowering.kt index 84f03f1edb0..f925b2fe376 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InitializersLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InitializersLowering.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.name.Name object SYNTHESIZED_INIT_BLOCK: IrStatementOriginImpl("SYNTHESIZED_INIT_BLOCK") -fun makeInitializersPhase(origin: IrDeclarationOrigin, clinitNeeded: Boolean)= makeIrFilePhase( +fun makeInitializersPhase(origin: IrDeclarationOrigin, clinitNeeded: Boolean)= makeIrFilePhase( { context -> InitializersLowering(context, origin, clinitNeeded) }, name = "Initializers", description = "Handle initializer statements", diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt index 7e1d62f83d4..d535b710cd7 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.backend.common.lower import org.jetbrains.kotlin.backend.common.BackendContext +import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.DeclarationContainerLoweringPass import org.jetbrains.kotlin.backend.common.descriptors.* import org.jetbrains.kotlin.backend.common.ir.copyTo @@ -34,7 +35,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.NameUtils import java.util.* -val jvmLocalDeclarationsPhase = makeIrFilePhase( +val jvmLocalDeclarationsPhase = makeIrFilePhase( { context -> LocalDeclarationsLowering(context, object : LocalNameProvider { override fun localName(declaration: IrDeclarationWithName): String = diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/VarargLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/VarargLowering.kt index 296b32106f2..fb27dec9836 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/VarargLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/VarargLowering.kt @@ -114,7 +114,7 @@ private class VarargTransformer( // empty vararg => empty array literal if (segments.isEmpty()) { - return emptyList().toArrayLiteral(primitiveExpressionType, primitiveElementType) + return emptyList().toArrayLiteral(primitiveExpressionType, primitiveElementType) } // vararg with a single segment => no need to concatenate @@ -173,7 +173,7 @@ private class VarargTransformer( val argument = expression.getValueArgument(i) val parameter = expression.symbol.owner.valueParameters[i] if (argument == null && parameter.varargElementType != null) { - expression.putValueArgument(i, emptyList().toArrayLiteral(parameter.type, parameter.varargElementType!!)) + expression.putValueArgument(i, emptyList().toArrayLiteral(parameter.type, parameter.varargElementType!!)) } } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt index 2a8e3829ac1..e3e299eb18f 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt @@ -44,7 +44,7 @@ private val expectDeclarationsRemovingPhase = makeIrFilePhase( description = "Remove expect declaration from module fragment" ) -private val propertiesPhase = makeIrFilePhase( +private val propertiesPhase = makeIrFilePhase( { context -> PropertiesLowering(context, JvmLoweredDeclarationOrigin.SYNTHETIC_METHOD_FOR_PROPERTY_ANNOTATIONS) { propertyName -> JvmAbi.getSyntheticMethodNameForAnnotatedProperty(propertyName) @@ -55,7 +55,7 @@ private val propertiesPhase = makeIrFilePhase( stickyPostconditions = setOf((PropertiesLowering)::checkNoProperties) ) -val jvmPhases = namedIrFilePhase( +val jvmPhases = namedIrFilePhase( name = "IrLowering", description = "IR lowering", lower = expectDeclarationsRemovingPhase then diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CallableReferenceLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CallableReferenceLowering.kt index d9c6a64878f..3440eb134c0 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CallableReferenceLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CallableReferenceLowering.kt @@ -58,7 +58,7 @@ import org.jetbrains.org.objectweb.asm.Type //Hack implementation to support CR java types in lower class CrIrType(val type: Type) : IrType { - override val annotations = emptyList() + override val annotations: List = emptyList() override fun equals(other: Any?): Boolean = other is CrIrType && type == other.type diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SingletonReferencesLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SingletonReferencesLowering.kt index 2c476e5cded..0924e663a50 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SingletonReferencesLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SingletonReferencesLowering.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.backend.common.push import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrDeclaration +import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent import org.jetbrains.kotlin.ir.declarations.IrSymbolOwner import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl @@ -27,7 +28,7 @@ internal val singletonReferencesPhase = makeIrFilePhase( private class SingletonReferencesLowering(val context: JvmBackendContext) : ClassLoweringPass, IrElementTransformerVoid() { private lateinit var containingClass: IrClass - private val constructingEnums = arrayListOf() + private val constructingEnums = arrayListOf() override fun lower(irClass: IrClass) { containingClass = irClass