Revert formatting changed in ItemsControl

riganti · Jun 16, 2022 · 0fbf896 · 0fbf896
1 parent f0b12a1
commit 0fbf896
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/Framework/Framework/Controls/ItemsControl.cs b/src/Framework/Framework/Controls/ItemsControl.cs
@@ -99,22 +99,23 @@ private static ParameterExpression CreateIndexBindingExpression(DataContextStack
 
         protected IBinding GetIndexBinding(IDotvvmRequestContext context)
         {
-            var binding = GetValueRaw(Internal.CurrentIndexBindingProperty) as IBinding;
-            if (binding == null)
+            var result = GetValueRaw(Internal.CurrentIndexBindingProperty) as IBinding;
+            if (result is {})
+            {
+                return result;
+            }
+            else
             {
                 // slower path: create the _index binding at runtime and cache it
                 var bindingService = context.Services.GetRequiredService<BindingCompilationService>();
                 var dataContext = GetDataSourceBinding().GetProperty<CollectionElementDataContextBindingProperty>().DataContext;
-                binding = bindingService.Cache.CreateCachedBinding(
-                    "_index", new object[] { dataContext },
-                    () => new ValueBindingExpression<string>(bindingService, new object?[] {
+                return bindingService.Cache.CreateCachedBinding("_index", new object[] { dataContext }, () =>
+                    new ValueBindingExpression<string>(bindingService, new object?[] {
                         dataContext,
                         new ParsedExpressionBindingProperty(CreateIndexBindingExpression(dataContext))
                     }));
             }
 
-            return binding;
-
         }
     }
 }