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

ignore deprecation in imports; force check static (IDEA-103725)

Browse Source 
(cherry picked from commit c5f6f0512ed6e5b9bd93966b50fe878276103577)
This commit is contained in:
anna
2013-03-26 21:43:06 +01:00
parent b95a271d12
commit 4b9a363581
5 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java
+24 -9
View File
@@ -45,10 +45,11 @@ public class DeprecationInspection extends BaseJavaLocalInspectionTool {
public boolean IGNORE_INSIDE_DEPRECATED = false;
public boolean IGNORE_ABSTRACT_DEPRECATED_OVERRIDES = true;
public boolean IGNORE_IMPORT_STATEMENTS = true;
@NotNull
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
return new DeprecationElementVisitor(holder, IGNORE_INSIDE_DEPRECATED, IGNORE_ABSTRACT_DEPRECATED_OVERRIDES);
return new DeprecationElementVisitor(holder, IGNORE_INSIDE_DEPRECATED, IGNORE_ABSTRACT_DEPRECATED_OVERRIDES, IGNORE_IMPORT_STATEMENTS);
}
@NotNull
@@ -80,6 +81,7 @@ public class DeprecationInspection extends BaseJavaLocalInspectionTool {
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox("Ignore inside deprecated members", "IGNORE_INSIDE_DEPRECATED");
panel.addCheckbox("Ignore inside non-static imports", "IGNORE_IMPORT_STATEMENTS");
panel.addCheckbox("<html>Ignore overrides of deprecated abstract methods from non-deprecated supers</html>", "IGNORE_ABSTRACT_DEPRECATED_OVERRIDES");
return panel;
@@ -89,20 +91,32 @@ public class DeprecationInspection extends BaseJavaLocalInspectionTool {
private final ProblemsHolder myHolder;
private final boolean myIgnoreInsideDeprecated;
private final boolean myIgnoreAbstractDeprecatedOverrides;
private final boolean myIgnoreImportStatements;
public DeprecationElementVisitor(final ProblemsHolder holder,
boolean ignoreInsideDeprecated,
boolean ignoreAbstractDeprecatedOverrides) {
boolean ignoreAbstractDeprecatedOverrides,
boolean ignoreImportStatements) {
myHolder = holder;
myIgnoreInsideDeprecated = ignoreInsideDeprecated;
myIgnoreAbstractDeprecatedOverrides = ignoreAbstractDeprecatedOverrides;
myIgnoreImportStatements = ignoreImportStatements;
}
@Override public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
JavaResolveResult result = reference.advancedResolve(true);
PsiElement resolved = result.getElement();
checkDeprecated(resolved, reference.getReferenceNameElement(), null, myIgnoreInsideDeprecated, myHolder);
@Override
public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
JavaResolveResult result = reference.advancedResolve(true);
PsiElement resolved = result.getElement();
checkDeprecated(resolved, reference.getReferenceNameElement(), null, myIgnoreInsideDeprecated, myIgnoreImportStatements, myHolder);
}
@Override
public void visitImportStaticStatement(PsiImportStaticStatement statement) {
final PsiJavaCodeReferenceElement importReference = statement.getImportReference();
if (importReference != null) {
checkDeprecated(importReference.resolve(), importReference.getReferenceNameElement(), null, myIgnoreInsideDeprecated, false, myHolder);
}
}
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
visitReferenceElement(expression);
@@ -131,7 +145,7 @@ public class DeprecationInspection extends BaseJavaLocalInspectionTool {
PsiMethod constructor = result == null ? null : result.getElement();
if (constructor != null && expression.getClassOrAnonymousClassReference() != null) {
if (expression.getClassReference() == null && constructor.getParameterList().getParametersCount() == 0) return;
checkDeprecated(constructor, expression.getClassOrAnonymousClassReference(), null, myIgnoreInsideDeprecated, myHolder);
checkDeprecated(constructor, expression.getClassOrAnonymousClassReference(), null, myIgnoreInsideDeprecated, myIgnoreImportStatements, myHolder);
}
}
}
@@ -223,13 +237,14 @@ public class DeprecationInspection extends BaseJavaLocalInspectionTool {
PsiElement elementToHighlight,
@Nullable TextRange rangeInElement,
ProblemsHolder holder) {
checkDeprecated(refElement, elementToHighlight, rangeInElement, false, holder);
checkDeprecated(refElement, elementToHighlight, rangeInElement, false, false, holder);
}
public static void checkDeprecated(PsiElement refElement,
PsiElement elementToHighlight,
@Nullable TextRange rangeInElement,
boolean ignoreInsideDeprecated,
boolean ignoreImportStatements,
ProblemsHolder holder) {
if (!(refElement instanceof PsiDocCommentOwner)) return;
if (!((PsiDocCommentOwner)refElement).isDeprecated()) return;
@@ -241,7 +256,7 @@ public class DeprecationInspection extends BaseJavaLocalInspectionTool {
}
}
if (PsiTreeUtil.getParentOfType(elementToHighlight, PsiImportStatementBase.class) != null) {
if (ignoreImportStatements && PsiTreeUtil.getParentOfType(elementToHighlight, PsiImportStatementBase.class) != null) {
return;
}
java/java-tests/testData/inspection/deprecation/deprecatedInStaticImport/expected.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<problems>
<problem>
<file>Test.java</file>
<line>1</line>
<problem_class severity="WARNING" attribute_key="DEPRECATED_ATTRIBUTES">Deprecated API usage</problem_class>
<description>'a.A' is deprecated</description>
</problem>
</problems>
java/java-tests/testData/inspection/deprecation/deprecatedInStaticImport/src/Test.java
+6
View File
@@ -0,0 +1,6 @@
import static a.A.*;
public class Test {
{
foo();
}
}
java/java-tests/testData/inspection/deprecation/deprecatedInStaticImport/src/a/A.java
+5
View File
@@ -0,0 +1,5 @@
package a;
@Deprecated
public class A {
public static void foo(){}
}
java/java-tests/testSrc/com/intellij/codeInspection/DeprecationInspectionTest.java
+4
View File
@@ -29,6 +29,10 @@ public class DeprecationInspectionTest extends InspectionTestCase {
doTest();
}
public void testDeprecatedInStaticImport() throws Exception{
doTest();
}
public void testDeprecatedInner() throws Exception {
doTest();
}