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

unused declaration: simplify clients

Browse Source
This commit is contained in:
Anna.Kozlova
2016-07-18 10:19:24 +02:00
parent fc834372fd
commit 4d40915c49
5 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionBase.java
+2 -2
View File
@@ -379,7 +379,7 @@ public class UnusedDeclarationInspectionBase extends GlobalInspectionTool {
}
if (element != null) {
for (EntryPoint extension : myExtensions) {
if (extension.isEntryPoint(owner, element)) {
if (extension.isSelected() && extension.isEntryPoint(owner, element)) {
return true;
}
}
@@ -416,7 +416,7 @@ public class UnusedDeclarationInspectionBase extends GlobalInspectionTool {
if (entryPointsManager.isEntryPoint(element)) return true;
}
for (EntryPoint extension : myExtensions) {
if (extension.isEntryPoint(element)) {
if (extension.isSelected() && extension.isEntryPoint(element)) {
return true;
}
}
java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java
+1 -1
View File
@@ -198,7 +198,7 @@ public abstract class InspectionTestCase extends PsiTestCase {
@Override
public boolean isSelected() {
return false;
return true;
}
@Override
plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxEntryPoint.java
+9 -11
View File
@@ -47,19 +47,17 @@ public class JavaFxEntryPoint extends EntryPoint {
@Override
public boolean isEntryPoint(@NotNull PsiElement psiElement) {
if (ADD_JAVAFX_TO_ENTRIES) {
if (psiElement instanceof PsiMethod) {
final PsiMethod method = (PsiMethod)psiElement;
if (method.getParameterList().getParameters().length == 1 &&
PsiType.VOID.equals(method.getReturnType()) &&
"start".equals(method.getName())) {
return InheritanceUtil.isInheritor(method.getContainingClass(), true, JavaFxCommonNames.JAVAFX_APPLICATION_APPLICATION);
}
}
else if (psiElement instanceof PsiClass) {
return InheritanceUtil.isInheritor((PsiClass)psiElement, true, JavaFxCommonNames.JAVAFX_APPLICATION_APPLICATION);
if (psiElement instanceof PsiMethod) {
final PsiMethod method = (PsiMethod)psiElement;
if (method.getParameterList().getParameters().length == 1 &&
PsiType.VOID.equals(method.getReturnType()) &&
"start".equals(method.getName())) {
return InheritanceUtil.isInheritor(method.getContainingClass(), true, JavaFxCommonNames.JAVAFX_APPLICATION_APPLICATION);
}
}
else if (psiElement instanceof PsiClass) {
return InheritanceUtil.isInheritor((PsiClass)psiElement, true, JavaFxCommonNames.JAVAFX_APPLICATION_APPLICATION);
}
return false;
}
plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java
+22 -24
View File
@@ -51,34 +51,32 @@ public class JUnitEntryPoint extends EntryPoint {
@Override
public boolean isEntryPoint(@NotNull PsiElement psiElement) {
if (ADD_JUNIT_TO_ENTRIES) {
if (psiElement instanceof PsiClass) {
final PsiClass aClass = (PsiClass)psiElement;
if (JUnitUtil.isTestClass(aClass, false, true)) {
final boolean isJUnit5 = JUnitUtil.isJUnit5(aClass);
if (!PsiClassUtil.isRunnableClass(aClass, !isJUnit5, true)) {
final PsiClass topLevelClass = PsiTreeUtil.getTopmostParentOfType(aClass, PsiClass.class);
if (topLevelClass != null && PsiClassUtil.isRunnableClass(topLevelClass, !isJUnit5, true)) {
return true;
}
final CommonProcessors.FindProcessor<PsiClass> findProcessor = new CommonProcessors.FindProcessor<PsiClass>() {
@Override
protected boolean accept(PsiClass psiClass) {
return !psiClass.hasModifierProperty(PsiModifier.ABSTRACT);
}
};
return !ClassInheritorsSearch.search(aClass).forEach(findProcessor) && findProcessor.isFound();
if (psiElement instanceof PsiClass) {
final PsiClass aClass = (PsiClass)psiElement;
if (JUnitUtil.isTestClass(aClass, false, true)) {
final boolean isJUnit5 = JUnitUtil.isJUnit5(aClass);
if (!PsiClassUtil.isRunnableClass(aClass, !isJUnit5, true)) {
final PsiClass topLevelClass = PsiTreeUtil.getTopmostParentOfType(aClass, PsiClass.class);
if (topLevelClass != null && PsiClassUtil.isRunnableClass(topLevelClass, !isJUnit5, true)) {
return true;
}
return true;
final CommonProcessors.FindProcessor<PsiClass> findProcessor = new CommonProcessors.FindProcessor<PsiClass>() {
@Override
protected boolean accept(PsiClass psiClass) {
return !psiClass.hasModifierProperty(PsiModifier.ABSTRACT);
}
};
return !ClassInheritorsSearch.search(aClass).forEach(findProcessor) && findProcessor.isFound();
}
return true;
}
else if (psiElement instanceof PsiMethod) {
final PsiMethod method = (PsiMethod)psiElement;
if (method.isConstructor() && method.getParameterList().getParametersCount() == 0) {
return JUnitUtil.isTestClass(method.getContainingClass());
}
if (JUnitUtil.isTestMethodOrConfig(method)) return true;
}
else if (psiElement instanceof PsiMethod) {
final PsiMethod method = (PsiMethod)psiElement;
if (method.isConstructor() && method.getParameterList().getParametersCount() == 0) {
return JUnitUtil.isTestClass(method.getContainingClass());
}
if (JUnitUtil.isTestMethodOrConfig(method)) return true;
}
return false;
}
plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGEntryPoint.java
+3 -5
View File
@@ -54,11 +54,9 @@ public class TestNGEntryPoint extends EntryPoint {
@Override
public boolean isEntryPoint(@NotNull PsiElement psiElement) {
if (ADD_TESTNG_TO_ENTRIES) {
if (psiElement instanceof PsiModifierListOwner) {
if (TestNGUtil.hasTest((PsiModifierListOwner)psiElement, false, false, TestNGUtil.hasDocTagsSupport)) return true;
return TestNGUtil.hasConfig((PsiModifierListOwner)psiElement);
}
if (psiElement instanceof PsiModifierListOwner) {
if (TestNGUtil.hasTest((PsiModifierListOwner)psiElement, false, false, TestNGUtil.hasDocTagsSupport)) return true;
return TestNGUtil.hasConfig((PsiModifierListOwner)psiElement);
}
return false;
}