MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix delegation to abstract method (EA-29618 - NPE: DelegateWithDefaultParamValueIntentionAction.invoke)

Browse Source
This commit is contained in:
anna
2011-09-08 20:27:42 +02:00
parent 7ff91a3d92
commit 32e09dafb3
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DelegateWithDefaultParamValueIntentionAction.java
View File

@@ -65,11 +65,16 @@ public class DelegateWithDefaultParamValueIntentionAction extends PsiElementBase
private static PsiMethod generateMethodPrototype(PsiMethod method, PsiParameter param) {
final PsiMethod prototype = (PsiMethod)method.copy();
final PsiCodeBlock body = prototype.getBody();
PsiCodeBlock body = prototype.getBody();
if (body != null) {
for (PsiStatement psiStatement : body.getStatements()) {
psiStatement.delete();
}
} else {
prototype.getModifierList().setModifierProperty(PsiModifier.ABSTRACT, false);
body =
(PsiCodeBlock)prototype
.addBefore(JavaPsiFacade.getElementFactory(method.getProject()).createMethodFromText("void foo(){}", prototype).getBody(), null);
}
final int parameterIndex = method.getParameterList().getParameterIndex(param);
prototype.getParameterList().getParameters()[parameterIndex].delete();

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/delegateWithDefaultValue/afterAbstractMethod.java Normal file
View File

@@ -0,0 +1,8 @@
// "Generate delegated method with default parameter value" "true"
abstract class Test {
int foo(boolean... args) {
return foo(<caret>, args);
}
abstract int foo(int ii, boolean... args);
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/delegateWithDefaultValue/beforeAbstractMethod.java Normal file
View File

@@ -0,0 +1,4 @@
// "Generate delegated method with default parameter value" "true"
abstract class Test {
abstract int foo(int i<caret>i, boolean... args);
}

5
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DelegateWithDefaultParamValueTest.java
View File

@@ -15,6 +15,7 @@
*/
package com.intellij.codeInsight.daemon.quickFix;
import com.intellij.codeInsight.template.TemplateManager;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.codeInsight.template.impl.TemplateState;
@@ -26,7 +27,7 @@ public class DelegateWithDefaultParamValueTest extends LightQuickFixTestCase {
protected void doAction(String text, boolean actionShouldBeAvailable, String testFullPath, String testName)
throws Exception {
try {
((TemplateManagerImpl)TemplateManagerImpl.getInstance(getProject())).setTemplateTesting(true);
((TemplateManagerImpl)TemplateManager.getInstance(getProject())).setTemplateTesting(true);
super.doAction(text, actionShouldBeAvailable, testFullPath, testName);
if (actionShouldBeAvailable) {
@@ -35,7 +36,7 @@ public class DelegateWithDefaultParamValueTest extends LightQuickFixTestCase {
state.gotoEnd(false);
}
} finally {
((TemplateManagerImpl)TemplateManagerImpl.getInstance(getProject())).setTemplateTesting(false);
((TemplateManagerImpl)TemplateManager.getInstance(getProject())).setTemplateTesting(false);
}
}