From 2a97201680c7495ccb7999a26aceb74fb149ba9f Mon Sep 17 00:00:00 2001 From: Adam Simon Date: Sun, 24 Apr 2022 21:26:52 +0200 Subject: [PATCH 1/3] Add missing visitation of ExportAllDeclaration.Exported --- src/Esprima/Utils/AstVisitor.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Esprima/Utils/AstVisitor.cs b/src/Esprima/Utils/AstVisitor.cs index 1033aaf6..3a6bb28a 100644 --- a/src/Esprima/Utils/AstVisitor.cs +++ b/src/Esprima/Utils/AstVisitor.cs @@ -315,6 +315,11 @@ protected internal virtual void VisitExportDefaultDeclaration(ExportDefaultDecla protected internal virtual void VisitExportAllDeclaration(ExportAllDeclaration exportAllDeclaration) { + if (exportAllDeclaration.Exported is not null) + { + Visit(exportAllDeclaration.Exported); + } + Visit(exportAllDeclaration.Source); } From 02d9be8bbc91a47c5bf167b82259b3829421ee23 Mon Sep 17 00:00:00 2001 From: Adam Simon Date: Sun, 24 Apr 2022 22:02:05 +0200 Subject: [PATCH 2/3] Remove AstVisitor.VisitStaticBlock as it is redundant --- src/Esprima/Ast/StaticBlock.cs | 9 +-------- src/Esprima/Utils/AstVisitor.cs | 9 --------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/Esprima/Ast/StaticBlock.cs b/src/Esprima/Ast/StaticBlock.cs index cd0d1d02..fc7de066 100644 --- a/src/Esprima/Ast/StaticBlock.cs +++ b/src/Esprima/Ast/StaticBlock.cs @@ -1,16 +1,9 @@ -using Esprima.Utils; - -namespace Esprima.Ast +namespace Esprima.Ast { public sealed class StaticBlock : BlockStatement { public StaticBlock(in NodeList body) : base(body, Nodes.StaticBlock) { } - - protected internal override void Accept(AstVisitor visitor) - { - visitor.VisitStaticBlock(this); - } } } diff --git a/src/Esprima/Utils/AstVisitor.cs b/src/Esprima/Utils/AstVisitor.cs index 3a6bb28a..4d178fb9 100644 --- a/src/Esprima/Utils/AstVisitor.cs +++ b/src/Esprima/Utils/AstVisitor.cs @@ -593,14 +593,5 @@ protected internal virtual void VisitBlockStatement(BlockStatement blockStatemen Visit(body[i]); } } - - protected internal virtual void VisitStaticBlock(StaticBlock blockStatement) - { - ref readonly var body = ref blockStatement.Body; - for (var i = 0; i < body.Count; i++) - { - Visit(body[i]); - } - } } } From 123fc1ff581ddeddedd66d067df264f6b424b667 Mon Sep 17 00:00:00 2001 From: Adam Simon Date: Sun, 24 Apr 2022 22:03:36 +0200 Subject: [PATCH 3/3] Code style consistency --- src/Esprima/Utils/AstVisitor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Esprima/Utils/AstVisitor.cs b/src/Esprima/Utils/AstVisitor.cs index 4d178fb9..af0c1f3a 100644 --- a/src/Esprima/Utils/AstVisitor.cs +++ b/src/Esprima/Utils/AstVisitor.cs @@ -350,7 +350,7 @@ protected internal virtual void VisitExportSpecifier(ExportSpecifier exportSpeci protected internal virtual void VisitImport(Import import) { - if (import.Source != null) + if (import.Source is not null) { Visit(import.Source); }