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: ensure unused local variables are reported inside entry points; suppress works for locals (IDEA-166622)

Browse Source
This commit is contained in:
Anna Kozlova
2017-01-18 11:21:34 +03:00
parent f616471fdb
commit 5a23cba5fa
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java
+3 -2
View File
@@ -284,7 +284,7 @@ public class UnusedDeclarationInspection extends UnusedDeclarationInspectionBase
PsiVariable psiVariable = info.getVariable();
if (parent instanceof PsiDeclarationStatement || parent instanceof PsiResourceVariable) {
if (!info.isRead()) {
if (!info.isRead() && !SuppressionUtil.inspectionResultSuppressed(psiVariable, UnusedDeclarationInspection.this)) {
descriptors.add(createProblemDescriptor(psiVariable));
}
}
@@ -300,7 +300,8 @@ public class UnusedDeclarationInspection extends UnusedDeclarationInspectionBase
@Override
public void visitLocalVariable(PsiLocalVariable variable) {
if (!usedVariables.contains(variable) && variable.getInitializer() == null) {
if (!usedVariables.contains(variable) && variable.getInitializer() == null &&
!SuppressionUtil.inspectionResultSuppressed(variable, UnusedDeclarationInspection.this)) {
descriptors.add(createProblemDescriptor(variable));
}
}
java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java
+18
View File
@@ -27,6 +27,7 @@ import com.intellij.lang.annotation.HighlightSeverity;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -528,6 +529,23 @@ public class UnusedDeclarationPresentation extends DefaultInspectionToolPresenta
myIgnoreElements.add(refEntity);
}
@Override
public void ignoreElement(@NotNull RefEntity refEntity) {
if (refEntity instanceof RefElement) {
final CommonProblemDescriptor[] descriptors = getProblemElements().get(refEntity);
if (descriptors != null) {
final PsiElement psiElement = ReadAction.compute(() -> ((RefElement)refEntity).getElement());
List<CommonProblemDescriptor> foreignDescriptors = new ArrayList<>();
for (CommonProblemDescriptor descriptor : descriptors) {
if (descriptor instanceof ProblemDescriptor && ReadAction.compute(() -> ((ProblemDescriptor)descriptor).getPsiElement()) == psiElement) continue;
foreignDescriptors.add(descriptor);
}
if (foreignDescriptors.size() == descriptors.length) return;
}
}
super.ignoreElement(refEntity);
}
@Override
public void amnesty(RefEntity refEntity) {
myIgnoreElements.remove(refEntity);
java/java-tests/testData/inspection/deadCode/localVariables/expected.xml
+5 -1
View File
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<problems>
<problems>
<problem>
<file>A.java</file>
<description>Variable &lt;code&gt;i&lt;/code&gt; is never used</description>
</problem>
</problems>
java/java-tests/testData/inspection/deadCode/localVariables/src/A.java
+1
View File
@@ -1,6 +1,7 @@
class A {
public static void main(String[] args) {
int i = 0;
@SuppressWarning("unused") int j = 0;
}
}