azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed methods so that tests for parsing do not fail

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-10 22:11:15 +03:00
parent 37ab41ac52
commit 3b7bb81141
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java
+3 -3
View File
@@ -79,7 +79,7 @@ public class JetClass extends JetTypeParameterListOwnerStub<KotlinClassStub> 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<KotlinClassStub> 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("()"));
idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
+1 -1
View File
@@ -126,7 +126,7 @@ public object SuperClassNotInitialized : JetIntentionActionsFactory() {
val parameterNames = ArrayList<String>()
val typeRefsToShorten = ArrayList<JetTypeReference>()
if (!superParameters.isEmpty()) {
val parameterList = classDeclaration.getOrCreatePrimaryConstructorParameterList()
val parameterList = classDeclaration.createPrimaryConstructorParameterListIfAbsent()
val oldParameters = parameterList.getParameters()
val parametersToAdd = ArrayList<JetParameter>()
for (parameter in superParameters) {
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
+1 -1
View File
@@ -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)
}
}