fix error, remove unused namespaces

SimpleStateMachine.StructuralSearch.Action/Program.cs

@@ -1,6 +1,4 @@
-using System.Text;
-using SimpleStateMachine.StructuralSearch.Action;
-using System.Web;
+using SimpleStateMachine.StructuralSearch.Action;
 using CommandLine;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileSystemGlobbing;

src/SimpleStateMachine.StructuralSearch.Sandbox/Expr.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Immutable;
-using System.Linq;
+using System.Collections.Immutable;
 
 namespace SimpleStateMachine.StructuralSearch.Sandbox
 {

src/SimpleStateMachine.StructuralSearch.Sandbox/ExprParser.cs

@@ -1,5 +1,4 @@
-using System;
-using Pidgin;
+using Pidgin;
 using Pidgin.Expression;
 using static Pidgin.Parser;
 

src/SimpleStateMachine.StructuralSearch.Sandbox/Program.cs

@@ -1,19 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Text.RegularExpressions;
-using Pidgin;
-using SimpleStateMachine.StructuralSearch.Configurations;
+using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
 using SimpleStateMachine.StructuralSearch.Helper;
-using SimpleStateMachine.StructuralSearch.Rules;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.NamingConventions;
 using static Pidgin.Parser;
-using String = System.String;
 
 namespace SimpleStateMachine.StructuralSearch.Sandbox
 {

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

@@ -6,7 +6,7 @@
           $var$ = $value$;
       }
     FindRules:
-      - $sign$ In ("Is", "==", "!=", "is not")
+      - $sign$ In ("is", "==", "!=", "is not")
     ReplaceTemplate: |-
       $var$ ??= $value$;
     ReplaceRules:
@@ -19,12 +19,12 @@
       else
           $var$ = $value1$;
     FindRules:
-      - $sign$ In ("Is", "==", "!=", "is not")
-      - $value$ In ($value1$, "$value1$\.Value",  $value2$, "$value2$\.Value")
+      - $sign$ In ("is", "==", "!=", "is not")
+      - $value$ In ($value1$, $value2$)
     ReplaceTemplate: |-
       $var$ = $value1$ ?? $value2$;
-    ReplaceRules:  
-      - $sign$ In ("!=", "is not") then $var2$ => $var1$, $var1$ => $var2$
+    ReplaceRules:
+      - $sign$ In ("!=", "is not") then $value2$ => $value1$, $value1$ => $value2$
 
 #  TernaryOperator 
 

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

@@ -0,0 +1,6 @@
+Configurations:
+  - FindTemplate: if($var1$ == $var2$)
+    FindRules:
+      - $var1$ Is Var
+      - $var2$ is Var
+    ReplaceTemplate: $var1$, $var2$

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

@@ -6,7 +6,7 @@
           $var$ = $value$;
       }
     FindRules:
-      - $sign$ In ("Is", "==", "!=", "is not")
+      - $sign$ In ("is", "==", "!=", "is not")
     ReplaceTemplate: |-
       $var$ ??= $value$;
 
@@ -18,12 +18,13 @@
       else
           $var$ = $value1$;
     FindRules:
-      - $sign$ In ("Is", "==", "!=", "is not")
-      - $value$ In ($value1$, "$value1$\.Value",  $value2$, "$value2$\.Value")
+      - $sign$ In ("is", "==", "!=", "is not")
+      - $value$ In ($value1$, $value2$)
     ReplaceTemplate: |-
       $var$ = $value1$ ?? $value2$;
-    ReplaceRules:  
-     - $sign$ In ("!=", "is not") then $var2$ => $var1$, $var1$ => $var2$
+    ReplaceRules:
+      - $sign$ In ("!=", "is not") then $value2$ => $value1$, $value1$ => $value2$
+
 #  TernaryOperator   
 
   - FindTemplate: |-

src/SimpleStateMachine.StructuralSearch.Tests/ConfigurationFileTests.cs

@@ -1,17 +1,12 @@
 using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-using Pidgin;
 using SimpleStateMachine.StructuralSearch.Configurations;
 using SimpleStateMachine.StructuralSearch.Helper;
 using SimpleStateMachine.StructuralSearch.Tests.Mock;
 using Xunit;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.NamingConventions;
 
 namespace SimpleStateMachine.StructuralSearch.Tests
 {
-    public class ConfigurationFileTests
+    public class ConfigurationFileParserTests
     {
         [Theory]
         [InlineData("ConfigurationFile/ShortConfig.yml")]

src/SimpleStateMachine.StructuralSearch.Tests/Examples/Common.cs → src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/Common.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-
-namespace SimpleStateMachine.StructuralSearch.Tests.Examples;
+namespace SimpleStateMachine.StructuralSearch.Tests.Examples;
 
 public class Common
 {

src/SimpleStateMachine.StructuralSearch.Tests/Examples/Common2.cs → src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/Common2.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-
-namespace SimpleStateMachine.StructuralSearch.Tests.Examples;
+namespace SimpleStateMachine.StructuralSearch.Tests.Examples;
 
 public class Common2
 {

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

@@ -0,0 +1,40 @@
+namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesInput;
+
+public class NullUnionOperator
+{
+    public void Test1()
+    {
+        int? result;
+        int? temp1 = 5;
+        int? temp2 = 5; 
+
+        if(temp1 is null)
+            result = temp2;
+        else
+            result =  temp1;
+    }
+
+    public void Test2()
+    {
+
+        int? result;
+        int? temp1 = 6;
+        int? temp2 = 7;
+        if(temp1 is not null)
+            result = temp2;
+        else
+            result =  temp1;
+    }
+
+    public int Test3()
+    {
+        int? temp3 = 5;
+
+        if(temp3 is null)
+            return 7;
+        else if (temp3 == 8)
+            return 9;
+        else
+            return 10;     
+    }
+}

src/SimpleStateMachine.StructuralSearch.Tests/Examples/TernaryOperator.cs → src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/TernaryOperator.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace SimpleStateMachine.StructuralSearch.Tests.Examples
+namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesInput
 {
     public class TernaryOperator
     {

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

@@ -0,0 +1,34 @@
+namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesOutput;
+
+public class NullUnionOperator
+{
+    public void Test1()
+    {
+        int? result;
+        int? temp1 = 5;
+        int? temp2 = 5; 
+
+        result = temp1 ?? temp2;
+    }
+
+    public void Test2()
+    {
+
+        int? result;
+        int? temp1 = 6;
+        int? temp2 = 7;
+        result = temp2 ?? temp1;
+    }
+
+    public int Test3()
+    {
+        int? temp3 = 5;
+
+        if(temp3 is null)
+            return 7;
+        else if (temp3 == 8)
+            return 9;
+        else
+            return 10;     
+    }
+}

src/SimpleStateMachine.StructuralSearch.Tests/ExamplesOutput/TernaryOperator.txt

@@ -0,0 +1,45 @@
+using System;
+
+namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesInput
+{
+    public class TernaryOperator
+    {
+        public int Test1()
+        {
+            var temp = 1;
+
+            return temp == 2? 3 : 4;
+        }
+
+        public int Test2()
+        {
+            var temp = 5;
+
+            return temp == 6? 7 : 8;
+        }
+
+        public int Test3()
+        {
+            var temp2 = 1;
+
+            return temp2 == 2? 3 : 4; 
+        }
+
+        public int Test4()
+        {
+            var temp3 = 5;
+
+            if(temp3 == 6)
+                return 7;
+            else if (temp3 == 8)
+                return 9;
+            else
+                return 10;
+        }
+
+        public void Test5()
+        {
+
+        }
+    }
+}

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

@@ -1 +1 @@
-$sign$ In ("Is", "==", "!=", "is not")
+$sign$ In ("is", "==", "!=", "is not")

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

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

src/SimpleStateMachine.StructuralSearch.Tests/FindRuleParserTests.cs

@@ -1,8 +1,6 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Linq;
 using Pidgin;
-using SimpleStateMachine.StructuralSearch.Rules;
 using Xunit;
 
 namespace SimpleStateMachine.StructuralSearch.Tests
@@ -25,9 +23,11 @@ public class FindRuleParserTests
         [InlineData("$var$ StartsWith \"123\"")]
         [InlineData("$var$ EndsWith $var$.Lenght")]
         [InlineData("$var$ EndsWith \"123\"")]
-        [InlineData("$var$ Match $var$.Lenght")]
+        // [InlineData("$var$ Match $var$.Lenght")]
         [InlineData("$var$ Is Int")]
         [InlineData("$var$ Is DateTime")]
+        [InlineData("$var$ equals $var1$ or $var2$ equals $var1$")]
+         [InlineData("$var$ match \"[a-b]+\"")]
         public void FindRuleExprParsingShouldBeSuccess(string ruleStr)
         {
             var rule = FindRuleParser.Expr.ParseOrThrow(ruleStr);
@@ -62,8 +62,8 @@ public void FindRuleExprParsingShouldBeEqualsCustomResult(int number, string rul
             Assert.Equal(_ruleStr, customResult.ToLower());
         }
         [Theory]
-        [InlineData("FindRule/NullUnionOperator.txt", "$sign$ In \"Is\",\"==\",\"!=\",\"is not\"",  "$value$ In $value1$,\"$value1$\\.Value\",$value2$,\"$value2$\\.Value\"")]
-        [InlineData("FindRule/AssignmentNullUnionOperator.txt", "$sign$ In \"Is\",\"==\",\"!=\",\"is not\"")]
+        [InlineData("FindRule/NullUnionOperator.txt", "$sign$ In \"is\",\"==\",\"!=\",\"is not\"",  "$value$ In $value1$,$value2$")]
+        [InlineData("FindRule/AssignmentNullUnionOperator.txt", "$sign$ In \"is\",\"==\",\"!=\",\"is not\"")]
         public void FindRuleParsingFromFileShouldBeSuccess(string filePath, params string[] customResult)
         {
             var ruleStr = File.ReadAllText(filePath);

src/SimpleStateMachine.StructuralSearch.Tests/ParameterParserTests.cs

@@ -55,4 +55,20 @@ public void StringFormatParameterParsingShouldBeFail(string str)
     {
         Assert.Throws<ParseException>(() => ParametersParser.StringFormatParameter.ParseOrThrow(str));
     }
+
+    [Theory]
+    [InlineData("$var$")]
+    [InlineData("$var$.Trim")]
+    [InlineData("$var$.Lenght")]
+    [InlineData("$var$.Lenght.Trim")]
+    [InlineData("$var$.RemoveSubStr(\"123\")")]
+    [InlineData("$var$.Lenght.RemoveSubStr(\"123\")")]
+    [InlineData("$var$.Lenght.Trim.RemoveSubStr(\"123\")")]
+    public void ParameterParsingShouldBeSuccess(string str)
+    {
+        var parameter = ParametersParser.Parameter.ParseOrThrow(str);
+        var parameterStr = parameter.ToString().ToLower();
+        Assert.Equal(parameterStr.ToLower(), str.ToLower());
+    }
+
 }