From d5c875e9979d7bd100b52921d6f621120fa9ee76 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Wed, 4 Jul 2018 17:02:55 +0700
Subject: [PATCH] ExpandBooleanPredicate: do not report if initializer is
 parenthesized literal like (false)

---
 .../src/com/siyeh/ipp/trivialif/ExpandBooleanPredicate.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanPredicate.java
index 400b8954fb58..2873941330e8 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanPredicate.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanPredicate.java
@@ -40,7 +40,7 @@ class ExpandBooleanPredicate implements PsiElementPredicate {
       return false;
     }
     final PsiReturnStatement returnStatement = (PsiReturnStatement)statement;
-    final PsiExpression returnValue = returnStatement.getReturnValue();
+    final PsiExpression returnValue = PsiUtil.skipParenthesizedExprDown(returnStatement.getReturnValue());
     if (returnValue == null || returnValue instanceof PsiLiteralExpression) {
       return false;
     }
@@ -58,7 +58,7 @@ class ExpandBooleanPredicate implements PsiElementPredicate {
       return false;
     }
     final PsiAssignmentExpression assignment = (PsiAssignmentExpression)expression;
-    final PsiExpression rhs = assignment.getRExpression();
+    final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(assignment.getRExpression());
     if (rhs == null || rhs instanceof PsiLiteralExpression) {
       return false;
     }
@@ -80,7 +80,7 @@ class ExpandBooleanPredicate implements PsiElementPredicate {
       return false;
     }
     final PsiLocalVariable variable = (PsiLocalVariable)element;
-    final PsiExpression initializer = variable.getInitializer();
+    final PsiExpression initializer = PsiUtil.skipParenthesizedExprDown(variable.getInitializer());
     if (initializer == null || initializer instanceof PsiLiteralExpression) {
       return false;
     }