diff --git a/build.gradle b/build.gradle index 29ef98e..ddac47e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlinVersion = '1.7.20' + ext.kotlinVersion = '1.8.10' repositories { mavenCentral() } @@ -10,8 +10,8 @@ buildscript { plugins { id 'java' - id 'org.jetbrains.intellij' version '1.10.1' - id 'org.jetbrains.kotlin.jvm' version '1.7.20' + id 'org.jetbrains.intellij' version '1.13.3' + id 'org.jetbrains.kotlin.jvm' version '1.8.10' } apply plugin: 'org.jetbrains.intellij' @@ -21,7 +21,7 @@ sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 intellij { - version = '2022.2' + version = '2023.1' plugins = ['Kotlin', 'java'] pluginName = 'kotlin-fill-class' updateSinceUntilBuild = false diff --git a/src/main/kotlin/com/github/suusan2go/kotlinfillclass/inspections/BaseFillClassInspection.kt b/src/main/kotlin/com/github/suusan2go/kotlinfillclass/inspections/BaseFillClassInspection.kt index efb1dab..fb15910 100644 --- a/src/main/kotlin/com/github/suusan2go/kotlinfillclass/inspections/BaseFillClassInspection.kt +++ b/src/main/kotlin/com/github/suusan2go/kotlinfillclass/inspections/BaseFillClassInspection.kt @@ -42,7 +42,6 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.calls.util.getParameterForArgument import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor import org.jetbrains.kotlin.types.KotlinType -import org.jetbrains.kotlin.utils.addToStdlib.safeAs abstract class BaseFillClassInspection( @JvmField var withoutDefaultValues: Boolean = false, @@ -120,7 +119,7 @@ open class FillClassFix( override fun applyFix(project: Project, descriptor: ProblemDescriptor) { val argumentList = descriptor.psiElement as? KtValueArgumentList ?: return - val (resolvedCall, functionDescriptor) = argumentList.parent.safeAs()?.analyze() ?: return + val (resolvedCall, functionDescriptor) = (argumentList.parent as? KtCallElement)?.analyze() ?: return argumentList.fillArguments(functionDescriptor.valueParameters, resolvedCall) } @@ -132,7 +131,7 @@ open class FillClassFix( val argumentSize = arguments.size val argumentNames = arguments.mapNotNull { it.getArgumentName()?.asName?.identifier } - val lambdaArgument = parent.safeAs()?.lambdaArguments?.singleOrNull() + val lambdaArgument = (parent as? KtCallElement)?.lambdaArguments?.singleOrNull() val parameterForLambdaArgument = lambdaArgument?.let { resolvedCall?.getParameterForArgument(it) } val factory = KtPsiFactory(this)