Return type based on PFxV1 flag.

microsoft · Dec 16, 2024 · 8fe1a97 · 8fe1a97
1 parent 5e675d8
commit 8fe1a97
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Remove.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Remove.cs
@@ -187,15 +187,7 @@ public override bool CheckTypes(CheckTypesContext context, TexlNode[] args, DTyp
                 }
             }
 
-            if (context.AnalysisMode)
-            {
-                // Remove returns the new collection, so the return schema is the same as the collection schema.
-                returnType = collectionType;
-            }
-            else
-            {
-                returnType = DType.Void;
-            }
+            returnType = context.Features.PowerFxV1CompatibilityRules ? DType.Void : collectionType;
 
             return fValid;
         }
@@ -459,15 +451,7 @@ public override bool CheckTypes(CheckTypesContext context, TexlNode[] args, DTyp
                 }
             }
 
-            if (context.AnalysisMode)
-            {
-                // Remove returns the new collection, so the return schema is the same as the collection schema.
-                returnType = collectionType;
-            }
-            else
-            {
-                returnType = DType.Void;
-            }
+            returnType = context.Features.PowerFxV1CompatibilityRules ? DType.Void : collectionType;
 
             return fValid;
         }