chore(core): rename check_destructuring_match function

software-mansion · Aug 12, 2024 · 5bd9a81 · 5bd9a81
1 parent a209b17
commit 5bd9a81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/crates/cairo-lint-core/src/lints/single_match.rs b/crates/cairo-lint-core/src/lints/single_match.rs
@@ -26,7 +26,8 @@ fn tuple_expr_in_block_expr(
         None
     }
 }
-pub fn check_destruct_match(db: &dyn SyntaxGroup, match_expr: &ExprMatch, diagnostics: &mut Vec<PluginDiagnostic>) {
+
+pub fn check_single_match(db: &dyn SyntaxGroup, match_expr: &ExprMatch, diagnostics: &mut Vec<PluginDiagnostic>) {
     let arms = match_expr.arms(db).elements(db);
     let mut is_single_armed = false;
     let mut is_destructuring = false;
@@ -43,12 +44,8 @@ pub fn check_destruct_match(db: &dyn SyntaxGroup, match_expr: &ExprMatch, diagno
                     is_single_armed =
                         tuple_expr.is_some_and(|list| list.expressions(db).elements(db).is_empty()) || is_single_armed;
                 }
-
-                Pattern::Enum(pat) => {
-                    is_destructuring = !pat.pattern(db).as_syntax_node().get_text(db).is_empty();
-                }
-                Pattern::Struct(pat) => {
-                    is_destructuring = !pat.as_syntax_node().get_text(db).is_empty();
+                Pattern::Enum(_) | Pattern::Struct(_) => {
+                    is_destructuring = true;
                 }
                 _ => (),
             };

diff --git a/crates/cairo-lint-core/src/plugin.rs b/crates/cairo-lint-core/src/plugin.rs
@@ -45,7 +45,7 @@ impl AnalyzerPlugin for CairoLint {
                     let descendants = func.as_syntax_node().descendants(db.upcast());
                     for descendant in descendants.into_iter() {
                         match descendant.kind(db.upcast()) {
-                            SyntaxKind::ExprMatch => single_match::check_destruct_match(
+                            SyntaxKind::ExprMatch => single_match::check_single_match(
                                 db.upcast(),
                                 &ExprMatch::from_syntax_node(db.upcast(), descendant),
                                 &mut diags,