From c3ec24079450e345a3e69cbbb502fa071224a3a4 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 14 Mar 2024 20:39:56 +0100
Subject: [PATCH] [javascript] Simplify UnnecessaryBlock rule, update tests

---
 .../category/ecmascript/codestyle.xml         | 12 ++---
 .../rule/codestyle/UnnecessaryBlockTest.java  |  2 +-
 .../rule/codestyle/xml/UnnecessaryBlock.xml   | 49 +++++++++++++++++--
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml b/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
index 974cf52bc8..055c512228 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
@@ -223,15 +223,9 @@ be misleading.  Considering removing this unnecessary Block.
         <properties>
             <property name="xpath">
                 <value><![CDATA[
-                    //Scope[
-                        count(ancestor::*) = 1
-                        and not(preceding::EmptyStatement)
-                    ]
-                    | //SwitchCase[./Scope]
-                    | //(Scope|Block)[
-                        ./(Scope|Block)
-                        and count(./*) = 1
-                    ]
+                      /AstRoot/Scope[not(preceding::EmptyStatement)]
+                    | //SwitchCase[Scope]
+                    | //(Scope|Block)[Scope|Block][count(*) = 1]
                 ]]></value>
             </property>
         </properties>
diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryBlockTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryBlockTest.java
index cc9d00a3c2..97390b04c5 100644
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryBlockTest.java
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryBlockTest.java
@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle;
 
 import net.sourceforge.pmd.test.PmdRuleTst;
 
-public class UnnecessaryBlockTest extends PmdRuleTst {
+class UnnecessaryBlockTest extends PmdRuleTst {
     // no additional unit tests
 }
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 e84b60894f..c5ed56228d 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
@@ -175,6 +175,7 @@ do {
     <test-code>
         <description>Bad, switch</description>
         <expected-problems>2</expected-problems>
+        <expected-linenumbers>2,6</expected-linenumbers>
         <code><![CDATA[
 switch(1) {
     case 1:
@@ -185,7 +186,7 @@ switch(1) {
         {
             1 + 2;
         }
-        return;
+        break;
 }
         ]]></code>
     </test-code>
@@ -208,7 +209,7 @@ try {
     </test-code>
 
     <test-code>
-        <description>Ok, destructure assigments</description>
+        <description>Ok, destructure assigments (#2305)</description>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
 import {foo} from 'bar'
@@ -246,8 +247,50 @@ 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>
+        <description>Ok, destructure assigments (#2305) - without semicolons</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+// note: this code can't be parsed by rhino, we get several syntax errors
+import {foo} from 'bar'
+
+const [a, b] = array
+const [a, , b] = array
+const [a = aDefault, b] = array
+const [a, b, ...rest] = array
+const [a, , b, ...rest] = array
+const [a, b, ...{ pop, push }] = array
+const [a, b, ...[c, d]] = array
+
+const { a, b } = obj
+const { a: a1, b: b1 } = obj
+const { a: a1 = aDefault, b = bDefault } = obj
+const { a, b, ...rest } = obj
+const { a: a1, b: b1, ...rest } = obj
+const { [key]: a } = obj
+
+let a, b, a1, b1, c, d, rest, pop, push
+[a, b] = array
+[a, , b] = array
+[a = aDefault, b] = array
+[a, b, ...rest] = array
+[a, , b, ...rest] = array
+[a, b, ...{ pop, push }] = array
+[a, b, ...[c, d]] = array
+
+({ a, b } = obj) // parentheses are required
+({ a: a1, b: b1 } = obj)
+({ a: a1 = aDefault, b = bDefault } = obj)
+({ a, b, ...rest } = obj)
+({ a: a1, b: b1, ...rest } = obj)
+
+function fn( ({arg}) ){ return arg}
+        ]]></code>
+    </test-code>
+
+    <test-code>
+        <description>not using semicolons case (#2305)</description>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
 import { foo } from './someScript.js' // missing semicolon