From 076ac4f5ee32271b49ac4501ed06d62a866dab1c Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 6 Aug 2015 19:55:40 +0300 Subject: [PATCH] Create class from usage fix: enum entries are created with new constructor syntax --- .../quickfix/createFromUsage/callableBuilder/CallableBuilder.kt | 2 +- .../enumEntryWithEnumQualifierAndParams.kt.after | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index cafa4c78ff5..6dad8059d69 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -481,7 +481,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { ClassKind.ENUM_ENTRY -> { if (!(targetParent is JetClass && targetParent.isEnum())) throw AssertionError("Enum class expected: ${targetParent.getText()}") val hasParameters = targetParent.getPrimaryConstructorParameters().isNotEmpty() - psiFactory.createEnumEntry("$name ${if (hasParameters) ": ${targetParent.getName()}()" else ""}") + psiFactory.createEnumEntry("$name${if (hasParameters) "()" else " "}") } else -> { val openMod = if (open) "open " else "" diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifierAndParams.kt.after b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifierAndParams.kt.after index 73ec9d159fe..e100d892846 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifierAndParams.kt.after +++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifierAndParams.kt.after @@ -5,6 +5,6 @@ package p fun foo() = X.A enum class X(n: Int) { - A : X() + A() } \ No newline at end of file