From 3c0aea6c527b8c23dd0ad4a26a299d909ccfb10c Mon Sep 17 00:00:00 2001
From: Oleksandr Shvets <oleksandr.shvets@icloud.com>
Date: Sun, 10 Mar 2024 18:08:07 +0200
Subject: [PATCH] rewrite xpath rule and add some test cases

---
 .../category/ecmascript/codestyle.xml         | 26 ++++++++-----------
 .../rule/codestyle/xml/UnnecessaryBlock.xml   | 17 +++++++++++-
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml b/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
index bb224fd2c1..974cf52bc8 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
@@ -222,21 +222,17 @@ be misleading.  Considering removing this unnecessary Block.
         <priority>3</priority>
         <properties>
             <property name="xpath">
-                <value>
-<![CDATA[
-//(Block|Scope)
-    [not(
-        parent::FunctionNode or
-        parent::IfStatement or
-        parent::ForLoop or
-        parent::ForInLoop or
-        parent::WhileLoop or
-        parent::DoLoop or
-        parent::TryStatement or
-        parent::CatchClause 
-    )]
-]]>
-                </value>
+                <value><![CDATA[
+                    //Scope[
+                        count(ancestor::*) = 1
+                        and not(preceding::EmptyStatement)
+                    ]
+                    | //SwitchCase[./Scope]
+                    | //(Scope|Block)[
+                        ./(Scope|Block)
+                        and count(./*) = 1
+                    ]
+                ]]></value>
             </property>
         </properties>
         <example>
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/xml/UnnecessaryBlock.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/xml/UnnecessaryBlock.xml
index 5a244741a0..e84b60894f 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/xml/UnnecessaryBlock.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/xml/UnnecessaryBlock.xml
@@ -174,13 +174,18 @@ do {
 
     <test-code>
         <description>Bad, switch</description>
-        <expected-problems>1</expected-problems>
+        <expected-problems>2</expected-problems>
         <code><![CDATA[
 switch(1) {
     case 1:
         {
         }
         break;
+    case 2:
+        {
+            1 + 2;
+        }
+        return;
 }
         ]]></code>
     </test-code>
@@ -241,4 +246,14 @@ let a, b, a1, b1, c, d, rest, pop, push;
 function fn( ({arg}) ){ return arg}
         ]]></code>
     </test-code>
+    <test-code>
+        <description>not using semicolons case</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+import { foo } from './someScript.js' // missing semicolon
+const { isLoggedIn } = useAuth();  // <--- violation here: unnecessary block
+import { foo2 } from './someScript2.js'; 
+const { isLoggedIn2 } = useAuth2()  //
+        ]]></code>
+    </test-code>
 </test-data>