Fix awaited range array

sebastienros · Jan 13, 2022 · 6d960ed · 6d960ed
1 parent be97fb9
commit 6d960ed
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/Fluid/Ast/RangeExpression.cs b/Fluid/Ast/RangeExpression.cs
@@ -30,22 +30,27 @@ public override ValueTask<FluidValue> EvaluateAsync(TemplateContext context)
                 start = Convert.ToInt32(startTask.Result.ToNumberValue());
                 end = Convert.ToInt32(endTask.Result.ToNumberValue());
 
-                // If end < start, we create an empty array
-                var list = new FluidValue[Math.Max(0, end - start + 1)];
-
-                for (var i = 0; i < list.Length; i++)
-                {
-                    list[i] = NumberValue.Create(start + i);
-                }
-
-                return new ArrayValue(list);
+                return BuildArray(start, end);
             }
             else
             {
                 return Awaited(startTask, endTask);
             }            
         }
 
+        private static FluidValue BuildArray(int start, int end)
+        {
+            // If end < start, we create an empty array
+            var list = new FluidValue[Math.Max(0, end - start + 1)];
+
+            for (var i = 0; i < list.Length; i++)
+            {
+                list[i] = NumberValue.Create(start + i);
+            }
+
+            return new ArrayValue(list);
+        }
+
         [MethodImpl(MethodImplOptions.NoInlining)]
         private async ValueTask<FluidValue> Awaited(
             ValueTask<FluidValue> leftTask,
@@ -54,14 +59,7 @@ private async ValueTask<FluidValue> Awaited(
             var start = Convert.ToInt32((await leftTask).ToNumberValue());
             var end = Convert.ToInt32((await rightTask).ToNumberValue());
 
-            var list = new FluidValue[Math.Max(1, end - start)];
-
-            for (var i = start; i <= end; i++)
-            {
-                list[i] = NumberValue.Create(i);
-            }
-
-            return new ArrayValue(list);
+            return BuildArray(start, end);
         }
     }
 }