From 7d4d3e537c2dcd6876a860a387ec23d790d2caba Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 2 Apr 2015 20:57:34 +0300 Subject: [PATCH] Minor: Change signature of JetParameterInfo constructor --- .../ChangeFunctionLiteralSignatureFix.java | 2 +- .../quickfix/ChangeFunctionSignatureFix.java | 3 +- .../JetCallableParameterTableModel.java | 2 +- .../changeSignature/JetChangeSignatureData.kt | 2 +- .../changeSignature/JetParameterInfo.kt | 3 +- .../JetChangeSignatureTest.java | 46 +++++++++---------- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java index 776029293d0..532246f83c1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java @@ -72,7 +72,7 @@ public class ChangeFunctionLiteralSignatureFix extends ChangeFunctionSignatureFi descriptor.clearNonReceiverParameters(); for (JetType type : parameterTypes) { String name = JetNameSuggester.suggestNames(type, validator, "param")[0]; - descriptor.addParameter(new JetParameterInfo(-1, name, type, null, "", null, null)); + descriptor.addParameter(new JetParameterInfo(-1, name, type, null, "", JetValVar.None, null)); } return null; } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java index 5ce4654b58c..9eac65f4a1e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil; import org.jetbrains.kotlin.idea.core.refactoring.JetNameSuggester; import org.jetbrains.kotlin.idea.core.refactoring.JetNameValidator; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; @@ -119,7 +120,7 @@ public abstract class ChangeFunctionSignatureFix extends JetIntentionAction createRowItem(@Nullable JetParameterInfo parameterInfo) { if (parameterInfo == null) { - parameterInfo = new JetParameterInfo(-1, "", null, null, "", null, null); + parameterInfo = new JetParameterInfo(-1, "", null, null, "", JetValVar.None, null); } JetPsiFactory psiFactory = JetPsiFactory(project); PsiCodeFragment paramTypeCodeFragment = psiFactory.createTypeCodeFragment(parameterInfo.getTypeText(), myTypeContext); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt index ae52a407236..c26adfa820b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt @@ -64,7 +64,7 @@ public class JetChangeSignatureData( name = parameterDescriptor.getName().asString(), type = parameterDescriptor.getType(), defaultValueForParameter = jetParameter?.getDefaultValue(), - valOrVarNode = jetParameter?.getValOrVarNode(), + valOrVar = jetParameter?.getValOrVarNode().toValVar(), modifierList = jetParameter?.getModifierList() ) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt index d466382424d..aabe55c88cb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt @@ -34,12 +34,11 @@ public class JetParameterInfo( type: JetType? = null, var defaultValueForParameter: JetExpression? = null, var defaultValueForCall: String = "", - valOrVarNode: ASTNode? = null, + var valOrVar: JetValVar = JetValVar.None, val modifierList: JetModifierList? = null ): ParameterInfo { val originalType: JetType? = type var currentTypeText: String = getOldTypeText() - var valOrVar: JetValVar = valOrVarNode.toValVar() private fun getOldTypeText() = originalType?.let { IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(it) } ?: "" diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java index c9e97b004d7..c683eb981ff 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java @@ -109,7 +109,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { JetChangeInfo changeInfo = getChangeInfo(); changeInfo.setNewVisibility(Visibilities.PROTECTED); JetParameterInfo newParameter = new JetParameterInfo(-1, "x", KotlinBuiltIns.getInstance().getAnyType(), - null, "12", JetPsiFactory(getProject()).createValOrVarNode("val"), null); + null, "12", JetValVar.Val, null); changeInfo.addParameter(newParameter); doTest(changeInfo); } @@ -173,7 +173,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testExpressionFunction() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); changeInfo.getNewParameters()[0].setName("x1"); - changeInfo.addParameter(new JetParameterInfo(-1, "y1", KotlinBuiltIns.getInstance().getIntType(), null, "", null, null)); + changeInfo.addParameter(new JetParameterInfo(-1, "y1", KotlinBuiltIns.getInstance().getIntType(), null, "", JetValVar.None, null)); doTest(changeInfo); } @@ -182,14 +182,14 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { changeInfo.setNewVisibility(Visibilities.INTERNAL); changeInfo.setNewParameter(2, changeInfo.getNewParameters()[1]); changeInfo.setNewParameter(1, changeInfo.getNewParameters()[0]); - JetParameterInfo newParameter = new JetParameterInfo(-1, "x0", KotlinBuiltIns.getInstance().getNullableAnyType(), null, "null", null, null); + JetParameterInfo newParameter = new JetParameterInfo(-1, "x0", KotlinBuiltIns.getInstance().getNullableAnyType(), null, "null", JetValVar.None, null); changeInfo.setNewParameter(0, newParameter); doTest(changeInfo); } public void testFakeOverride() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - JetParameterInfo newParameter = new JetParameterInfo(-1, "i", KotlinBuiltIns.getInstance().getIntType(), null, "", null, null); + JetParameterInfo newParameter = new JetParameterInfo(-1, "i", KotlinBuiltIns.getInstance().getIntType(), null, "", JetValVar.None, null); changeInfo.addParameter(newParameter); doTest(changeInfo); } @@ -197,7 +197,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testFunctionLiteral() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); changeInfo.getNewParameters()[1].setName("y1"); - changeInfo.addParameter(new JetParameterInfo(-1, "x", KotlinBuiltIns.getInstance().getAnyType(), null, "", null, null)); + changeInfo.addParameter(new JetParameterInfo(-1, "x", KotlinBuiltIns.getInstance().getAnyType(), null, "", JetValVar.None, null)); changeInfo.setNewReturnTypeText("Int"); doTest(changeInfo); } @@ -289,14 +289,14 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testOverridesInEnumEntries() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - JetParameterInfo newParameter = new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "", null, null); + JetParameterInfo newParameter = new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "", JetValVar.None, null); changeInfo.addParameter(newParameter); doTest(changeInfo); } public void testEnumEntriesWithoutSuperCalls() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - JetParameterInfo newParameter = new JetParameterInfo(-1, "n", KotlinBuiltIns.getInstance().getIntType(), null, "1", null, null); + JetParameterInfo newParameter = new JetParameterInfo(-1, "n", KotlinBuiltIns.getInstance().getIntType(), null, "1", JetValVar.None, null); changeInfo.addParameter(newParameter); doTest(changeInfo); } @@ -311,16 +311,16 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testConstructorJavaUsages() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - JetParameterInfo newParameter = new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"abc\"", null, null); + JetParameterInfo newParameter = new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"abc\"", JetValVar.None, null); changeInfo.addParameter(newParameter); doTest(changeInfo); } public void testFunctionJavaUsagesAndOverridesAddParam() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"abc\"", null, null)); + changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"abc\"", JetValVar.None, null)); changeInfo.addParameter( - new JetParameterInfo(-1, "o", KotlinBuiltIns.getInstance().getNullableAnyType(), null, "\"def\"", null, null)); + new JetParameterInfo(-1, "o", KotlinBuiltIns.getInstance().getNullableAnyType(), null, "\"def\"", JetValVar.None, null)); doTest(changeInfo); } @@ -556,13 +556,13 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testParameterModifiers() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - changeInfo.addParameter(new JetParameterInfo(-1, "n", KotlinBuiltIns.getInstance().getIntType(), null, "", null, null)); + changeInfo.addParameter(new JetParameterInfo(-1, "n", KotlinBuiltIns.getInstance().getIntType(), null, "", JetValVar.None, null)); doTest(changeInfo); } public void testFqNameShortening() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - JetParameterInfo parameterInfo = new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getAnyType(), null, "", null, null); + JetParameterInfo parameterInfo = new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getAnyType(), null, "", JetValVar.None, null); parameterInfo.setCurrentTypeText("kotlin.String"); changeInfo.addParameter(parameterInfo); doTest(changeInfo); @@ -576,7 +576,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testParameterListAddParam() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - changeInfo.addParameter(new JetParameterInfo(-1, "l", KotlinBuiltIns.getInstance().getLongType(), null, "", null, null)); + changeInfo.addParameter(new JetParameterInfo(-1, "l", KotlinBuiltIns.getInstance().getLongType(), null, "", JetValVar.None, null)); doTest(changeInfo); } @@ -596,7 +596,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testAddNewReceiver() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - JetParameterInfo parameterInfo = new JetParameterInfo(-1, "_", KotlinBuiltIns.getInstance().getAnyType(), null, "X(0)", null, null); + JetParameterInfo parameterInfo = new JetParameterInfo(-1, "_", KotlinBuiltIns.getInstance().getAnyType(), null, "X(0)", JetValVar.None, null); parameterInfo.setCurrentTypeText("X"); changeInfo.setReceiverParameterInfo(parameterInfo); doTest(changeInfo); @@ -604,7 +604,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testAddNewReceiverForMember() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - JetParameterInfo parameterInfo = new JetParameterInfo(-1, "_", KotlinBuiltIns.getInstance().getAnyType(), null, "X(0)", null, null); + JetParameterInfo parameterInfo = new JetParameterInfo(-1, "_", KotlinBuiltIns.getInstance().getAnyType(), null, "X(0)", JetValVar.None, null); parameterInfo.setCurrentTypeText("X"); changeInfo.setReceiverParameterInfo(parameterInfo); doTest(changeInfo); @@ -612,7 +612,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testAddNewReceiverForMemberConflict() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - JetParameterInfo parameterInfo = new JetParameterInfo(-1, "_", KotlinBuiltIns.getInstance().getAnyType(), null, "X(0)", null, null); + JetParameterInfo parameterInfo = new JetParameterInfo(-1, "_", KotlinBuiltIns.getInstance().getAnyType(), null, "X(0)", JetValVar.None, null); parameterInfo.setCurrentTypeText("X"); changeInfo.setReceiverParameterInfo(parameterInfo); doTestConflict(changeInfo); @@ -620,7 +620,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testAddNewReceiverConflict() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - JetParameterInfo parameterInfo = new JetParameterInfo(-1, "_", KotlinBuiltIns.getInstance().getAnyType(), null, "X(0)", null, null); + JetParameterInfo parameterInfo = new JetParameterInfo(-1, "_", KotlinBuiltIns.getInstance().getAnyType(), null, "X(0)", JetValVar.None, null); parameterInfo.setCurrentTypeText("X"); changeInfo.setReceiverParameterInfo(parameterInfo); doTestConflict(changeInfo); @@ -731,7 +731,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testSecondaryConstructor() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"foo\"", null, null)); + changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"foo\"", JetValVar.None, null)); doTest(changeInfo); } @@ -755,25 +755,25 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testPrimaryConstructorByThisRef() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"foo\"", null, null)); + changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"foo\"", JetValVar.None, null)); doTest(changeInfo); } public void testPrimaryConstructorBySuperRef() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"foo\"", null, null)); + changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"foo\"", JetValVar.None, null)); doTest(changeInfo); } public void testSecondaryConstructorByThisRef() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"foo\"", null, null)); + changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"foo\"", JetValVar.None, null)); doTest(changeInfo); } public void testSecondaryConstructorBySuperRef() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"foo\"", null, null)); + changeInfo.addParameter(new JetParameterInfo(-1, "s", KotlinBuiltIns.getInstance().getStringType(), null, "\"foo\"", JetValVar.None, null)); doTest(changeInfo); } @@ -797,7 +797,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { public void testNoConflictWithReceiverName() throws Exception { JetChangeInfo changeInfo = getChangeInfo(); - changeInfo.addParameter(new JetParameterInfo(-1, "i", KotlinBuiltIns.getInstance().getIntType(), null, "0", null, null)); + changeInfo.addParameter(new JetParameterInfo(-1, "i", KotlinBuiltIns.getInstance().getIntType(), null, "0", JetValVar.None, null)); doTest(changeInfo); }