From 79ca3921c3ec86f5602f5c9e5aeb3756c2e9fb6b Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@jetbrains.com>
Date: Mon, 17 Jan 2005 19:39:39 +0300
Subject: [PATCH] (no message)

---
 .../verbose/UnnecessaryBlockStatementInspection.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryBlockStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryBlockStatementInspection.java
index e9d6a6236a8d..02c3bf529b2d 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryBlockStatementInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryBlockStatementInspection.java
@@ -71,9 +71,6 @@ public class UnnecessaryBlockStatementInspection extends StatementInspection {
         public void visitBlockStatement(PsiBlockStatement blockStatement) {
             super.visitBlockStatement(blockStatement);
             final PsiElement parent = blockStatement.getParent();
-            if (parent == null) {
-                return;
-            }
             if (!(parent instanceof PsiCodeBlock)) {
                 return;
             }
@@ -85,7 +82,7 @@ public class UnnecessaryBlockStatementInspection extends StatementInspection {
             if (brace == null) {
                 return;
             }
-            if (containsDeclarations(blockStatement)) {
+            if (((PsiCodeBlock)parent).getStatements().length > 1 && containsDeclarations(codeBlock)) {
                 return;
             }
             registerError(brace);
@@ -95,9 +92,8 @@ public class UnnecessaryBlockStatementInspection extends StatementInspection {
             }
         }
 
-        private static boolean containsDeclarations(PsiBlockStatement blockStatement) {
-            final PsiCodeBlock codeBlock = blockStatement.getCodeBlock();
-            final PsiStatement[] statements = codeBlock.getStatements();
+        private static boolean containsDeclarations(PsiCodeBlock block) {
+          final PsiStatement[] statements = block.getStatements();
             if (statements == null) {
                 return false;
             }