Skip to content

Commit bc8c356

Browse files
Nirmal4Gmichael-hawker
Nirmal4G
authored and
michael-hawker
committed
Revert Wrong formatting applied by .NET Tool
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.
1 parent 74e52be commit bc8c356

File tree

12 files changed

+240
-248
lines changed

12 files changed

+240
-248
lines changed

‎Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ private void UpdateTimestamp(ref int heapIndex)
667667
goto Fallback;
668668
}
669669

670-
Downheap:
670+
Downheap:
671671

672672
// Assign a new timestamp to the target heap node. We use a
673673
// local incremental timestamp instead of using the system timer
@@ -740,7 +740,7 @@ private void UpdateTimestamp(ref int heapIndex)
740740
root = ref Unsafe.Add(ref heapEntriesRef, (nint)(uint)currentIndex);
741741
}
742742

743-
Fallback:
743+
Fallback:
744744

745745
UpdateAllTimestamps();
746746

‎Microsoft.Toolkit.HighPerformance/Memory/Memory2D{T}.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ public bool TryGetMemory(out Memory<T> memory)
819819
return true;
820820
}
821821

822-
Failure:
822+
Failure:
823823

824824
memory = default;
825825

‎Microsoft.Toolkit.HighPerformance/Memory/ReadOnlyMemory2D{T}.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ public bool TryGetMemory(out ReadOnlyMemory<T> memory)
832832
return true;
833833
}
834834

835-
Failure:
835+
Failure:
836836

837837
memory = default;
838838

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/CollectionViews/ListCollectionView.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,9 @@ protected virtual int Compare(object o1, object o2)
318318
return ActiveComparer.Compare(o1, o2);
319319
}
320320
#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;
324324
#if FEATURE_ICOLLECTIONVIEW_GROUP
325325
}
326326
else
@@ -1701,7 +1701,7 @@ protected bool InternalContains(object item)
17011701
if (!IsGrouping)
17021702
{
17031703
#endif
1704-
return InternalList.Contains(item);
1704+
return InternalList.Contains(item);
17051705
#if FEATURE_ICOLLECTIONVIEW_GROUP
17061706
}
17071707
else
@@ -1724,7 +1724,7 @@ protected IEnumerator InternalGetEnumerator()
17241724
#if FEATURE_IEDITABLECOLLECTIONVIEW
17251725
return new PlaceholderAwareEnumerator(this, InternalList.GetEnumerator(), _newItem);
17261726
#else
1727-
return new PlaceholderAwareEnumerator(this, InternalList.GetEnumerator(), NoNewItem);
1727+
return new PlaceholderAwareEnumerator(this, InternalList.GetEnumerator(), NoNewItem);
17281728
#endif
17291729
#if FEATURE_ICOLLECTIONVIEW_GROUP
17301730
}

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -238,14 +238,12 @@ protected override object GetPatternCore(PatternInterface patternInterface)
238238
case PatternInterface.Table:
239239
return this;
240240
case PatternInterface.Scroll:
241+
if (this.HorizontallyScrollable || this.VerticallyScrollable)
241242
{
242-
if (this.HorizontallyScrollable || this.VerticallyScrollable)
243-
{
244-
return this;
245-
}
246-
247-
break;
243+
return this;
248244
}
245+
246+
break;
249247
}
250248

251249
return base.GetPatternCore(patternInterface);
@@ -814,38 +812,38 @@ internal void RaiseAutomationInvokeEvents(DataGridEditingUnit editingUnit, DataG
814812
switch (editingUnit)
815813
{
816814
case DataGridEditingUnit.Cell:
815+
{
816+
DataGridCell cell = row.Cells[column.Index];
817+
AutomationPeer peer = FromElement(cell);
818+
if (peer != null)
817819
{
818-
DataGridCell cell = row.Cells[column.Index];
819-
AutomationPeer peer = FromElement(cell);
820-
if (peer != null)
821-
{
822-
peer.InvalidatePeer();
823-
}
824-
else
825-
{
826-
peer = CreatePeerForElement(cell);
827-
}
820+
peer.InvalidatePeer();
821+
}
822+
else
823+
{
824+
peer = CreatePeerForElement(cell);
825+
}
828826

829-
if (peer != null)
830-
{
827+
if (peer != null)
828+
{
831829
#if DEBUG_AUTOMATION
832830
Debug.WriteLine(peer.ToString() + ".RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked)");
833831
#endif
834-
peer.RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked);
835-
}
836-
837-
break;
832+
peer.RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked);
838833
}
839834

835+
break;
836+
}
837+
840838
case DataGridEditingUnit.Row:
841-
{
842-
DataGridItemAutomationPeer peer = GetOrCreateItemPeer(row.DataContext);
839+
{
840+
DataGridItemAutomationPeer peer = GetOrCreateItemPeer(row.DataContext);
843841
#if DEBUG_AUTOMATION
844842
Debug.WriteLine("DataGridItemAutomationPeer.RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked)");
845843
#endif
846-
peer.RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked);
847-
break;
848-
}
844+
peer.RaiseAutomationEvent(AutomationEvents.InvokePatternOnInvoked);
845+
break;
846+
}
849847
}
850848
}
851849

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ protected override IList<AutomationPeer> GetChildrenCore()
177177
{
178178
#endif
179179
#pragma warning disable SA1137 // Elements should have the same indentation
180-
foreach (object item in _group.GroupItems /*Items*/)
181-
{
182-
children.Add(this.OwningDataGridPeer.GetOrCreateItemPeer(item));
183-
}
180+
foreach (object item in _group.GroupItems /*Items*/)
181+
{
182+
children.Add(this.OwningDataGridPeer.GetOrCreateItemPeer(item));
183+
}
184184
#pragma warning restore SA1137 // Elements should have the same indentation
185185
#if FEATURE_ICOLLECTIONVIEW_GROUP
186186
}

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -256,26 +256,20 @@ protected override object GetPatternCore(PatternInterface patternInterface)
256256
switch (patternInterface)
257257
{
258258
case PatternInterface.Invoke:
259+
if (!this.OwningDataGrid.IsReadOnly)
259260
{
260-
if (!this.OwningDataGrid.IsReadOnly)
261-
{
262-
return this;
263-
}
264-
265-
break;
261+
return this;
266262
}
267263

264+
break;
268265
case PatternInterface.ScrollItem:
266+
if (this.OwningDataGrid.VerticalScrollBar != null &&
267+
this.OwningDataGrid.VerticalScrollBar.Maximum > 0)
269268
{
270-
if (this.OwningDataGrid.VerticalScrollBar != null &&
271-
this.OwningDataGrid.VerticalScrollBar.Maximum > 0)
272-
{
273-
return this;
274-
}
275-
276-
break;
269+
return this;
277270
}
278271

272+
break;
279273
case PatternInterface.Selection:
280274
case PatternInterface.SelectionItem:
281275
return this;

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridColumnHeader.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -711,37 +711,37 @@ private void DataGridColumnHeader_PointerReleased(object sender, PointerRoutedEv
711711
switch (interactionInfo.DragMode)
712712
{
713713
case DragMode.PointerPressed:
714-
{
715-
// Completed a click or tap without dragging, so raise the DataGrid.Sorting event.
716-
InvokeProcessSort();
717-
break;
718-
}
714+
{
715+
// Completed a click or tap without dragging, so raise the DataGrid.Sorting event.
716+
InvokeProcessSort();
717+
break;
718+
}
719719

720720
case DragMode.Reorder:
721-
{
722-
// Find header hovered over
723-
int targetIndex = this.GetReorderingTargetDisplayIndex(pointerPositionHeaders);
724-
725-
if ((!this.OwningColumn.IsFrozen && targetIndex >= this.OwningGrid.FrozenColumnCount) ||
726-
(this.OwningColumn.IsFrozen && targetIndex < this.OwningGrid.FrozenColumnCount))
727-
{
728-
this.OwningColumn.DisplayIndex = targetIndex;
721+
{
722+
// Find header hovered over
723+
int targetIndex = this.GetReorderingTargetDisplayIndex(pointerPositionHeaders);
729724

730-
DataGridColumnEventArgs ea = new DataGridColumnEventArgs(this.OwningColumn);
731-
this.OwningGrid.OnColumnReordered(ea);
732-
}
725+
if ((!this.OwningColumn.IsFrozen && targetIndex >= this.OwningGrid.FrozenColumnCount) ||
726+
(this.OwningColumn.IsFrozen && targetIndex < this.OwningGrid.FrozenColumnCount))
727+
{
728+
this.OwningColumn.DisplayIndex = targetIndex;
733729

734-
DragCompletedEventArgs dragCompletedEventArgs = new DragCompletedEventArgs(pointerPosition.X - interactionInfo.DragStart.Value.X, pointerPosition.Y - interactionInfo.DragStart.Value.Y, false);
735-
this.OwningGrid.OnColumnHeaderDragCompleted(dragCompletedEventArgs);
736-
break;
730+
DataGridColumnEventArgs ea = new DataGridColumnEventArgs(this.OwningColumn);
731+
this.OwningGrid.OnColumnReordered(ea);
737732
}
738733

734+
DragCompletedEventArgs dragCompletedEventArgs = new DragCompletedEventArgs(pointerPosition.X - interactionInfo.DragStart.Value.X, pointerPosition.Y - interactionInfo.DragStart.Value.Y, false);
735+
this.OwningGrid.OnColumnHeaderDragCompleted(dragCompletedEventArgs);
736+
break;
737+
}
738+
739739
case DragMode.Drag:
740-
{
741-
DragCompletedEventArgs dragCompletedEventArgs = new DragCompletedEventArgs(0, 0, false);
742-
this.OwningGrid.OnColumnHeaderDragCompleted(dragCompletedEventArgs);
743-
break;
744-
}
740+
{
741+
DragCompletedEventArgs dragCompletedEventArgs = new DragCompletedEventArgs(0, 0, false);
742+
this.OwningGrid.OnColumnHeaderDragCompleted(dragCompletedEventArgs);
743+
break;
744+
}
745745
}
746746

747747
SetResizeCursor(e.Pointer, pointerPosition);

0 commit comments

Comments
 (0)