Fixed return statements traversal + added unnamed node traversal in c…

…ompound statement
SpontanCombust · Aug 22, 2024 · 745699e · 745699e
1 parent 0eb0562
commit 745699e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/crates/analysis/src/jobs/scan_symbols.rs b/crates/analysis/src/jobs/scan_symbols.rs
@@ -804,6 +804,7 @@ impl SyntaxNodeVisitor for SymbolScannerVisitor<'_> {
     fn visit_compound_stmt(&mut self, _: &CompoundStatementNode, _: &TraversalContextStack) -> CompoundStatementTraversalPolicy {
         CompoundStatementTraversalPolicy { 
             traverse_statements: true,
+            traverse_unnamed: false,
             traverse_errors: false
         }
     }

diff --git a/crates/analysis/src/jobs/syntax_analysis/contextual_analysis.rs b/crates/analysis/src/jobs/syntax_analysis/contextual_analysis.rs
@@ -545,6 +545,7 @@ impl SyntaxNodeVisitor for ContextualSyntaxAnalysis<'_> {
 
         CompoundStatementTraversalPolicy {
             traverse_statements: true,
+            traverse_unnamed: false,
             traverse_errors: false
         }
     }

diff --git a/crates/analysis/src/jobs/syntax_analysis/syntax_error_visitor.rs b/crates/analysis/src/jobs/syntax_analysis/syntax_error_visitor.rs
@@ -433,6 +433,7 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
 
         CompoundStatementTraversalPolicy { 
             traverse_statements: any_error,
+            traverse_unnamed: any_error,
             traverse_errors: any_error
         }
     }

diff --git a/crates/core/src/ast/misc_stmts.rs b/crates/core/src/ast/misc_stmts.rs
@@ -154,7 +154,7 @@ impl SyntaxNodeTraversal for ReturnStatementNode<'_> {
 
             for ch in self.children_detailed() {
                 match ch {
-                    Ok((value, _)) if tp.traverse_value => {
+                    Ok((value, _)) if value.is_named() && tp.traverse_value => {
                         let value: ExpressionNode = value.unsafe_into();
                         value.accept(visitor, ctx);
                     },
@@ -283,13 +283,16 @@ impl SyntaxNodeTraversal for CompoundStatementNode<'_> {
         if tp.any() {
             ctx.push(TraversalContext::CompoundStatement);
 
-            for ch in self.children_detailed().must_be_named(true) {
+            for ch in self.children_detailed() {
                 match ch {
-                    Ok((stmt, _)) if tp.traverse_statements => {
+                    Ok((stmt, _)) if stmt.is_named() && tp.traverse_statements => {
                         let stmt: FunctionStatementNode = stmt.unsafe_into();
-
                         stmt.accept(visitor, ctx);
                     },
+                    Ok((unnamed, _)) if !unnamed.is_named() && tp.traverse_unnamed => {
+                        let unnamed: UnnamedNode = unnamed.unsafe_into();
+                        unnamed.accept(visitor, ctx);
+                    },
                     Err(e) if tp.traverse_errors => {
                         e.accept(visitor, ctx);
                     },

diff --git a/crates/core/src/ast/traversal/policies.rs b/crates/core/src/ast/traversal/policies.rs
@@ -270,6 +270,7 @@ traversal_policy!(ContinueStatementTraversalPolicy,
 
 traversal_policy!(CompoundStatementTraversalPolicy,
     traverse_statements,
+    traverse_unnamed,
     traverse_errors
 );