Merging

microsoft · Jan 23, 2025 · 84ed0b2 · 84ed0b2
2 parents cc8c3b1 + 222fbe9
commit 84ed0b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryMutation.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryMutation.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.PowerFx.Core.Functions;
 using Microsoft.PowerFx.Core.IR;
 using Microsoft.PowerFx.Functions;
 using Microsoft.PowerFx.Interpreter.Localization;
@@ -425,20 +424,20 @@ public async Task<FormulaValue> InvokeAsync(FunctionInvokeInfo invokeInfo, Cance
     }
 
     // Remove(collection:*[], item1:![], item2:![], ..., ["All"])
-    internal class RemoveImpl : RemoveFunction, IAsyncTexlFunction3
+    internal class RemoveImpl : RemoveFunction, IFunctionInvoker
     {
-        public async Task<FormulaValue> InvokeAsync(FormulaType irContext, FormulaValue[] args, CancellationToken cancellationToken)
+        public async Task<FormulaValue> InvokeAsync(FunctionInvokeInfo invokeInfo, CancellationToken cancellationToken)
         {
-            return await MutationUtils.RemoveCore(irContext, args, cancellationToken).ConfigureAwait(false);
+            return await MutationUtils.RemoveCore(invokeInfo, cancellationToken).ConfigureAwait(false);
         }
     }
 
     // Remove(collection:*[], source:*[], ["All"])
-    internal class RemoveAllImpl : RemoveAllFunction, IAsyncTexlFunction3
+    internal class RemoveAllImpl : RemoveAllFunction, IFunctionInvoker
     {
-        public async Task<FormulaValue> InvokeAsync(FormulaType irContext, FormulaValue[] args, CancellationToken cancellationToken)
+        public async Task<FormulaValue> InvokeAsync(FunctionInvokeInfo invokeInfo, CancellationToken cancellationToken)
         {
-            return await MutationUtils.RemoveCore(irContext, args, cancellationToken).ConfigureAwait(false);
+            return await MutationUtils.RemoveCore(invokeInfo, cancellationToken).ConfigureAwait(false);
         }
     }
 }
diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/Mutation/MutationUtils.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/Mutation/MutationUtils.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.PowerFx.Core.IR;
+using Microsoft.PowerFx.Functions;
 using Microsoft.PowerFx.Interpreter.Localization;
 using Microsoft.PowerFx.Types;
 
@@ -46,8 +46,9 @@ public static DValue<RecordValue> MergeRecords(IEnumerable<FormulaValue> records
             return DValue<RecordValue>.Of(FormulaValue.NewRecordFromFields(mergedFields.Select(kvp => new NamedValue(kvp.Key, kvp.Value))));
         }
 
-        public static async Task<FormulaValue> RemoveCore(FormulaType irContext, FormulaValue[] args, CancellationToken cancellationToken)
+        public static async Task<FormulaValue> RemoveCore(FunctionInvokeInfo invokeInfo, CancellationToken cancellationToken)
         {
+            var args = invokeInfo.Args.ToArray();
             cancellationToken.ThrowIfCancellationRequested();
 
             FormulaValue arg0;
@@ -124,10 +125,10 @@ public static async Task<FormulaValue> RemoveCore(FormulaType irContext, Formula
                     });
                 }
 
-                return new ErrorValue(IRContext.NotInSource(irContext), errors);
+                return new ErrorValue(invokeInfo.IRContext, errors);
             }
 
-            return irContext == FormulaType.Void ? FormulaValue.NewVoid() : FormulaValue.NewBlank();
+            return invokeInfo.ReturnType == FormulaType.Void ? FormulaValue.NewVoid() : FormulaValue.NewBlank();
         }
     }
 }