Added new method on IExternalRule to help with invariantexpression ch…

…eck.
microsoft · Oct 30, 2024 · a690643 · a690643
1 parent bc2b841
commit a690643
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/libraries/Microsoft.PowerFx.Core/App/Controls/IExternalRule.cs b/src/libraries/Microsoft.PowerFx.Core/App/Controls/IExternalRule.cs
@@ -22,5 +22,8 @@ internal interface IExternalRule
 
         // Returns true when Binding is non-null, otherwise false.
         bool HasValidBinding { get; }
+
+        // Returns true when rule is constant.Adds valid null binding when addValidBindingIfNotPresent is true.
+        bool IsInvariantExpression(bool addValidBindingIfNotPresent);
     }
 }
diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/Binder.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/Binder.cs
@@ -3619,9 +3619,7 @@ public override void PostVisit(DottedNameNode node)
                     // we need to mark the node as constant, and save the control info so we may look up the
                     // rule later.
                     if (controlInfo?.GetRule(property.InvariantName) is IExternalRule rule &&
-                        rule.HasValidBinding &&
-                        !rule.HasErrorsOrWarnings &&
-                        rule.Binding.IsConstant(rule.Binding.Top))
+                        rule.IsInvariantExpression(addValidBindingIfNotPresent: true))
                     {
                         value = controlInfo;
                         isConstant = true;