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

fix: check elseClause inside noUselessLoneBlockStatements #584

Merged
merged 11 commits into from
Oct 23, 2023
Merged

fix: check elseClause inside noUselessLoneBlockStatements #584

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cb1438e
refactor(linter): UseAnchorContent code action
vasucp1207 Oct 7, 2023
364f018
refactor(linter): UseAnchorContent code action
vasucp1207 Oct 7, 2023
d94d9e1
refactor(linter): UseAnchorContent code action
vasucp1207 Oct 7, 2023
5517a6b
Merge branch 'biomejs:main' into main
vasucp1207 Oct 8, 2023
0d46365
Merge branch 'biomejs:main' into main
vasucp1207 Oct 12, 2023
4d11c7c
Merge branch 'biomejs:main' into main
vasucp1207 Oct 15, 2023
aa3d3a5
Merge branch 'biomejs:main' into main
vasucp1207 Oct 19, 2023
a39dad7
Merge branch 'biomejs:main' into main
vasucp1207 Oct 22, 2023
796edc3
fix: Improper no lone statements
vasucp1207 Oct 22, 2023
65df9a0
fix: Improper no lone statements
vasucp1207 Oct 22, 2023
ebc5d6c
fix: Improper no lone statements
vasucp1207 Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/biome_js_analyze/src/analyzers/nursery/no_useless_lone_block_statements.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use biome_console::markup;
use biome_diagnostics::Applicability;
use biome_js_factory::make;
use biome_js_syntax::{
AnyJsStatement, JsBlockStatement, JsFileSource, JsLabeledStatement, JsStatementList,
JsVariableStatement,
AnyJsStatement, JsBlockStatement, JsElseClause, JsFileSource, JsLabeledStatement,
JsStatementList, JsVariableStatement,
};
use biome_rowan::{AstNode, AstNodeList, BatchMutationExt};

Expand Down Expand Up @@ -145,6 +145,11 @@ fn statement_has_block_level_declaration(statement: &AnyJsStatement, is_module:
}

fn in_control_structure(block: &JsBlockStatement) -> bool {
let syntax_kind = block.syntax().parent().unwrap().kind();
Copy link
Member

Choose a reason for hiding this comment

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

Usually we don't use unwrap in rule impl. You can use if let or:

Suggested change
let syntax_kind = block.syntax().parent().unwrap().kind();
let Some(parent) = block.syntax().parent() else { return false; };

let is_else = JsElseClause::can_cast(syntax_kind);
if is_else {
return true;
}
matches!(
block.parent(),
Some(
Expand Down
6 changes: 6 additions & 0 deletions crates/biome_js_analyze/tests/specs/nursery/noUselessLoneBlockStatements/validModule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,10 @@ function g() {

{
function foo() {}
}

if(x) {
x += 1;
} else {
x += 2;
}
6 changes: 6 additions & 0 deletions crates/biome_js_analyze/tests/specs/nursery/noUselessLoneBlockStatements/validModule.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ function g() {
{
function foo() {}
}

if(x) {
x += 1;
} else {
x += 2;
}
```