Indexing Improvement

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -869,6 +869,9 @@ public void TypeTesting(string expression, Type type)
         [TestCase("List(\"hello\", \"bye\").Select(x => x.ToUpper()).ToList().FluidAdd(\"test\")[2]", ExpectedResult = "test", Category = "Complex expression,Fluid Functions")]
         [TestCase("List(\"hello\", \"bye\").Select(x => x.ToUpper()).ToList().FluidAdd(\"test\")[2]", ExpectedResult = "test", Category = "Complex expression,Fluid Functions")]
         [TestCase("$\"https://www.google.com/search?q={System.Net.WebUtility.UrlEncode(\"test of request with url encode() ?\")}\"", ExpectedResult = "https://www.google.com/search?q=test+of+request+with+url+encode()+%3F", Category = "Complex expression,Inline namespace")]
+        [TestCase("new System.Xml.XmlDocument().FluidLoadXml(\"<root><element id='MyElement'>Xml Content</element></root>\").SelectSingleNode(\"//element[@id='MyElement']\").InnerXml", ExpectedResult = "Xml Content", Category = "Complex expression,Inline namespace,Fluid")]
+        [TestCase("new System.Xml.XmlDocument().FluidLoadXml(\"<root><element id='MyElement'>Xml Content</element></root>\").ChildNodes[0].Name", ExpectedResult = "root", Category = "Complex expression,Inline namespace,Fluid,Custom Indexer")]
+
         #endregion
 
         #endregion

CodingSeb.ExpressionEvaluator.Tests/TestsUtils/ClassForTest1.cs

@@ -8,6 +8,8 @@ public class ClassForTest1
 
         public int IntProperty { get; set; } = 25;
 
+
+
         public static int StaticIntProperty { get; set; } = 67;
 
         public int Add3To(int value)

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -237,8 +237,19 @@ private enum TryBlockEvaluatedState
         {
             new Dictionary<ExpressionOperator, Func<dynamic, dynamic, object>>()
             {
-                {ExpressionOperator.Indexing, (dynamic left, dynamic right) => {
-                        return left is IDictionary<string,object> dictionaryLeft ? dictionaryLeft[right] : left[right];
+                {ExpressionOperator.Indexing, (dynamic left, dynamic right) => 
+                    {
+                        Type type = ((object)left).GetType();
+
+                        if(left is IDictionary<string, object> dictionaryLeft)
+                            return dictionaryLeft[right];
+                        else if(type.GetMethod("Item", new Type[] { ((object)right).GetType() }) is MethodInfo methodInfo)
+                        {
+                            return methodInfo.Invoke(left, new object[] { right });
+                        }
+
+
+                        return left[right];
                     }
                 },
                 {ExpressionOperator.IndexingWithNullConditional, (dynamic left, dynamic right) => left is IDictionary<string,object> dictionaryLeft ? dictionaryLeft[right] : left?[right] },