MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-05 16:36:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-224056 - handle unused local declarations in lambda expressions

Browse Source 
GitOrigin-RevId: 5861b958e9ca05deec08ec9ae8f271b60a6b8a16
This commit is contained in:
Ilyas Selimov
2020-11-25 13:23:17 +07:00
committed by intellij-monorepo-bot
parent 221b986314
commit 12b7de5e77
3 changed files with 92 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java
View File

@@ -259,50 +259,49 @@ public class UnusedDeclarationInspection extends UnusedDeclarationInspectionBase
PsiCodeBlock bodySourcePsi = ObjectUtils.tryCast(body.getSourcePsi(), PsiCodeBlock.class);
if (bodySourcePsi == null) return;
Tools tools = myTools.get(getShortName());
if (tools.isEnabled(bodySourcePsi)) {
InspectionToolWrapper toolWrapper = tools.getInspectionTool(bodySourcePsi);
InspectionToolPresentation presentation = myContext.getPresentation(toolWrapper);
if (((UnusedDeclarationInspection)toolWrapper.getTool()).getSharedLocalInspectionTool().LOCAL_VARIABLE) {
List<CommonProblemDescriptor> descriptors = new ArrayList<>();
if (!tools.isEnabled(bodySourcePsi)) return;
InspectionToolWrapper toolWrapper = tools.getInspectionTool(bodySourcePsi);
InspectionToolPresentation presentation = myContext.getPresentation(toolWrapper);
if (((UnusedDeclarationInspection)toolWrapper.getTool()).getSharedLocalInspectionTool().LOCAL_VARIABLE) {
List<CommonProblemDescriptor> descriptors = new ArrayList<>();
findUnusedLocalVariablesInCodeBlock(bodySourcePsi, descriptors);
if (!descriptors.isEmpty()) {
presentation.addProblemElement(refElement, descriptors.toArray(CommonProblemDescriptor.EMPTY_ARRAY));
}
}
}
final Set<PsiVariable> usedVariables = new THashSet<>();
List<DefUseUtil.Info> unusedDefs = DefUseUtil.getUnusedDefs(bodySourcePsi, usedVariables);
if (unusedDefs != null && !unusedDefs.isEmpty()) {
for (DefUseUtil.Info info : unusedDefs) {
PsiElement parent = info.getContext();
PsiVariable psiVariable = info.getVariable();
if (parent instanceof PsiDeclarationStatement || parent instanceof PsiResourceVariable) {
if (!info.isRead() && !SuppressionUtil.inspectionResultSuppressed(psiVariable, UnusedDeclarationInspection.this)) {
descriptors.add(createProblemDescriptor(psiVariable));
}
}
private void findUnusedLocalVariablesInCodeBlock(@NotNull PsiCodeBlock codeBlock, @NotNull List<CommonProblemDescriptor> descriptors) {
Set<PsiVariable> usedVariables = new THashSet<>();
List<DefUseUtil.Info> unusedDefs = DefUseUtil.getUnusedDefs(codeBlock, usedVariables);
if (unusedDefs != null && !unusedDefs.isEmpty()) {
for (DefUseUtil.Info varDefInfo : unusedDefs) {
PsiElement parent = varDefInfo.getContext();
PsiVariable psiVariable = varDefInfo.getVariable();
if (parent instanceof PsiDeclarationStatement || parent instanceof PsiResourceVariable) {
if (!varDefInfo.isRead() && !SuppressionUtil.inspectionResultSuppressed(psiVariable, UnusedDeclarationInspection.this)) {
descriptors.add(createProblemDescriptor(psiVariable));
}
}
bodySourcePsi.accept(new JavaRecursiveElementWalkingVisitor() {
@Override
public void visitClass(PsiClass aClass) { }
@Override
public void visitLambdaExpression(PsiLambdaExpression expression) {} //todo
@Override
public void visitLocalVariable(PsiLocalVariable variable) {
if (!usedVariables.contains(variable) && variable.getInitializer() == null &&
!SuppressionUtil.inspectionResultSuppressed(variable, UnusedDeclarationInspection.this)) {
descriptors.add(createProblemDescriptor(variable));
}
}
});
if (!descriptors.isEmpty()) {
presentation.addProblemElement(refElement, descriptors.toArray(CommonProblemDescriptor.EMPTY_ARRAY));
}
}
}
codeBlock.accept(new JavaRecursiveElementWalkingVisitor() {
@Override
public void visitLambdaExpression(PsiLambdaExpression lambdaExpr) {
PsiCodeBlock lambdaBody = ObjectUtils.tryCast(lambdaExpr.getBody(), PsiCodeBlock.class);
if (lambdaBody != null) {
findUnusedLocalVariablesInCodeBlock(lambdaBody, descriptors);
}
}
@Override
public void visitLocalVariable(PsiLocalVariable variable) {
if (!usedVariables.contains(variable) && variable.getInitializer() == null &&
!SuppressionUtil.inspectionResultSuppressed(variable, UnusedDeclarationInspection.this)) {
descriptors.add(createProblemDescriptor(variable));
}
}
});
}
private ProblemDescriptor createProblemDescriptor(PsiVariable psiVariable) {