MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

introduce parameter: show conflicts for incomplete calls

Browse Source
This commit is contained in:
anna
2009-12-09 14:49:23 +03:00
parent 3a428109bd
commit f019f6615c
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
+22 -1
View File
@@ -141,7 +141,28 @@ public class JavaIntroduceParameterMethodUsagesProcessor implements IntroducePar
}
public void findConflicts(IntroduceParameterData data, UsageInfo[] usages, MultiMap<PsiElement, String> conflicts) {
public void findConflicts(IntroduceParameterData data, UsageInfo[] usages, final MultiMap<PsiElement, String> conflicts) {
final int parametersCount = data.getMethodToReplaceIn().getParameterList().getParametersCount();
for (UsageInfo usage : usages) {
if (!isMethodUsage(usage)) continue;
final PsiElement element = usage.getElement();
final PsiCall call = RefactoringUtil.getCallExpressionByMethodReference(element);
final PsiExpressionList argList = call.getArgumentList();
if (argList != null) {
final int actualParamLength = argList.getExpressions().length;
if (actualParamLength < parametersCount) {
conflicts.putValue(call, "Incomplete call(" + call.getText() +"): " + parametersCount + " parameters expected but only " + actualParamLength + " found");
}
data.getParametersToRemove().forEach(new TIntProcedure() {
public boolean execute(int paramNum) {
if (paramNum >= actualParamLength) {
conflicts.putValue(call, "Incomplete call(" + call.getText() +"): expected to delete the " + paramNum + " parameter but only " + actualParamLength + " parameters found");
}
return true;
}
});
}
}
}
public boolean processChangeMethodSignature(IntroduceParameterData data, UsageInfo usage, UsageInfo[] usages) throws IncorrectOperationException {
java/java-impl/src/com/intellij/refactoring/introduceParameter/OldReferenceResolver.java
-3
View File
@@ -63,9 +63,6 @@ public class OldReferenceResolver {
myProject = myContext.getProject();
myManager = myContext.getManager();
if (myActualArgs.length < myMethodToReplaceIn.getParameterList().getParametersCount()) {
LOG.debug(myContext.getText() + "\n-----\n" + myMethodToReplaceIn.getText());
}
PsiElementFactory factory = JavaPsiFacade.getInstance(myProject).getElementFactory();
PsiExpression instanceRef;
if (myContext instanceof PsiMethodCallExpression) {
java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java
+3 -2
View File
@@ -166,7 +166,7 @@ public class IntroduceParameterTest extends LightCodeInsightTestCase {
}
public void testParameterJavaDocBeforeVararg() throws Exception {
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, true, false);
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, false, false, true, false, "Incomplete call(method()): 1 parameters expected but only 0 found");
}
public void testIncorrectScope() throws Exception {
@@ -230,7 +230,8 @@ public class IntroduceParameterTest extends LightCodeInsightTestCase {
}
public void testIncompleteEnumDefinition() throws Exception {
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false, false, false);
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false, false, false, "Incomplete call(Root()): 2 parameters expected but only 0 found\n" +
"Incomplete call(Root()): expected to delete the 1 parameter but only 0 parameters found");
}
private void doTestThroughHandler() throws Exception {