diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java index e3f6e23ec28..7b27449a9dc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java @@ -79,7 +79,7 @@ public class JetClass extends JetTypeParameterListOwnerStub imp } @NotNull - public JetPrimaryConstructor getOrCreatePrimaryConstructor() { + public JetPrimaryConstructor createPrimaryConstructorIfAbsent() { JetPrimaryConstructor constructor = getPrimaryConstructor(); if (constructor != null) return constructor; PsiElement anchor = getTypeParameterList(); @@ -89,8 +89,8 @@ public class JetClass extends JetTypeParameterListOwnerStub imp } @NotNull - public JetParameterList getOrCreatePrimaryConstructorParameterList() { - JetPrimaryConstructor constructor = getOrCreatePrimaryConstructor(); + public JetParameterList createPrimaryConstructorParameterListIfAbsent() { + JetPrimaryConstructor constructor = createPrimaryConstructorIfAbsent(); JetParameterList parameterList = constructor.getValueParameterList(); if (parameterList != null) return parameterList; return (JetParameterList) constructor.add(new JetPsiFactory(getProject()).createParameterList("()")); diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt index a6c69aac190..903b45004b4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt @@ -126,7 +126,7 @@ public object SuperClassNotInitialized : JetIntentionActionsFactory() { val parameterNames = ArrayList() val typeRefsToShorten = ArrayList() if (!superParameters.isEmpty()) { - val parameterList = classDeclaration.getOrCreatePrimaryConstructorParameterList() + val parameterList = classDeclaration.createPrimaryConstructorParameterListIfAbsent() val oldParameters = parameterList.getParameters() val parametersToAdd = ArrayList() for (parameter in superParameters) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt index c05fdd36b80..11958de7af1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt @@ -249,7 +249,7 @@ public open class KotlinIntroduceParameterHandler( val addedParameter = if (inplaceIsAvailable) { runWriteAction { val parameterList = targetParent.getValueParameterList() - ?: (targetParent as JetClass).getOrCreatePrimaryConstructorParameterList() + ?: (targetParent as JetClass).createPrimaryConstructorParameterListIfAbsent() parameterList.addParameter(newParameter) } }