From 7b845b5a86808161a203c8fa21711e489635673c Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Wed, 10 Feb 2016 12:28:11 +0100 Subject: [PATCH] IG: ignore more parentheses --- ...ogStatementGuardedByLogConditionInspectionBase.java | 10 +++------- .../LogStatementGuardedByLogCondition.java | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspectionBase.java index 0413d835f139..d1e8af34d6fd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspectionBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; +import com.siyeh.ig.psiutils.ParenthesesUtils; import com.siyeh.ig.psiutils.TypeUtils; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -196,9 +197,6 @@ public class LogStatementGuardedByLogConditionInspectionBase extends BaseInspect return; } final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (qualifier == null) { - return; - } if (!TypeUtils.expressionHasTypeOrSubtype(qualifier, loggerClassName)) { return; } @@ -240,13 +238,11 @@ public class LogStatementGuardedByLogConditionInspectionBase extends BaseInspect } private boolean isLogGuardCheck(@Nullable PsiExpression expression, String logMethodName) { + expression = ParenthesesUtils.stripParentheses(expression); if (expression instanceof PsiMethodCallExpression) { final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (qualifier == null) { - return false; - } if (!TypeUtils.expressionHasTypeOrSubtype(qualifier, loggerClassName)) { return false; } diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/logging/log_statement_guarded_by_log_condition/LogStatementGuardedByLogCondition.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/logging/log_statement_guarded_by_log_condition/LogStatementGuardedByLogCondition.java index 4519e6e5c42c..956e3a97d09a 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/logging/log_statement_guarded_by_log_condition/LogStatementGuardedByLogCondition.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/logging/log_statement_guarded_by_log_condition/LogStatementGuardedByLogCondition.java @@ -5,7 +5,7 @@ public class LogStatementGuardedByLogCondition { private static final Logger LOG = Logger.getLogger("log"); void guarded(Object object) { - if (LOG.isDebug()) { + if (((LOG.isDebug()))) { if (true) { if (true) { LOG.debug("really expensive logging" + object);