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

Minor: Change signature of JetParameterInfo constructor

Browse Source
This commit is contained in:
Alexey Sedunov
2015-04-02 20:57:34 +03:00
parent 95a8db458b
commit 7d4d3e537c
6 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class ChangeFunctionLiteralSignatureFix extends ChangeFunctionSignatureFi
descriptor.clearNonReceiverParameters(); descriptor.clearNonReceiverParameters();
for (JetType type : parameterTypes) { for (JetType type : parameterTypes) {
String name = JetNameSuggester.suggestNames(type, validator, "param")[0]; 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; return null;
} }
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java
+2 -1
View File
@@ -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.JetNameSuggester;
import org.jetbrains.kotlin.idea.core.refactoring.JetNameValidator; import org.jetbrains.kotlin.idea.core.refactoring.JetNameValidator;
import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; 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.idea.util.IdeDescriptorRenderers;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
@@ -119,7 +120,7 @@ public abstract class ChangeFunctionSignatureFix extends JetIntentionAction<PsiE
JetExpression expression = argument.getArgumentExpression(); JetExpression expression = argument.getArgumentExpression();
JetType type = expression != null ? bindingContext.get(BindingContext.EXPRESSION_TYPE, expression) : null; JetType type = expression != null ? bindingContext.get(BindingContext.EXPRESSION_TYPE, expression) : null;
type = type != null ? type : KotlinBuiltIns.getInstance().getNullableAnyType(); type = type != null ? type : KotlinBuiltIns.getInstance().getNullableAnyType();
JetParameterInfo parameterInfo = new JetParameterInfo(-1, name, type, null, "", null, null); JetParameterInfo parameterInfo = new JetParameterInfo(-1, name, type, null, "", JetValVar.None, null);
parameterInfo.setCurrentTypeText(IdeDescriptorRenderers.SOURCE_CODE.renderType(type)); parameterInfo.setCurrentTypeText(IdeDescriptorRenderers.SOURCE_CODE.renderType(type));
return parameterInfo; return parameterInfo;
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetCallableParameterTableModel.java
+1 -1
View File
@@ -43,7 +43,7 @@ public abstract class JetCallableParameterTableModel extends ParameterTableModel
@Override @Override
protected ParameterTableModelItemBase<JetParameterInfo> createRowItem(@Nullable JetParameterInfo parameterInfo) { protected ParameterTableModelItemBase<JetParameterInfo> createRowItem(@Nullable JetParameterInfo parameterInfo) {
if (parameterInfo == null) { if (parameterInfo == null) {
parameterInfo = new JetParameterInfo(-1, "", null, null, "", null, null); parameterInfo = new JetParameterInfo(-1, "", null, null, "", JetValVar.None, null);
} }
JetPsiFactory psiFactory = JetPsiFactory(project); JetPsiFactory psiFactory = JetPsiFactory(project);
PsiCodeFragment paramTypeCodeFragment = psiFactory.createTypeCodeFragment(parameterInfo.getTypeText(), myTypeContext); PsiCodeFragment paramTypeCodeFragment = psiFactory.createTypeCodeFragment(parameterInfo.getTypeText(), myTypeContext);
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt
+1 -1
View File
@@ -64,7 +64,7 @@ public class JetChangeSignatureData(
name = parameterDescriptor.getName().asString(), name = parameterDescriptor.getName().asString(),
type = parameterDescriptor.getType(), type = parameterDescriptor.getType(),
defaultValueForParameter = jetParameter?.getDefaultValue(), defaultValueForParameter = jetParameter?.getDefaultValue(),
valOrVarNode = jetParameter?.getValOrVarNode(), valOrVar = jetParameter?.getValOrVarNode().toValVar(),
modifierList = jetParameter?.getModifierList() modifierList = jetParameter?.getModifierList()
) )
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt
+1 -2
View File
@@ -34,12 +34,11 @@ public class JetParameterInfo(
type: JetType? = null, type: JetType? = null,
var defaultValueForParameter: JetExpression? = null, var defaultValueForParameter: JetExpression? = null,
var defaultValueForCall: String = "", var defaultValueForCall: String = "",
valOrVarNode: ASTNode? = null, var valOrVar: JetValVar = JetValVar.None,
val modifierList: JetModifierList? = null val modifierList: JetModifierList? = null
): ParameterInfo { ): ParameterInfo {
val originalType: JetType? = type val originalType: JetType? = type
var currentTypeText: String = getOldTypeText() var currentTypeText: String = getOldTypeText()
var valOrVar: JetValVar = valOrVarNode.toValVar()
private fun getOldTypeText() = originalType?.let { IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(it) } ?: "" private fun getOldTypeText() = originalType?.let { IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(it) } ?: ""
idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java
+23 -23
View File
@@ -109,7 +109,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
JetChangeInfo changeInfo = getChangeInfo(); JetChangeInfo changeInfo = getChangeInfo();
changeInfo.setNewVisibility(Visibilities.PROTECTED); changeInfo.setNewVisibility(Visibilities.PROTECTED);
JetParameterInfo newParameter = new JetParameterInfo(-1, "x", KotlinBuiltIns.getInstance().getAnyType(), JetParameterInfo newParameter = new JetParameterInfo(-1, "x", KotlinBuiltIns.getInstance().getAnyType(),
null, "12", JetPsiFactory(getProject()).createValOrVarNode("val"), null); null, "12", JetValVar.Val, null);
changeInfo.addParameter(newParameter); changeInfo.addParameter(newParameter);
doTest(changeInfo); doTest(changeInfo);
} }
@@ -173,7 +173,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testExpressionFunction() throws Exception { public void testExpressionFunction() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); JetChangeInfo changeInfo = getChangeInfo();
changeInfo.getNewParameters()[0].setName("x1"); 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); doTest(changeInfo);
} }
@@ -182,14 +182,14 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
changeInfo.setNewVisibility(Visibilities.INTERNAL); changeInfo.setNewVisibility(Visibilities.INTERNAL);
changeInfo.setNewParameter(2, changeInfo.getNewParameters()[1]); changeInfo.setNewParameter(2, changeInfo.getNewParameters()[1]);
changeInfo.setNewParameter(1, changeInfo.getNewParameters()[0]); 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); changeInfo.setNewParameter(0, newParameter);
doTest(changeInfo); doTest(changeInfo);
} }
public void testFakeOverride() throws Exception { public void testFakeOverride() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); changeInfo.addParameter(newParameter);
doTest(changeInfo); doTest(changeInfo);
} }
@@ -197,7 +197,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testFunctionLiteral() throws Exception { public void testFunctionLiteral() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); JetChangeInfo changeInfo = getChangeInfo();
changeInfo.getNewParameters()[1].setName("y1"); 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"); changeInfo.setNewReturnTypeText("Int");
doTest(changeInfo); doTest(changeInfo);
} }
@@ -289,14 +289,14 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testOverridesInEnumEntries() throws Exception { public void testOverridesInEnumEntries() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); changeInfo.addParameter(newParameter);
doTest(changeInfo); doTest(changeInfo);
} }
public void testEnumEntriesWithoutSuperCalls() throws Exception { public void testEnumEntriesWithoutSuperCalls() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); changeInfo.addParameter(newParameter);
doTest(changeInfo); doTest(changeInfo);
} }
@@ -311,16 +311,16 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testConstructorJavaUsages() throws Exception { public void testConstructorJavaUsages() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); changeInfo.addParameter(newParameter);
doTest(changeInfo); doTest(changeInfo);
} }
public void testFunctionJavaUsagesAndOverridesAddParam() throws Exception { public void testFunctionJavaUsagesAndOverridesAddParam() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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( 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); doTest(changeInfo);
} }
@@ -556,13 +556,13 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testParameterModifiers() throws Exception { public void testParameterModifiers() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); doTest(changeInfo);
} }
public void testFqNameShortening() throws Exception { public void testFqNameShortening() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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"); parameterInfo.setCurrentTypeText("kotlin.String");
changeInfo.addParameter(parameterInfo); changeInfo.addParameter(parameterInfo);
doTest(changeInfo); doTest(changeInfo);
@@ -576,7 +576,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testParameterListAddParam() throws Exception { public void testParameterListAddParam() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); doTest(changeInfo);
} }
@@ -596,7 +596,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testAddNewReceiver() throws Exception { public void testAddNewReceiver() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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"); parameterInfo.setCurrentTypeText("X");
changeInfo.setReceiverParameterInfo(parameterInfo); changeInfo.setReceiverParameterInfo(parameterInfo);
doTest(changeInfo); doTest(changeInfo);
@@ -604,7 +604,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testAddNewReceiverForMember() throws Exception { public void testAddNewReceiverForMember() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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"); parameterInfo.setCurrentTypeText("X");
changeInfo.setReceiverParameterInfo(parameterInfo); changeInfo.setReceiverParameterInfo(parameterInfo);
doTest(changeInfo); doTest(changeInfo);
@@ -612,7 +612,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testAddNewReceiverForMemberConflict() throws Exception { public void testAddNewReceiverForMemberConflict() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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"); parameterInfo.setCurrentTypeText("X");
changeInfo.setReceiverParameterInfo(parameterInfo); changeInfo.setReceiverParameterInfo(parameterInfo);
doTestConflict(changeInfo); doTestConflict(changeInfo);
@@ -620,7 +620,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testAddNewReceiverConflict() throws Exception { public void testAddNewReceiverConflict() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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"); parameterInfo.setCurrentTypeText("X");
changeInfo.setReceiverParameterInfo(parameterInfo); changeInfo.setReceiverParameterInfo(parameterInfo);
doTestConflict(changeInfo); doTestConflict(changeInfo);
@@ -731,7 +731,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testSecondaryConstructor() throws Exception { public void testSecondaryConstructor() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); doTest(changeInfo);
} }
@@ -755,25 +755,25 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testPrimaryConstructorByThisRef() throws Exception { public void testPrimaryConstructorByThisRef() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); doTest(changeInfo);
} }
public void testPrimaryConstructorBySuperRef() throws Exception { public void testPrimaryConstructorBySuperRef() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); doTest(changeInfo);
} }
public void testSecondaryConstructorByThisRef() throws Exception { public void testSecondaryConstructorByThisRef() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); doTest(changeInfo);
} }
public void testSecondaryConstructorBySuperRef() throws Exception { public void testSecondaryConstructorBySuperRef() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); doTest(changeInfo);
} }
@@ -797,7 +797,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
public void testNoConflictWithReceiverName() throws Exception { public void testNoConflictWithReceiverName() throws Exception {
JetChangeInfo changeInfo = getChangeInfo(); 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); doTest(changeInfo);
} }