Updating comment when calling foreach/where on emptyEnumerator

powercode · powercode · commit 1b79373aed68 · 2025-05-06T00:21:23.000+02:00
diff --git a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
@@ -6689,14 +6689,14 @@ public override DynamicMetaObject FallbackInvokeMember(DynamicMetaObject target,
                         .WriteToDebugLog(this);
                     BindingRestrictions argRestrictions = args.Aggregate(BindingRestrictions.Empty, static (current, arg) => current.Merge(arg.PSGetMethodArgumentRestriction()));
 
+                    // We need to pass the empty enumerator to the ForEach/Where operators, so that they can return an empty collection.
+                    // The ForEach/Where operators will not be able to call the script block if the enumerator is empty.
                     if (s_whereSearchValues.Contains(Name))
                     {
                         return InvokeWhereOnCollection(emptyEnumerator, args, argRestrictions).WriteToDebugLog(this);
                     }
 
-                    if (s_foreachSearchValues.Contains(Name))
-                        // We need to pass the empty enumerator to the ForEach operator, so that it can return an empty collection.
-                        // The ForEach operator will not be able to call the script block if the enumerator is empty.
+                    if (s_foreachSearchValues.Contains(Name))                        
                     {
                         return InvokeForEachOnCollection(emptyEnumerator, args, argRestrictions).WriteToDebugLog(this);
                     }

Original file line number	Diff line number	Diff line change
`@@ -6689,14 +6689,14 @@ public override DynamicMetaObject FallbackInvokeMember(DynamicMetaObject target,`
`6689`	`6689`	`.WriteToDebugLog(this);`
`6690`	`6690`	`BindingRestrictions argRestrictions = args.Aggregate(BindingRestrictions.Empty, static (current, arg) => current.Merge(arg.PSGetMethodArgumentRestriction()));`
`6691`	`6691`
	`6692`	`+ // We need to pass the empty enumerator to the ForEach/Where operators, so that they can return an empty collection.`
	`6693`	`+ // The ForEach/Where operators will not be able to call the script block if the enumerator is empty.`
`6692`	`6694`	`if (s_whereSearchValues.Contains(Name))`
`6693`	`6695`	`{`
`6694`	`6696`	`return InvokeWhereOnCollection(emptyEnumerator, args, argRestrictions).WriteToDebugLog(this);`
`6695`	`6697`	`}`
`6696`	`6698`
`6697`		`- if (s_foreachSearchValues.Contains(Name))`
`6698`		`- // We need to pass the empty enumerator to the ForEach operator, so that it can return an empty collection.`
`6699`		`- // The ForEach operator will not be able to call the script block if the enumerator is empty.`
	`6699`	`+ if (s_foreachSearchValues.Contains(Name))`
`6700`	`6700`	`{`
`6701`	`6701`	`return InvokeForEachOnCollection(emptyEnumerator, args, argRestrictions).WriteToDebugLog(this);`
`6702`	`6702`	`}`