Merge pull request #11 from SimpleStateMachine/dev

property as private readonly field

Author: RomanSoloweow

SimpleStateMachine.StructuralSearch.Action/Program.cs

@@ -17,7 +17,7 @@ static TService Get<TService>(IHost host)
     where TService : notnull =>
     host.Services.GetRequiredService<TService>();
 
-static async Task StartAnalysisAsync(ActionInputs inputs, IHost host)
+static Task StartAnalysisAsync(ActionInputs inputs, IHost host)
 {
     // using ProjectWorkspace workspace = Get<ProjectWorkspace>(host);
     using CancellationTokenSource tokenSource = new();
@@ -85,6 +85,7 @@ static async Task StartAnalysisAsync(ActionInputs inputs, IHost host)
     // Console.WriteLine($"::set-output name=summary-details::{summary}");
 
     Environment.Exit(0);
+    return Task.CompletedTask;
 }
 
 var parser = Default.ParseArguments(() => new ActionInputs(), args);

src/SimpleStateMachine.StructuralSearch.Tests/Mock/Configuration.cs

@@ -22,6 +22,7 @@ public static Configuration GetConfigurationFromFiles(string name)
                 ReplaceTemplate = replaceTemplate,
                 ReplaceRules = replaceRules
             };
+            
             return config;
 
             string? FileOrNull(string folder, string name)

src/SimpleStateMachine.StructuralSearch.Tests/ReplaceTemplateTests.cs

@@ -15,7 +15,7 @@ public void ReplaceTemplateParsingShouldHaveStepCount(string templatePath, int s
         {
             var replaceTemplate = File.ReadAllText(templatePath);
             var replaceBuilder = StructuralSearch.ParseReplaceTemplate(replaceTemplate);
-            var result = replaceBuilder.Build(new EmptyParsingContext());
+            var result = replaceBuilder.Build(ParsingContext.Empty);
 
             Assert.NotNull(replaceTemplate);
             Assert.Equal(replaceBuilder.Steps.Count(), stepsCount);

src/SimpleStateMachine.StructuralSearch/Configurations/Configuration.cs

@@ -7,11 +7,8 @@ namespace SimpleStateMachine.StructuralSearch.Configurations
     public class Configuration : IEquatable<Configuration>
     {
         public string FindTemplate { get; init; }
-
         public List<string>? FindRules { get; init; }
-
         public string ReplaceTemplate { get; init; }
-
         public List<string>? ReplaceRules { get; init; }
 
         public bool Equals(Configuration? other)
@@ -25,8 +22,7 @@ public bool Equals(Configuration? other)
 
         public override bool Equals(object? obj)
         {
-            if (obj.GetType() != this.GetType()) return false;
-            return Equals((Configuration)obj);
+            return obj?.GetType() == GetType() && Equals((Configuration)obj);
         }
 
         public override int GetHashCode()

src/SimpleStateMachine.StructuralSearch/Configurations/ConfigurationFile.cs

@@ -6,7 +6,7 @@ namespace SimpleStateMachine.StructuralSearch.Configurations
 {
     public class ConfigurationFile: IEquatable<ConfigurationFile>
     {
-        public List<Configuration> Configurations { get; set; }
+        public List<Configuration> Configurations { get; init; }
 
         public bool Equals(ConfigurationFile? other)
         {
@@ -15,8 +15,7 @@ public bool Equals(ConfigurationFile? other)
 
         public override bool Equals(object? obj)
         {
-            if (obj.GetType() != this.GetType()) return false;
-            return Equals((ConfigurationFile)obj);
+            return obj?.GetType() == GetType() && Equals((ConfigurationFile)obj);
         }
 
         public override int GetHashCode()

src/SimpleStateMachine.StructuralSearch/Constant.cs

@@ -95,7 +95,7 @@ public static partial class Constant
         /// <summary>
         /// Char: '='
         /// </summary>
-        public const char Equals = '=';
+        private const char Equals = '=';
 
         /// <summary>
         /// Char: '>'

src/SimpleStateMachine.StructuralSearch/EmptyParsingContext.cs

@@ -5,6 +5,11 @@ namespace SimpleStateMachine.StructuralSearch
     public class EmptyParsingContext : IParsingContext
     {
         public IInput Input { get; }
+        
+        public EmptyParsingContext(IInput input)
+        {
+            Input = input;
+        }
 
         public bool TryGetPlaceholder(string name, out IPlaceholder value)
         {

src/SimpleStateMachine.StructuralSearch/Extensions/EnumerableCharExtensions.cs

@@ -6,19 +6,19 @@ namespace SimpleStateMachine.StructuralSearch.Extensions
 {
     public static class EnumerableCharExtensions
     {
-        public static Parser<Ttoken, string> AsString<Ttoken>(this Parser<Ttoken, IEnumerable<char>> parser)
+        public static Parser<TToken, string> AsString<TToken>(this Parser<TToken, IEnumerable<char>> parser)
         {
             return parser.Select(x => new string(x.ToArray()));
         }
 
-        public static Parser<Ttoken, IEnumerable<T>> MergerMany<Ttoken, T>(
-            this Parser<Ttoken, IEnumerable<IEnumerable<T>>> parser)
+        public static Parser<TToken, IEnumerable<T>> MergerMany<TToken, T>(
+            this Parser<TToken, IEnumerable<IEnumerable<T>>> parser)
         {
             return parser.Select(x => x.SelectMany(y => y));
         }
 
-        public static Parser<Ttoken, IEnumerable<T>> MergerMany<Ttoken, T>(
-            this Parser<Ttoken, IEnumerable<List<T>>> parser)
+        public static Parser<TToken, IEnumerable<T>> MergerMany<TToken, T>(
+            this Parser<TToken, IEnumerable<List<T>>> parser)
         {
             return parser.Select(x => x.SelectMany(y => y));
         }

src/SimpleStateMachine.StructuralSearch/Extensions/EnumerableStringExtensions.cs

@@ -4,12 +4,12 @@ namespace SimpleStateMachine.StructuralSearch.Extensions
 {
     public static class EnumerableStringExtensions
     {
-        public static string JoinToString(this IEnumerable<string> enumerable, string separator = null)
+        public static string JoinToString(this IEnumerable<string> enumerable, string? separator = null)
         {
             return string.Join(separator, enumerable);
         }
 
-        public static string JoinToString(this List<string> enumerable, string separator = null)
+        public static string JoinToString(this List<string> enumerable, string? separator = null)
         {
             return string.Join(separator, enumerable);
         }

src/SimpleStateMachine.StructuralSearch/Extensions/IEnumerableSourceMatchExtensions.cs

@@ -7,9 +7,10 @@ public static class IEnumerableSourceMatchExtensions
     {
         public static SourceMatch Concatenate(this IEnumerable<SourceMatch> matches)
         {
-            int start = matches.First().Start;
-            int end = matches.Last().End;
-            var value = string.Join(string.Empty, matches.Select(x => x.Value));
+            var sourceMatches = matches as SourceMatch[] ?? matches.ToArray();
+            int start = sourceMatches.First().Start;
+            int end = sourceMatches.Last().End;
+            var value = string.Join(string.Empty, sourceMatches.Select(x => x.Value));
             return new SourceMatch(value, start, end);
         }
     }