From f1f118ccc5101291b21d36618e2cf1291c6fe195 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 10 Jul 2018 13:31:57 +0700 Subject: [PATCH] SynchronizeOnNonFinalFieldInspection: deparenthesize --- .../threading/SynchronizeOnNonFinalFieldInspection.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnNonFinalFieldInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnNonFinalFieldInspection.java index ddf4e788f029..64f3dad7841b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnNonFinalFieldInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizeOnNonFinalFieldInspection.java @@ -16,6 +16,7 @@ package com.siyeh.ig.threading; import com.intellij.psi.*; +import com.intellij.psi.util.PsiUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -64,15 +65,11 @@ public class SynchronizeOnNonFinalFieldInspection extends BaseInspection { public void visitSynchronizedStatement( @NotNull PsiSynchronizedStatement statement) { super.visitSynchronizedStatement(statement); - final PsiExpression lockExpression = statement.getLockExpression(); + final PsiExpression lockExpression = PsiUtil.skipParenthesizedExprDown(statement.getLockExpression()); if (!(lockExpression instanceof PsiReferenceExpression)) { return; } - final PsiReference reference = lockExpression.getReference(); - if (reference == null) { - return; - } - final PsiElement element = reference.resolve(); + final PsiElement element = ((PsiReferenceExpression)lockExpression).resolve(); if (!(element instanceof PsiField)) { return; }