Fix string expression

Author: RomanSoloweow

src/SimpleStateMachine.StructuralSearch.Tests/FindRuleParserTests.cs

@@ -3,7 +3,6 @@
 using Pidgin;
 using SimpleStateMachine.StructuralSearch.StructuralSearch;
 using Xunit;
-using TemplateParser = SimpleStateMachine.StructuralSearch.CustomParsers.TemplateParser;
 
 namespace SimpleStateMachine.StructuralSearch.Tests;
 

src/SimpleStateMachine.StructuralSearch.Tests/ParameterParserTests.cs

@@ -1,5 +1,4 @@
 using Pidgin;
-using SimpleStateMachine.StructuralSearch.Helper;
 using SimpleStateMachine.StructuralSearch.StructuralSearch;
 using Xunit;
 
@@ -11,6 +10,22 @@ public static class ParameterParserTests
     [InlineData("\\\"132\\\"")]
     [InlineData("132")]
     [InlineData(" ")]
+    
+    [InlineData("(132)")]
+    [InlineData("[(132)]")]
+    [InlineData("{(())}")]
+    [InlineData("()")]
+    [InlineData("( )")]
+    [InlineData("$var$")]
+    [InlineData("$var$.Lenght")]
+    [InlineData("$var$.Column.Start")]
+    [InlineData("$var$.Column.End")]
+    [InlineData("$var$.Offset.Start")]
+    [InlineData("$var$.Offset.End")]
+    [InlineData("$var$.Line.Start")]
+    [InlineData("$var$.Line.End")]
+    [InlineData("$var$.Trim")]
+    [InlineData("$var$.Trim.Trim")]
     public static void OptionalStringParsingShouldBeSuccess(string str)
     {
         var result = ParametersParser.StringExpression.Before(CommonParser.Eof).ParseOrThrow(str);

src/SimpleStateMachine.StructuralSearch/Context/IParsingContext.cs

@@ -2,7 +2,6 @@
 using SimpleStateMachine.StructuralSearch.Input;
 using SimpleStateMachine.StructuralSearch.Operator.Logical;
 using SimpleStateMachine.StructuralSearch.Placeholder;
-using SimpleStateMachine.StructuralSearch.Rules.FindRules;
 
 namespace SimpleStateMachine.StructuralSearch.Context;
 

src/SimpleStateMachine.StructuralSearch/Context/ParsingContext.cs

@@ -2,7 +2,6 @@
 using SimpleStateMachine.StructuralSearch.Input;
 using SimpleStateMachine.StructuralSearch.Operator.Logical;
 using SimpleStateMachine.StructuralSearch.Placeholder;
-using SimpleStateMachine.StructuralSearch.Rules.FindRules;
 
 namespace SimpleStateMachine.StructuralSearch.Context;
 

src/SimpleStateMachine.StructuralSearch/CustomParsers/EmptyFindParser.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using SimpleStateMachine.StructuralSearch.Input;
 using SimpleStateMachine.StructuralSearch.Operator.Logical;
-using SimpleStateMachine.StructuralSearch.Rules.FindRules;
 
 namespace SimpleStateMachine.StructuralSearch.CustomParsers;
 

src/SimpleStateMachine.StructuralSearch/CustomParsers/FindParser.cs

@@ -6,7 +6,6 @@
 using SimpleStateMachine.StructuralSearch.Extensions;
 using SimpleStateMachine.StructuralSearch.Input;
 using SimpleStateMachine.StructuralSearch.Operator.Logical;
-using SimpleStateMachine.StructuralSearch.Rules.FindRules;
 
 namespace SimpleStateMachine.StructuralSearch.CustomParsers;
 

src/SimpleStateMachine.StructuralSearch/Operator/Logical/StringCompareOperation.cs

@@ -1,6 +1,5 @@
 using System;
 using SimpleStateMachine.StructuralSearch.Context;
-using SimpleStateMachine.StructuralSearch.Extensions;
 using SimpleStateMachine.StructuralSearch.Helper;
 using SimpleStateMachine.StructuralSearch.Operator.Logical.Type;
 using SimpleStateMachine.StructuralSearch.Parameters;

src/SimpleStateMachine.StructuralSearch/Parameters/StringJoinParameter.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.Linq;
+using SimpleStateMachine.StructuralSearch.Context;
+
+namespace SimpleStateMachine.StructuralSearch.Parameters;
+
+internal class StringJoinParameter : IParameter
+{
+    private readonly List<IParameter> _parameters;
+
+    public StringJoinParameter(List<IParameter> parameters)
+    {
+        _parameters = parameters;
+    }
+
+    public string GetValue(ref IParsingContext context)
+    {
+        var localContext = context;
+        var values = _parameters.Select(parameter => parameter.GetValue(ref localContext)).ToList();
+        return string.Join(string.Empty, values);
+    }
+
+    public override string ToString()
+        => string.Join(string.Empty, _parameters.Select(x => x.ToString()));
+}

src/SimpleStateMachine.StructuralSearch/Rules/StringJoinParameter.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Pidgin;
 using SimpleStateMachine.StructuralSearch.CustomParsers;
@@ -7,7 +8,6 @@
 using SimpleStateMachine.StructuralSearch.Operator.String.Type;
 using SimpleStateMachine.StructuralSearch.Parameters;
 using SimpleStateMachine.StructuralSearch.Parameters.Types;
-using SimpleStateMachine.StructuralSearch.Rules;
 
 namespace SimpleStateMachine.StructuralSearch.StructuralSearch;
 
@@ -66,18 +66,14 @@ internal static class ParametersParser
             .Then(Parser.OneOf(PlaceholderLength, PlaceholderInput, PlaceholderPosition), (placeholder, buildPropertyFunc) => buildPropertyFunc(placeholder))
             .Then(ChainableString.Optional(), (placeholderProperty, chainableStringFunc) => chainableStringFunc.HasValue ? chainableStringFunc.Value(placeholderProperty) : placeholderProperty);
 
-    internal static readonly Parser<char, IParameter> StringExpression = 
-        Parsers.BetweenParentheses
+    internal static readonly Parser<char, IParameter> StringExpression =
+        Parser.OneOf(Parsers.BetweenParentheses
             (
-                expr: Parser.OneOf
-                (
-                    Parser.Rec(() => StringExpression ?? throw new ArgumentNullException(nameof(StringExpression))),
-                    PropertyAccess,
-                    AtomicToken
-                ),
-                mapFunc: (c1, value, c2) => new ParenthesisedParameter(GetParenthesisType((c1, c2)), value)
-            )
-            .As<char, ParenthesisedParameter, IParameter>();
+                expr: Parser.Rec(() => StringExpression ?? throw new ArgumentNullException(nameof(StringExpression))),
+                mapFunc: IParameter (c1, value, c2) => new ParenthesisedParameter(GetParenthesisType((c1, c2)), value)
+            ), PropertyAccess, AtomicToken)
+            .AtLeastOnce()
+            .Select<IParameter>(parameters => new StringJoinParameter(parameters.ToList()));
 
     private static ParenthesisType GetParenthesisType((char c1, char c2) parenthesis)
         => parenthesis switch