From 4c8d0acb5d09c01d579fbf153f1c427291c42056 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Tue, 23 Jul 2019 21:54:14 +0300 Subject: [PATCH] CreateExpectFix: shouldn't suggest create expect property with `lateinit` or `const` modifier #KT-32705 Fixed --- .../kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt index de1183fd96f..31b01176292 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.idea.util.allowedValOrVar import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.idea.util.liftToExpected import org.jetbrains.kotlin.idea.util.module +import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer @@ -132,7 +133,8 @@ class CreateExpectedClassFix( private fun KtDeclaration.canAddActualModifier() = when (this) { is KtEnumEntry, is KtClassInitializer -> false - is KtParameter -> this.hasValOrVar() + is KtParameter -> hasValOrVar() + is KtProperty -> !hasModifier(KtTokens.LATEINIT_KEYWORD) && !hasModifier(KtTokens.CONST_KEYWORD) else -> true }