Revert Wrong formatting applied by .NET Tool

Nirmal4G · michael-hawker · commit bc8c3562587e · 2021-05-17T12:43:06.000-07:00
Both VS IDE Code Clean-up and dotnet-format applies this formatting.
Only Code labels and Code within pre-processor blocks are affected.

The reason may be that the indentation wasn't read/written properly
by the formatter within or around those code blocks.
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
@@ -667,7 +667,7 @@ private void UpdateTimestamp(ref int heapIndex)
                     goto Fallback;
                 }
 
-            Downheap:
+                Downheap:
 
                 // Assign a new timestamp to the target heap node. We use a
                 // local incremental timestamp instead of using the system timer
@@ -740,7 +740,7 @@ private void UpdateTimestamp(ref int heapIndex)
                     root = ref Unsafe.Add(ref heapEntriesRef, (nint)(uint)currentIndex);
                 }
 
-            Fallback:
+                Fallback:
 
                 UpdateAllTimestamps();
 
diff --git a/Microsoft.Toolkit.HighPerformance/Memory/Memory2D{T}.cs b/Microsoft.Toolkit.HighPerformance/Memory/Memory2D{T}.cs
@@ -819,7 +819,7 @@ public bool TryGetMemory(out Memory<T> memory)
                 return true;
             }
 
-        Failure:
+            Failure:
 
             memory = default;
 
diff --git a/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlyMemory2D{T}.cs b/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlyMemory2D{T}.cs
@@ -832,7 +832,7 @@ public bool TryGetMemory(out ReadOnlyMemory<T> memory)
                 return true;
             }
 
-        Failure:
+            Failure:
 
             memory = default;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/ListCollectionView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/ListCollectionView.cs
@@ -318,9 +318,9 @@ protected virtual int Compare(object o1, object o2)
                     return ActiveComparer.Compare(o1, o2);
                 }
 #endif
-            int i1 = InternalList.IndexOf(o1);
-            int i2 = InternalList.IndexOf(o2);
-            return i1 - i2;
+                int i1 = InternalList.IndexOf(o1);
+                int i2 = InternalList.IndexOf(o2);
+                return i1 - i2;
 #if FEATURE_ICOLLECTIONVIEW_GROUP
             }
             else
@@ -1701,7 +1701,7 @@ protected bool InternalContains(object item)
             if (!IsGrouping)
             {
 #endif
-            return InternalList.Contains(item);
+                return InternalList.Contains(item);
 #if FEATURE_ICOLLECTIONVIEW_GROUP
             }
             else
@@ -1724,7 +1724,7 @@ protected IEnumerator InternalGetEnumerator()
 #if FEATURE_IEDITABLECOLLECTIONVIEW
                 return new PlaceholderAwareEnumerator(this, InternalList.GetEnumerator(), _newItem);
 #else
-            return new PlaceholderAwareEnumerator(this, InternalList.GetEnumerator(), NoNewItem);
+                return new PlaceholderAwareEnumerator(this, InternalList.GetEnumerator(), NoNewItem);
 #endif
 #if FEATURE_ICOLLECTIONVIEW_GROUP
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs
@@ -238,14 +238,12 @@ protected override object GetPatternCore(PatternInterface patternInterface)
                 case PatternInterface.Table:
                     return this;
                 case PatternInterface.Scroll:
+                    if (this.HorizontallyScrollable || this.VerticallyScrollable)
                     {
-                        if (this.HorizontallyScrollable || this.VerticallyScrollable)
-                        {
-                            return this;
-                        }
-
-                        break;
+                        return this;
                     }
+
+                    break;
             }
 
             return base.GetPatternCore(patternInterface);
@@ -814,38 +812,38 @@ internal void RaiseAutomationInvokeEvents(DataGridEditingUnit editingUnit, DataG
             switch (editingUnit)
             {
                 case DataGridEditingUnit.Cell:
+                {
+                    DataGridCell cell = row.Cells[column.Index];
+                    AutomationPeer peer = FromElement(cell);
+                    if (peer != null)
                     {
-                        DataGridCell cell = row.Cells[column.Index];
-                        AutomationPeer peer = FromElement(cell);
-                        if (peer != null)
-                        {
-                            peer.InvalidatePeer();
-                        }
-                        else
-                        {
-                            peer = CreatePeerForElement(cell);
-                        }
+                        peer.InvalidatePeer();
+                    }
+                    else
+                    {
+                        peer = CreatePeerForElement(cell);
+                    }
 
-                        if (peer != null)
-                        {
+                    if (peer != null)
+                    {
 #if DEBUG_AUTOMATION
                         Debug.WriteLine(peer.ToString() + ".RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked)");
 #endif
-                            peer.RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked);
-                        }
-
-                        break;
+                        peer.RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked);
                     }
 
+                    break;
+                }
+
                 case DataGridEditingUnit.Row:
-                    {
-                        DataGridItemAutomationPeer peer = GetOrCreateItemPeer(row.DataContext);
+                {
+                    DataGridItemAutomationPeer peer = GetOrCreateItemPeer(row.DataContext);
 #if DEBUG_AUTOMATION
                     Debug.WriteLine("DataGridItemAutomationPeer.RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked)");
 #endif
-                        peer.RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked);
-                        break;
-                    }
+                    peer.RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked);
+                    break;
+                }
             }
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs
@@ -177,10 +177,10 @@ protected override IList<AutomationPeer> GetChildrenCore()
             {
 #endif
 #pragma warning disable SA1137 // Elements should have the same indentation
-            foreach (object item in _group.GroupItems /*Items*/)
-            {
-                children.Add(this.OwningDataGridPeer.GetOrCreateItemPeer(item));
-            }
+                foreach (object item in _group.GroupItems /*Items*/)
+                {
+                    children.Add(this.OwningDataGridPeer.GetOrCreateItemPeer(item));
+                }
 #pragma warning restore SA1137 // Elements should have the same indentation
 #if FEATURE_ICOLLECTIONVIEW_GROUP
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
@@ -256,26 +256,20 @@ protected override object GetPatternCore(PatternInterface patternInterface)
             switch (patternInterface)
             {
                 case PatternInterface.Invoke:
+                    if (!this.OwningDataGrid.IsReadOnly)
                     {
-                        if (!this.OwningDataGrid.IsReadOnly)
-                        {
-                            return this;
-                        }
-
-                        break;
+                        return this;
                     }
 
+                    break;
                 case PatternInterface.ScrollItem:
+                    if (this.OwningDataGrid.VerticalScrollBar != null &&
+                        this.OwningDataGrid.VerticalScrollBar.Maximum > 0)
                     {
-                        if (this.OwningDataGrid.VerticalScrollBar != null &&
-                            this.OwningDataGrid.VerticalScrollBar.Maximum > 0)
-                        {
-                            return this;
-                        }
-
-                        break;
+                        return this;
                     }
 
+                    break;
                 case PatternInterface.Selection:
                 case PatternInterface.SelectionItem:
                     return this;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridColumnHeader.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridColumnHeader.cs
@@ -711,37 +711,37 @@ private void DataGridColumnHeader_PointerReleased(object sender, PointerRoutedEv
                 switch (interactionInfo.DragMode)
                 {
                     case DragMode.PointerPressed:
-                        {
-                            // Completed a click or tap without dragging, so raise the DataGrid.Sorting event.
-                            InvokeProcessSort();
-                            break;
-                        }
+                    {
+                        // Completed a click or tap without dragging, so raise the DataGrid.Sorting event.
+                        InvokeProcessSort();
+                        break;
+                    }
 
                     case DragMode.Reorder:
-                        {
-                            // Find header hovered over
-                            int targetIndex = this.GetReorderingTargetDisplayIndex(pointerPositionHeaders);
-
-                            if ((!this.OwningColumn.IsFrozen && targetIndex >= this.OwningGrid.FrozenColumnCount) ||
-                                (this.OwningColumn.IsFrozen && targetIndex < this.OwningGrid.FrozenColumnCount))
-                            {
-                                this.OwningColumn.DisplayIndex = targetIndex;
+                    {
+                        // Find header hovered over
+                        int targetIndex = this.GetReorderingTargetDisplayIndex(pointerPositionHeaders);
 
-                                DataGridColumnEventArgs ea = new DataGridColumnEventArgs(this.OwningColumn);
-                                this.OwningGrid.OnColumnReordered(ea);
-                            }
+                        if ((!this.OwningColumn.IsFrozen && targetIndex >= this.OwningGrid.FrozenColumnCount) ||
+                            (this.OwningColumn.IsFrozen && targetIndex < this.OwningGrid.FrozenColumnCount))
+                        {
+                            this.OwningColumn.DisplayIndex = targetIndex;
 
-                            DragCompletedEventArgs dragCompletedEventArgs = new DragCompletedEventArgs(pointerPosition.X - interactionInfo.DragStart.Value.X, pointerPosition.Y - interactionInfo.DragStart.Value.Y, false);
-                            this.OwningGrid.OnColumnHeaderDragCompleted(dragCompletedEventArgs);
-                            break;
+                            DataGridColumnEventArgs ea = new DataGridColumnEventArgs(this.OwningColumn);
+                            this.OwningGrid.OnColumnReordered(ea);
                         }
 
+                        DragCompletedEventArgs dragCompletedEventArgs = new DragCompletedEventArgs(pointerPosition.X - interactionInfo.DragStart.Value.X, pointerPosition.Y - interactionInfo.DragStart.Value.Y, false);
+                        this.OwningGrid.OnColumnHeaderDragCompleted(dragCompletedEventArgs);
+                        break;
+                    }
+
                     case DragMode.Drag:
-                        {
-                            DragCompletedEventArgs dragCompletedEventArgs = new DragCompletedEventArgs(0, 0, false);
-                            this.OwningGrid.OnColumnHeaderDragCompleted(dragCompletedEventArgs);
-                            break;
-                        }
+                    {
+                        DragCompletedEventArgs dragCompletedEventArgs = new DragCompletedEventArgs(0, 0, false);
+                        this.OwningGrid.OnColumnHeaderDragCompleted(dragCompletedEventArgs);
+                        break;
+                    }
                 }
 
                 SetResizeCursor(e.Pointer, pointerPosition);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToColorShadeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToColorShadeConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.LogicalTree.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.LogicalTree.cs
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs

Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,7 @@ private void UpdateTimestamp(ref int heapIndex)`
`667`	`667`	`goto Fallback;`
`668`	`668`	`}`
`669`	`669`
`670`		`- Downheap:`
	`670`	`+ Downheap:`
`671`	`671`
`672`	`672`	`// Assign a new timestamp to the target heap node. We use a`
`673`	`673`	`// local incremental timestamp instead of using the system timer`
`@@ -740,7 +740,7 @@ private void UpdateTimestamp(ref int heapIndex)`
`740`	`740`	`root = ref Unsafe.Add(ref heapEntriesRef, (nint)(uint)currentIndex);`
`741`	`741`	`}`
`742`	`742`
`743`		`- Fallback:`
	`743`	`+ Fallback:`
`744`	`744`
`745`	`745`	`UpdateAllTimestamps();`
`746`	`746`
Original file line number	Diff line number	Diff line change
`@@ -819,7 +819,7 @@ public bool TryGetMemory(out Memory<T> memory)`
`819`	`819`	`return true;`
`820`	`820`	`}`
`821`	`821`
`822`		`- Failure:`
	`822`	`+ Failure:`
`823`	`823`
`824`	`824`	`memory = default;`
`825`	`825`
Original file line number	Diff line number	Diff line change
`@@ -832,7 +832,7 @@ public bool TryGetMemory(out ReadOnlyMemory<T> memory)`
`832`	`832`	`return true;`
`833`	`833`	`}`
`834`	`834`
`835`		`- Failure:`
	`835`	`+ Failure:`
`836`	`836`
`837`	`837`	`memory = default;`
`838`	`838`
Original file line number	Diff line number	Diff line change
`@@ -318,9 +318,9 @@ protected virtual int Compare(object o1, object o2)`
`318`	`318`	`return ActiveComparer.Compare(o1, o2);`
`319`	`319`	`}`
`320`	`320`	`#endif`
`321`		`- int i1 = InternalList.IndexOf(o1);`
`322`		`- int i2 = InternalList.IndexOf(o2);`
`323`		`- return i1 - i2;`
	`321`	`+ int i1 = InternalList.IndexOf(o1);`
	`322`	`+ int i2 = InternalList.IndexOf(o2);`
	`323`	`+ return i1 - i2;`
`324`	`324`	`#if FEATURE_ICOLLECTIONVIEW_GROUP`
`325`	`325`	`}`
`326`	`326`	`else`
`@@ -1701,7 +1701,7 @@ protected bool InternalContains(object item)`
`1701`	`1701`	`if (!IsGrouping)`
`1702`	`1702`	`{`
`1703`	`1703`	`#endif`
`1704`		`- return InternalList.Contains(item);`
	`1704`	`+ return InternalList.Contains(item);`
`1705`	`1705`	`#if FEATURE_ICOLLECTIONVIEW_GROUP`
`1706`	`1706`	`}`
`1707`	`1707`	`else`
`@@ -1724,7 +1724,7 @@ protected IEnumerator InternalGetEnumerator()`
`1724`	`1724`	`#if FEATURE_IEDITABLECOLLECTIONVIEW`
`1725`	`1725`	`return new PlaceholderAwareEnumerator(this, InternalList.GetEnumerator(), _newItem);`
`1726`	`1726`	`#else`
`1727`		`- return new PlaceholderAwareEnumerator(this, InternalList.GetEnumerator(), NoNewItem);`
	`1727`	`+ return new PlaceholderAwareEnumerator(this, InternalList.GetEnumerator(), NoNewItem);`
`1728`	`1728`	`#endif`
`1729`	`1729`	`#if FEATURE_ICOLLECTIONVIEW_GROUP`
`1730`	`1730`	`}`