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

quick fix to convert empty anonymous class to the plain new expression

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-01-22 15:02:21 +03:00
parent 1767a3ecbf
commit 5f67dd2d84
4 changed files with 82 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeCurlyBraces/after1.java Normal file
View File

@@ -0,0 +1,5 @@
// "Remove '{}'" "true"
class X {
Object o = new <caret>X();
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeCurlyBraces/before1.java Normal file
View File

@@ -0,0 +1,9 @@
// "Remove '{}'" "true"
class X {
Object o = new <caret>X() {
};
}

25
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/RemoveCurlyBracesFixTest.java Normal file
View File

@@ -0,0 +1,25 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.java.codeInsight.daemon.quickFix;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
import com.intellij.codeInspection.LocalInspectionTool;
import com.siyeh.ig.classlayout.EmptyClassInspection;
import org.jetbrains.annotations.NotNull;
public class RemoveCurlyBracesFixTest extends LightQuickFixParameterizedTestCase {
@NotNull
@Override
protected LocalInspectionTool[] configureLocalInspectionTools() {
return new LocalInspectionTool[]{new EmptyClassInspection()};
}
public void test() {
doAllTests();
}
@Override
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/removeCurlyBraces";
}
}

45
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/EmptyClassInspectionBase.java
View File

@@ -2,6 +2,10 @@
package com.siyeh.ig.classlayout;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.psi.*;
import com.intellij.psi.util.FileTypeUtils;
@@ -14,9 +18,13 @@ import com.siyeh.ig.InspectionGadgetsFix;
import com.siyeh.ig.fixes.AddToIgnoreIfAnnotatedByListQuickFix;
import com.siyeh.ig.ui.ExternalizableStringSet;
import org.jdom.Element;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
public class EmptyClassInspectionBase extends BaseInspection {
@SuppressWarnings("PublicField")
public final ExternalizableStringSet ignorableAnnotations = new ExternalizableStringSet();
@@ -63,7 +71,12 @@ public class EmptyClassInspectionBase extends BaseInspection {
if (!(info instanceof PsiModifierListOwner)) {
return InspectionGadgetsFix.EMPTY_ARRAY;
}
return AddToIgnoreIfAnnotatedByListQuickFix.build((PsiModifierListOwner)info, ignorableAnnotations);
List<InspectionGadgetsFix> fixes =
AddToIgnoreIfAnnotatedByListQuickFix.build((PsiModifierListOwner)info, ignorableAnnotations, new ArrayList<>());
if (info instanceof PsiAnonymousClass) {
fixes.add(0, new ConvertEmptyAnonymousToNewFix());
}
return fixes.toArray(InspectionGadgetsFix.EMPTY_ARRAY);
}
@Override
@@ -72,7 +85,6 @@ public class EmptyClassInspectionBase extends BaseInspection {
}
private class EmptyClassVisitor extends BaseInspectionVisitor {
@Override
public void visitFile(PsiFile file) {
super.visitFile(file);
@@ -179,4 +191,33 @@ public class EmptyClassInspectionBase extends BaseInspection {
return false;
}
}
private static class ConvertEmptyAnonymousToNewFix extends InspectionGadgetsFix {
@Override
protected void doFix(Project project, ProblemDescriptor descriptor) {
PsiElement element = descriptor.getPsiElement();
if (element == null) return;
PsiElement parent = element.getParent();
if (!(parent instanceof PsiAnonymousClass)) return;
PsiAnonymousClass aClass = (PsiAnonymousClass)parent;
PsiElement lBrace = aClass.getLBrace();
PsiElement rBrace = aClass.getRBrace();
if (lBrace != null && rBrace != null) {
WriteCommandAction.runWriteCommandAction(project, ()-> {
PsiElement prev = lBrace.getPrevSibling();
PsiElement start = prev instanceof PsiWhiteSpace ? prev : lBrace;
Document document = PsiDocumentManager.getInstance(project).getDocument(aClass.getContainingFile());
if (document == null) return;
document.deleteString(start.getTextRange().getStartOffset(), rBrace.getTextRange().getEndOffset());
});
}
}
@Nls
@NotNull
@Override
public String getFamilyName() {
return "Remove '{}'";
}
}
}