MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 05:21:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

generate super call: insert at caret, fix read only status tracking (IDEA-166864)

Browse Source
This commit is contained in:
Anna Kozlova
2017-01-24 15:47:14 +03:00
parent 2ad9f23ea0
commit ff905cfb6d
5 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallAction.java
View File

@@ -36,10 +36,6 @@ public class GenerateSuperMethodCallAction extends BaseCodeInsightAction {
if (!(file instanceof PsiJavaFile)) {
return false;
}
PsiMethod method = GenerateSuperMethodCallHandler.canInsertSuper(editor, file);
if (method == null) {
return false;
}
return true;
return GenerateSuperMethodCallHandler.canInsertSuper(editor, file) != null;
}
}

44
java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallHandler.java
View File

@@ -17,52 +17,60 @@
package com.intellij.codeInsight.generation.actions;
import com.intellij.codeInsight.CodeInsightActionHandler;
import com.intellij.codeInsight.CodeInsightUtilBase;
import com.intellij.codeInsight.CodeInsightUtilCore;
import com.intellij.codeInsight.generation.OverrideImplementUtil;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.ScrollType;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class GenerateSuperMethodCallHandler implements CodeInsightActionHandler {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.actions.GenerateSuperMethodCallHandler");
private static final Logger LOG = Logger.getInstance(GenerateSuperMethodCallHandler.class);
@Override
public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
if (!CodeInsightUtilBase.prepareEditorForWrite(editor)) return;
PsiMethod method = canInsertSuper(editor, file);
try {
if (!CommonRefactoringUtil.checkReadOnlyStatus(file)) return;
WriteCommandAction.runWriteCommandAction(project, () -> {
PsiMethod method = canInsertSuper(editor, file);
LOG.assertTrue(method != null);
PsiMethod template = (PsiMethod)method.copy();
OverrideImplementUtil.setupMethodBody(template, method, method.getContainingClass());
PsiStatement superCall = template.getBody().getStatements()[0];
PsiCodeBlock body = method.getBody();
PsiCodeBlock templateBody = template.getBody();
LOG.assertTrue(templateBody != null, template);
PsiStatement superCall = templateBody.getStatements()[0];
PsiElement element = file.findElementAt(editor.getCaretModel().getOffset());
PsiCodeBlock codeBlock = PsiTreeUtil.getParentOfType(element, PsiCodeBlock.class);
LOG.assertTrue(codeBlock != null);
PsiElement toGo;
if (body.getLBrace() == null) {
toGo = body.addBefore(superCall, null);
if (codeBlock.getLBrace() == null) {
toGo = codeBlock.addBefore(superCall, null);
}
else {
toGo = body.addAfter(superCall, body.getLBrace());
if (element.getParent() == codeBlock) {
toGo = codeBlock.addBefore(superCall, element);
}
else {
toGo = codeBlock.addAfter(superCall, codeBlock.getLBrace());
}
}
toGo = CodeInsightUtilCore.forcePsiPostprocessAndRestoreElement(toGo);
editor.getCaretModel().moveToOffset(toGo.getTextOffset());
editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
}
catch (IncorrectOperationException e) {
LOG.error(e);
}
});
}
@Override
public boolean startInWriteAction() {
return true;
return false;
}
public static PsiMethod canInsertSuper(Editor editor, PsiFile file) {
@@ -71,8 +79,8 @@ public class GenerateSuperMethodCallHandler implements CodeInsightActionHandler
if (element == null) return null;
PsiCodeBlock codeBlock = PsiTreeUtil.getParentOfType(element, PsiCodeBlock.class);
if (codeBlock == null) return null;
if (!(codeBlock.getParent() instanceof PsiMethod)) return null;
PsiMethod method = (PsiMethod)codeBlock.getParent();
PsiMethod method = PsiTreeUtil.getParentOfType(codeBlock, PsiMethod.class, true, PsiClass.class, PsiLambdaExpression.class);
if (method == null) return null;
List<? extends HierarchicalMethodSignature> superSignatures = method.getHierarchicalMethodSignature().getSuperSignatures();
for (HierarchicalMethodSignature superSignature : superSignatures) {
if (!superSignature.getMethod().hasModifierProperty(PsiModifier.ABSTRACT)) return method;

12
java/java-tests/testData/codeInsight/generateSuperMethodCall/afterOverrideInNestedBlock.java Normal file
View File

@@ -0,0 +1,12 @@
class s implements Runnable {
public void run() {
}
}
class Over extends s {
public void run() {
if (true) {
super.run();
}
}
}

11
java/java-tests/testData/codeInsight/generateSuperMethodCall/beforeOverrideInNestedBlock.java Normal file
View File

@@ -0,0 +1,11 @@
class s implements Runnable {
public void run() {
}
}
class Over extends s {
public void run() {
if (true) {
<caret>}
}
}

1
java/java-tests/testSrc/com/intellij/codeInsight/GenerateSuperMethodCallTest.java
View File

@@ -35,6 +35,7 @@ public class GenerateSuperMethodCallTest extends LightCodeInsightTestCase {
public void testImplement() throws Exception { doTest(); }
public void testOverride() throws Exception { doTest(); }
public void testOverrideInNestedBlock() throws Exception { doTest(); }
private void doTest() throws Exception {