Feature/multiple chars (#5)

* Implement additional chars * fix warnings
coenm · Apr 14, 2022 · 6e7af50 · 6e7af50
1 parent c0bf17f
commit 6e7af50
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/src/ExpressionStringEvaluator/Parser/Language.g4 b/src/ExpressionStringEvaluator/Parser/Language.g4
@@ -50,13 +50,17 @@ fragment DOT        : '.' ;
 fragment MINUS      : '-' ;
 fragment SEMICOLUMN : ':' ;
 fragment SLASH      : '/' ;
-fragment PERCENT    : '%' ;
+fragment BACKSLASH  : '\\' '\\' ;
+fragment PERCENT    : '\\' '%' ;
+fragment BRACKET_OPEN    : '\\' '{' ;
+fragment BRACKET_CLOSE    : '\\' '}' ;
 fragment ATSIGN     : '@' ;
+fragment SYMBOLS    : ('?'|'!'|'#'|'$'|'^'|'&'|'*'|'=') ;
 
 TRUE                : ( T R U E );
 FALSE               : ( F A L S E );
 
 KEY                 : LETTER(LETTER|DIGIT|UNDERSCORE|DOT|MINUS)+ ;
-WORD                : (LETTER|DIGIT|UNDERSCORE|DOT|MINUS|SLASH|ATSIGN)+;
+WORD                : (LETTER|DIGIT|UNDERSCORE|DOT|MINUS|SLASH|BACKSLASH|PERCENT|BRACKET_OPEN|BRACKET_CLOSE|ATSIGN|SYMBOLS)+;
 NEWLINE             : ('\r'? '\n' | '\r') -> channel(HIDDEN) ;
 WHITESPACE          : (' ' | '\t' ) -> channel(HIDDEN) ;
diff --git a/src/ExpressionStringEvaluator/Parser/LanguageVisitor.cs b/src/ExpressionStringEvaluator/Parser/LanguageVisitor.cs
@@ -52,7 +52,11 @@ public override CombinedTypeContainer VisitVariable(LanguageParser.VariableConte
 
     public override CombinedTypeContainer VisitTextWithSpaces(LanguageParser.TextWithSpacesContext context)
     {
-        var text = context.GetText();
+        var text = context.GetText()
+           .Replace("\\%", "%")
+           .Replace("\\{", "{")
+           .Replace("\\}", "}")
+           .Replace("\\\\", "\\");
         return new CombinedTypeContainer(text);
     }
 
@@ -119,7 +123,13 @@ public override CombinedTypeContainer VisitBooleanexpression(LanguageParser.Bool
 
     public override CombinedTypeContainer VisitEnvvariable(LanguageParser.EnvvariableContext context)
     {
-        var envVariable = context.KEY().GetText();
+        ITerminalNode envVarKey = context.KEY();
+        if (envVarKey == null)
+        {
+            throw new Exception("Could not determine key in environment variable.");
+        }
+
+        var envVariable = envVarKey.GetText();
         IParseTree? closingSymbol = context.children[2];
         if (!"%".Equals(closingSymbol.GetText(), StringComparison.CurrentCultureIgnoreCase))
         {

diff --git a/tests/ExpressionStringEvaluator.Tests/IntegrationTests.cs b/tests/ExpressionStringEvaluator.Tests/IntegrationTests.cs
@@ -173,6 +173,15 @@ public void Dispose()
     [InlineData("{StringContains(abc, A)}", "false")] // case sensitive.
     [InlineData("{StringContains(abc , bc)}", "true")]
     [InlineData("{StringContains(abc def , \"c d\")}", "true")]
+    [InlineData("https://dev.azure.com/xx/_git {Env.ExpressionStringEvaluatorDummy}", "https://dev.azure.com/xx/_git Dummy value")]
+    [InlineData("https://dev.azure.com/xx/_git{Env.ExpressionStringEvaluatorDummy}", "https://dev.azure.com/xx/_gitDummy value")]
+    [InlineData("https://dev.azure.com/xx/_git2/{Env.ExpressionStringEvaluatorDummy}", "https://dev.azure.com/xx/_git2/Dummy value")]
+    [InlineData("https://dev.azure.com/xx/_git2/%ExpressionStringEvaluatorDummy%", "https://dev.azure.com/xx/_git2/Dummy value")]
+    [InlineData("https://dev.azure.com/xx/_git2/\\%%ExpressionStringEvaluatorDummy%", "https://dev.azure.com/xx/_git2/%Dummy value")]
+    [InlineData("https://dev.azure.com/xx/build?definitionScope=\\%5CIntegrations\\%5CData\\%5CAPI", "https://dev.azure.com/xx/build?definitionScope=%5CIntegrations%5CData%5CAPI")]
+    [InlineData("ABC\\{DEF", "ABC{DEF")]
+    [InlineData("ABC\\}DEF", "ABC}DEF")]
+    [InlineData("ABC\\\\DEF", "ABC\\DEF")]
     public void Parse(string input, string expectedOutput)
     {
         // arrange
@@ -191,7 +200,7 @@ public void Parse(string input, string expectedOutput)
     [InlineData("{trimEnd(tRue)}")] // this occurs becuase tRue is evaluated as string, not as text.
     [InlineData("x {ifthenelse({FileExists(dummyfile2.json)}, exist, )} y")] // todo fix, third argument is null
     [InlineData("{ifthenelse({FileExists(dummyfile2.json)}, exist, )}")]
-    [InlineData("{StringContains(\"abc def\" , \"c d\")}")]  //todo fix, first argument is different type as second.
+    [InlineData("{StringContains(\"abc def\" , \"c d\")}")] // todo fix, first argument is different type as second.
     public void Parse_ShouldThrow_WhenInvalidInput(string input)
     {
         // arrange