Code cleanup before v3.0 final release (#402)

* Align file names with contained type names * dotnet format --severity warn * Remove unnecessary usings
sebastienros · Sep 3, 2023 · 0d09a22 · 0d09a22
1 parent 18f23ee
commit 0d09a22
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 6 deletions.
diff --git a/samples/Esprima.Benchmark/CharBenchmark.cs b/samples/Esprima.Benchmark/CharBenchmark.cs
@@ -8,8 +8,8 @@ namespace Esprima.Benchmark;
 [MemoryDiagnoser]
 public class CharBenchmark
 {
-    private static char[] _asciiRange;
-    private static char[] _fullRange;
+    private static readonly char[] _asciiRange;
+    private static readonly char[] _fullRange;
 
     static CharBenchmark()
     {

diff --git a/src/Esprima/JavascriptParser.cs → src/Esprima/JavaScriptParser.cs b/src/Esprima/JavascriptParser.cs → src/Esprima/JavaScriptParser.cs
@@ -2099,7 +2099,7 @@ private Expression ParsePostfixUnaryExpression(Expression expr, in Marker marker
         _context.IsAssignmentTarget = false;
         _context.IsBindingElement = false;
         var op = NextToken().Value;
-        expr = Finalize(marker, new UpdateExpression((string)op!, expr, prefix: false));
+        expr = Finalize(marker, new UpdateExpression((string) op!, expr, prefix: false));
         return expr;
     }
 
@@ -2117,7 +2117,7 @@ private Expression ParsePrefixUnaryExpression(in Marker marker)
             TolerateError(Messages.InvalidLHSInAssignment);
         }
 
-        expr = Finalize(marker, new UpdateExpression((string)token.Value!, expr, prefix: true));
+        expr = Finalize(marker, new UpdateExpression((string) token.Value!, expr, prefix: true));
         _context.IsAssignmentTarget = false;
         _context.IsBindingElement = false;
         return expr;

diff --git a/src/Esprima/Loc.cs → src/Esprima/Location.cs b/src/Esprima/Loc.cs → src/Esprima/Location.cs
diff --git a/src/Esprima/Utils/AdditionalDataContainer.cs → src/Esprima/Utils/AdditionalDataSlot.cs b/src/Esprima/Utils/AdditionalDataContainer.cs → src/Esprima/Utils/AdditionalDataSlot.cs
diff --git a/src/Esprima/Utils/AstToJavascript.cs → src/Esprima/Utils/AstToJavaScript.cs b/src/Esprima/Utils/AstToJavascript.cs → src/Esprima/Utils/AstToJavaScript.cs
diff --git a/...a/Utils/AstToJavascriptConverter.Enums.cs → ...a/Utils/AstToJavaScriptConverter.Enums.cs b/...a/Utils/AstToJavascriptConverter.Enums.cs → ...a/Utils/AstToJavaScriptConverter.Enums.cs
diff --git a/...Utils/AstToJavascriptConverter.Helpers.cs → ...Utils/AstToJavaScriptConverter.Helpers.cs b/...Utils/AstToJavascriptConverter.Helpers.cs → ...Utils/AstToJavaScriptConverter.Helpers.cs
diff --git a/...Esprima/Utils/AstToJavascriptConverter.cs → ...Esprima/Utils/AstToJavaScriptConverter.cs b/...Esprima/Utils/AstToJavascriptConverter.cs → ...Esprima/Utils/AstToJavaScriptConverter.cs
diff --git a/src/Esprima/Utils/AstToJsonConverter.cs b/src/Esprima/Utils/AstToJsonConverter.cs
@@ -3,7 +3,6 @@
 using System.Numerics;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Text.RegularExpressions;
 using Esprima.Ast;
 
 namespace Esprima.Utils;

diff --git a/src/Esprima/Utils/JavascriptTextFormatter.cs → src/Esprima/Utils/JavaScriptTextFormatter.cs b/src/Esprima/Utils/JavascriptTextFormatter.cs → src/Esprima/Utils/JavaScriptTextFormatter.cs
diff --git a/...prima/Utils/JavascriptTextWriter.Enums.cs → ...prima/Utils/JavaScriptTextWriter.Enums.cs b/...prima/Utils/JavascriptTextWriter.Enums.cs → ...prima/Utils/JavaScriptTextWriter.Enums.cs
diff --git a/...tils/JavascriptTextWriter.WriteContext.cs → ...tils/JavaScriptTextWriter.WriteContext.cs b/...tils/JavascriptTextWriter.WriteContext.cs → ...tils/JavaScriptTextWriter.WriteContext.cs
diff --git a/src/Esprima/Utils/JavascriptTextWriter.cs → src/Esprima/Utils/JavaScriptTextWriter.cs b/src/Esprima/Utils/JavascriptTextWriter.cs → src/Esprima/Utils/JavaScriptTextWriter.cs
diff --git a/.../Utils/Jsx/JsxAstToJavascriptConverter.cs → .../Utils/Jsx/JsxAstToJavaScriptConverter.cs b/.../Utils/Jsx/JsxAstToJavascriptConverter.cs → .../Utils/Jsx/JsxAstToJavaScriptConverter.cs
diff --git a/...prima/Utils/KnRJavascriptTextFormatter.cs → ...prima/Utils/KnRJavaScriptTextFormatter.cs b/...prima/Utils/KnRJavascriptTextFormatter.cs → ...prima/Utils/KnRJavaScriptTextFormatter.cs
diff --git a/test/Esprima.Tests.SourceGenerators/StringMatcherGeneratorTests.cs b/test/Esprima.Tests.SourceGenerators/StringMatcherGeneratorTests.cs
@@ -9,7 +9,7 @@ public class StringMatcherGeneratorTests : SourceGeneratorTest
     public Task ScannerStringMatchingGeneration()
     {
         return Verify<StringMatcherGenerator>(
-            LoadEsprimaSourceFile("JavascriptParser.cs"),
+            LoadEsprimaSourceFile("JavaScriptParser.cs"),
             LoadEsprimaSourceFile("Scanner.cs"),
             LoadEsprimaSourceFile("ParserExtensions.cs")
         );