Default error node handling for existing visitors

SpontanCombust · Aug 10, 2024 · 4b79dc2 · 4b79dc2
1 parent 8bb5bc5
commit 4b79dc2
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 4 deletions.
diff --git a/crates/analysis/src/jobs/syntax_analysis/syntax_error_visitor.rs b/crates/analysis/src/jobs/syntax_analysis/syntax_error_visitor.rs
@@ -1,5 +1,5 @@
 use lsp_types::Range;
-use witcherscript::{Script, SyntaxError, SyntaxNode};
+use witcherscript::{ErrorNode, Script, SyntaxError, SyntaxNode};
 use witcherscript::tokens::*;
 use witcherscript::ast::*;
 use witcherscript_diagnostics::*;
@@ -771,4 +771,9 @@ impl SyntaxNodeVisitor for SyntaxErrorVisitor<'_> {
     }
 
     // No point in checking single token expressions
+
+
+    fn visit_error(&mut self, _n: &ErrorNode, _ctx: &TraversalContextStack) -> ErrorTraversalPolicy {
+        TraversalPolicy::default_to(false)
+    }
 }
diff --git a/crates/analysis/src/symbol_analysis/unqualified_name_lookup.rs b/crates/analysis/src/symbol_analysis/unqualified_name_lookup.rs
@@ -1,4 +1,5 @@
 use std::{cell::RefCell, collections::HashMap, hash::Hash, rc::Rc};
+use witcherscript::ErrorNode;
 use witcherscript::{ast::*, attribs::*, script_document::ScriptDocument};
 use crate::utils::SymbolPathBuilderPayload;
 use super::symbol_path::{SymbolPath, SymbolPathBuf};
@@ -487,6 +488,11 @@ impl SyntaxNodeVisitor for UnqualifiedNameLookupBuilder<'_> {
 
         TraversalPolicy::default_to(true)
     }
+
+
+    fn visit_error(&mut self, _n: &ErrorNode, _ctx: &TraversalContextStack) -> ErrorTraversalPolicy {
+        TraversalPolicy::default_to(false)
+    }
 }
 
 impl SyntaxNodeVisitorChainLink for UnqualifiedNameLookupBuilder<'_> {}
diff --git a/crates/analysis/src/utils/visitors/expr_evaluator.rs b/crates/analysis/src/utils/visitors/expr_evaluator.rs
@@ -1,5 +1,5 @@
 use std::{cell::RefCell, rc::Rc};
-use witcherscript::{ast::*, tokens::*, script_document::ScriptDocument};
+use witcherscript::{ast::*, script_document::ScriptDocument, tokens::*, ErrorNode};
 use crate::symbol_analysis::{symbol_path::{SymbolPath, SymbolPathBuf}, symbol_table::marcher::SymbolTableMarcher, symbols::*, unqualified_name_lookup::UnqualifiedNameLookup};
 use super::SymbolPathBuilderPayload;
 
@@ -408,4 +408,9 @@ impl SyntaxNodeVisitor for ExpressionEvaluator<'_> {
 
         self.push(conseq_path, ctx.top());
     }
+
+
+    fn visit_error(&mut self, _n: &ErrorNode, _ctx: &TraversalContextStack) -> ErrorTraversalPolicy {
+        TraversalPolicy::default_to(false)
+    }
 }
diff --git a/crates/analysis/src/utils/visitors/sympath_builder.rs b/crates/analysis/src/utils/visitors/sympath_builder.rs
@@ -1,5 +1,5 @@
 use std::{cell::RefCell, rc::Rc};
-use witcherscript::{ast::*, script_document::ScriptDocument};
+use witcherscript::{ast::*, script_document::ScriptDocument, ErrorNode};
 use crate::symbol_analysis::{symbol_path::SymbolPathBuf, symbols::*};
 
 
@@ -132,6 +132,11 @@ impl SyntaxNodeVisitor for SymbolPathBuilder<'_> {
     fn exit_event_decl(&mut self, _: &EventDeclarationNode, _: &TraversalContextStack) {
         self.payload.borrow_mut().current_sympath.pop();
     }
+
+
+    fn visit_error(&mut self, _n: &ErrorNode, _ctx: &TraversalContextStack) -> ErrorTraversalPolicy {
+        TraversalPolicy::default_to(false)
+    }
 }
 
 impl SyntaxNodeVisitorChainLink for SymbolPathBuilder<'_> {}
diff --git a/crates/lsp/src/providers/common.rs b/crates/lsp/src/providers/common.rs
@@ -1,5 +1,6 @@
 use std::{cell::RefCell, rc::Rc};
 use tower_lsp::lsp_types as lsp;
+use witcherscript::ErrorNode;
 use witcherscript::{ast::*, script_document::ScriptDocument, tokens::*};
 use witcherscript_analysis::symbol_analysis::symbol_table::marcher::SymbolTableMarcher;
 use witcherscript_analysis::symbol_analysis::symbols::*;
@@ -534,6 +535,11 @@ impl SyntaxNodeVisitor for TextDocumentPositionResolver<'_> {
 
         TraversalPolicy::default_to(true)
     }
+
+
+    fn visit_error(&mut self, _n: &ErrorNode, _ctx: &TraversalContextStack) -> ErrorTraversalPolicy {
+        TraversalPolicy::default_to(false)
+    }
 }
 
 impl SyntaxNodeVisitorChainLink for TextDocumentPositionResolver<'_> {}

diff --git a/crates/lsp/src/providers/selection_range.rs b/crates/lsp/src/providers/selection_range.rs
@@ -2,7 +2,7 @@ use std::{cell::RefCell, rc::Rc};
 use tower_lsp::lsp_types as lsp;
 use tower_lsp::jsonrpc::Result;
 use abs_path::AbsPath;
-use witcherscript::{ast::*, tokens::*};
+use witcherscript::{ast::*, tokens::*, ErrorNode};
 use witcherscript_analysis::utils::{PositionFilter, PositionFilterPayload};
 use crate::Backend;
 
@@ -632,6 +632,11 @@ impl SyntaxNodeVisitor for SelectionRangeResolver {
     fn visit_virtual_parent_expr(&mut self, n: &VirtualParentExpressionNode, _: &TraversalContextStack) {
         self.range_stack.push(n.range());
     }
+
+
+    fn visit_error(&mut self, _n: &ErrorNode, _ctx: &TraversalContextStack) -> ErrorTraversalPolicy {
+        TraversalPolicy::default_to(false)
+    }
 }
 
 impl SyntaxNodeVisitorChainLink for SelectionRangeResolver {}