fix config parser

Author: RomanSoloweow

src/SimpleStateMachine.StructuralSearch.Tests/ConfigurationFile/FullConfig.yml

@@ -14,16 +14,13 @@
 #  NullUnionOperator    
 
   - FindTemplate: |-
-      if($value1$ $sign$ null)
-      {
+      if($value$ $sign$ null)
           $var$ = $value2$;
-      }
       else
-      {
           $var$ = $value1$;
-      }
     FindRules:
       - $sign$ In ("Is", "==", "!=", "is not")
+      - $value$ In ($value1$, "$value1$.Value",  $value2$, "$value2$.Value")
     ReplaceTemplate: |-
       $var$ = $value1$ ?? $value2$;
     ReplaceRules:  

src/SimpleStateMachine.StructuralSearch.Tests/ConfigurationFile/ShortConfig.yml

@@ -13,16 +13,13 @@
 #  NullUnionOperator    
 
   - FindTemplate: |-
-      if($value1$ $sign$ null)
-      {
+      if($value$ $sign$ null)
           $var$ = $value2$;
-      }
       else
-      {
           $var$ = $value1$;
-      }
     FindRules:
       - $sign$ In ("Is", "==", "!=", "is not")
+      - $value$ In ($value1$, "$value1$.Value",  $value2$, "$value2$.Value")
     ReplaceTemplate: |-
       $var$ = $value1$ ?? $value2$;
     ReplaceRules:  

src/SimpleStateMachine.StructuralSearch.Tests/Examples/NullUnionOperator.cs

@@ -12,24 +12,26 @@ public int Test1()
             return 4;
     }
 
-    public int Test2()
+    public void Test2()
     {
-        int? temp = 5;
-            
-        if(temp is null)
-            return 7;
+        int? result;
+        int? temp1 = 5;
+        int? temp2 = 5; 
+        if(temp1 is null)
+            result = temp2;
         else
-            return 8;
+            result =  temp1;
     }
 
-    public int Test3()
+    public void Test3()
     {
-        int? temp2 = 1;
-            
-        if(temp2 is null)
-            return 3;
+        int result;
+        int? temp1 = 5;
+        int? temp2 = 5; 
+        if(temp1 is null)
+            result = temp2.Value;
         else
-            return 4; 
+            result =  temp1.Value;
     }
 
     public int Test4()

src/SimpleStateMachine.StructuralSearch.Tests/FindRule/NullUnionOperator.txt

@@ -1 +1,2 @@
-$sign$ In ("Is", "==", "!=", "is not")
+$sign$ In ("Is", "==", "!=", "is not")
+$value$ In ($value1$, "$value1$.Value",  $value2$, "$value2$.Value")

src/SimpleStateMachine.StructuralSearch.Tests/FindTemplate/NullUnionOperator.txt

@@ -1,8 +1,4 @@
-if($value1$ $sign$ null)
-{
+if($value$ $sign$ null)
     $var$ = $value2$;
-}
 else
-{
-    $var$ = $value1$;
-}
+    $var$ = $value1$;

src/SimpleStateMachine.StructuralSearch.Tests/Source/NullUnionOperator.txt

@@ -1,8 +1,4 @@
 if(var1 is null)
-{
     temp = var2;
-}
 else
-{
-    temp = var1;
-}
+    temp = var1;

src/SimpleStateMachine.StructuralSearch.Tests/StructurSearchParserTests.cs

@@ -9,7 +9,7 @@ public class StructuralSearchParserTests
     {
         [Theory]
         // [InlineData("AssignmentNullUnionOperator")]
-        // [InlineData("NullUnionOperator")]
+        [InlineData("NullUnionOperator", "Examples/NullUnionOperator.cs", 2)]
         [InlineData("TernaryOperator", "Examples/TernaryOperator.cs", 3)]
         public static void StructuralSearchShouldBeSuccess(string exampleName, string exampleFilePath, int matchesCount)
         {

src/SimpleStateMachine.StructuralSearch/StructuralSearchParser.cs

@@ -17,7 +17,7 @@ public class StructuralSearchParser
 
         public IReplaceBuilder ReplaceBuilder { get; set; }
 
-        public Dictionary<string, ReplaceRule> ReplaceRules { get; set; }
+        public IEnumerable<ReplaceRule> ReplaceRules { get; set; }
 
         public StructuralSearchParser(Configuration configuration)
         {
@@ -29,41 +29,60 @@ public StructuralSearchParser(Configuration configuration)
 
             ReplaceBuilder = StructuralSearch.ParseReplaceTemplate(configuration.ReplaceTemplate);
 
-            // ReplaceRules = configuration.ReplaceRules
-            //     .EmptyIfNull()
-            //     .Select(StructuralSearch.ParseReplaceRule)
-            //     .ToDictionary(x => x.FindRule.Placeholder.Name, x => x);
+            ReplaceRules = configuration.ReplaceRules
+                .EmptyIfNull()
+                .Select(StructuralSearch.ParseReplaceRule);
         }
 
         public IEnumerable<FindParserMatch> Parse(ref IParsingContext context)
         {
             var matches = FindParser.Parse(ref context);
+            return matches;
+        }
+
+        public IEnumerable<FindParserMatch> ApplyFindRule(ref IParsingContext context, IEnumerable<FindParserMatch> matches)
+        {
             var result = new List<FindParserMatch>();
-            
             foreach (var match in matches)
             {
-               context.Set(match.Placeholders);
-               if (AllRulesCompleted(ref context))
-               {
+                context.Set(match.Placeholders);
+                var all = FindRules.All(x => x.Execute());
+                if (all)
+                {
                     result.Add(match);   
-               }
+                }
             }
 
             return result;
         }
-        
+        public void ApplyReplaceRule(ref IParsingContext context, IEnumerable<FindParserMatch> matches)
+        {
+            // var result = new List<FindParserMatch>();
+            // foreach (var match in matches)
+            // {
+            //     context.Set(match.Placeholders);
+            //     
+            //     var rules = ReplaceRules
+            //         .Where(x => x.FindRule.Execute())
+            //         .SelectMany(x => x.Rules);
+            //     
+            //     var placeHolder = match.Placeholders
+            //         .ToDictionary(x=> x.Key, x=> x.Value);
+            //  
+            //     foreach (var rule in rules)
+            //     {
+            //         placeHolder[rule.Placeholder.Name].Value 
+            //     }
+            // }
+            //
+            // return result;
+        }
         public void Replace(FindParserMatch context)
         {
             //ReplaceBuilder.Build(context);
             // context.
             //FindParser.Parse(context, context.File.Data);
         }
 
-        public bool AllRulesCompleted(ref IParsingContext context)
-        {
-            //return FindRules.Values.All(x => x.Execute());
-
-            return true;
-        }
     }
 }