Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #2305: do not apply UnnecessaryBlock for the ECMAScript (JavaScript) destructuring assignments #4829

Closed
wants to merge 7 commits into from
Closed

fix #2305: do not apply UnnecessaryBlock for the ECMAScript (JavaScript) destructuring assignments #4829

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5247d1
do not apply UnnecessaryBlock for the ECMAScript6 destructuring varia…
oleksandr-shvets Feb 21, 2024
a015835
Update UnnecessaryBlockTest.java
oleksandr-shvets Feb 21, 2024
df55c44
add jdestructure assigments test
oleksandr-shvets Feb 21, 2024
8350de9
fix UnnecessaryBlock
oleksandr-shvets Feb 21, 2024
b01d630
revert UnnecessaryBlockTest.java
oleksandr-shvets Feb 21, 2024
3b9dcc0
Revert completly Java test
oleksandr-shvets Feb 21, 2024
0ec6a4f
simplify UnnecessaryBlock xpath rule
Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,12 @@ be misleading. Considering removing this unnecessary Block.
<value>
<![CDATA[
//Block[not(parent::FunctionNode or parent::IfStatement or parent::ForLoop or parent::ForInLoop
or parent::WhileLoop or parent::DoLoop or parent::TryStatement or parent::CatchClause)]
or parent::WhileLoop or parent::DoLoop or parent::TryStatement or parent::CatchClause)
and not(ancestor::VariableDeclarator) and not(ancestor::ImportDeclaration)]
|
//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)]
or parent::WhileLoop or parent::DoLoop or parent::TryStatement or parent::CatchClause)
and not(ancestor::VariableDeclarator) and not(ancestor::ImportDeclaration)]
]]>
</value>
</property>
Expand Down
33 changes: 27 additions & 6 deletions ...rc/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryBlockTest.java
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert the changes in this file completely

Original file line number Diff line number Diff line change
@@ -1,11 +1,32 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/

package net.sourceforge.pmd.lang.ecmascript.rule.codestyle;

import net.sourceforge.pmd.testframework.PmdRuleTst;

class UnnecessaryBlockTest extends PmdRuleTst {
// no additional unit tests
public class UnnecessaryBlockTest extends PmdRuleTst {
@Override
public void setUp() {
// Set up any required configurations or resources before running the tests
}


public void testUnnecessaryBlockInImportStatement() {
String code = "import { foo } from 'bar';\n" +
"{\n" +
" // Unnecessary block\n" +
"}\n";

// Assert that the PMD rule does not flag the unnecessary block within import statement
addSourceCodeTest(code, 0);
}

public void testUnnecessaryBlockInDestructuringAssignment() {
String code = "const { a, b } = obj;\n" +
"{\n" +
" // Unnecessary block\n" +
"}\n";

// Assert that the PMD rule does not flag the unnecessary block within destructuring assignment
addSourceCodeTest(code, 0);
}
jsotuyod marked this conversation as resolved.
Show resolved Hide resolved

}