fix: revert assertPosition to AddAssert, fix InspectCode warnings (blank lines, redundant qualifiers)

Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/f6a724cd-01fb-4c3e-8c92-b27fbcfada86

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>

Author: Copilot

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs

@@ -3,21 +3,18 @@
 
 #nullable disable
 
-using System.Collections.Generic;
 using System;
+using System.Collections.Generic;
 using System.Numerics;
-
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
-
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 
-using JetBrains.Annotations;
-
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public partial class DrawableSliderRepeat : DrawableOsuHitObject

osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs

@@ -235,8 +235,8 @@ private void assertChildPosition(int index) => AddAssert($"hitobject {index} chi
                 yScale * (float)((TestParentHitObject)d.HitObject).ChildTimeOffset / time_range, 0.1f);
         });
 
-        private void assertPosition(int index, float relativeY) => AddUntilStep($"hitobject {index} at {relativeY}",
-            () => Precision.AlmostEquals(getDrawableHitObject(index)?.DrawPosition.Y / yScale ?? -1, relativeY, Precision.FLOAT_EPSILON));
+        private void assertPosition(int index, float relativeY) => AddAssert($"hitobject {index} at {relativeY}",
+            () => getDrawableHitObject(index)?.DrawPosition.Y / yScale ?? -1, () => Is.EqualTo(relativeY).Within(Precision.FLOAT_EPSILON));
 
         private void setTime(double time)
         {

osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs

@@ -172,8 +172,8 @@ from rotation in rotationSteps
 
         private bool uprightAspectMaintainingContainerStateIsValid(Container parent, UprightAspectMaintainingContainer child)
         {
-            System.Numerics.Matrix3x2 parentMatrix = parent.DrawInfo.Matrix;
-            System.Numerics.Matrix3x2 childMatrix = child.DrawInfo.Matrix;
+            Matrix3x2 parentMatrix = parent.DrawInfo.Matrix;
+            Matrix3x2 childMatrix = child.DrawInfo.Matrix;
             float childScaleX = MathF.Sqrt(childMatrix.M11 * childMatrix.M11 + childMatrix.M12 * childMatrix.M12);
             float childScaleY = MathF.Sqrt(childMatrix.M21 * childMatrix.M21 + childMatrix.M22 * childMatrix.M22);
             float parentScaleX = MathF.Sqrt(parentMatrix.M11 * parentMatrix.M11 + parentMatrix.M12 * parentMatrix.M12);

osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs

@@ -136,7 +136,7 @@ public void SetContent(DifficultyIconTooltipContent content)
             bpm.Text = " BPM: " + Math.Round(bpmAdjusted, 0);
         }
 
-        public void Move(System.Numerics.Vector2 pos) => Position = pos;
+        public void Move(Vector2 pos) => Position = pos;
 
         protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
 

osu.Game/Collections/DrawableCollectionListItem.cs

@@ -236,7 +236,7 @@ private void load(OsuColour colours)
                 };
             }
 
-            public override bool ReceivePositionalInputAt(System.Numerics.Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) && !IsTextBoxHovered(screenSpacePos);
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) && !IsTextBoxHovered(screenSpacePos);
 
             protected override bool OnHover(HoverEvent e)
             {

osu.Game/Graphics/Carousel/Carousel.ScrollContainer.cs

@@ -46,10 +46,9 @@ protected partial class ScrollContainer : UserTrackingScrollContainer, IKeyBindi
             /// <summary>
             /// Allow handling right click scroll outside of the carousel's display area.
             /// </summary>
-            public override bool ReceivePositionalInputAt(System.Numerics.Vector2 screenSpacePos) => true;
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
             public ScrollContainer()
-            {
                 // Managing our own custom layout within ScrollContent causes feedback with public ScrollContainer calculations,
                 // so we must maintain one level of separation from ScrollContent.
                 base.Add(Panels = new Container
@@ -81,7 +80,7 @@ public override void Add(Drawable drawable)
                 Panels.Add(drawable);
             }
 
-            public override double GetChildPosInContent(Drawable d, System.Numerics.Vector2 offset)
+            public override double GetChildPosInContent(Drawable d, Vector2 offset)
             {
                 if (d is not ICarouselPanel panel)
                     return base.GetChildPosInContent(d, offset);

osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs

@@ -115,7 +115,7 @@ protected override void OnDragEnd(DragEndEvent e)
             base.OnDragEnd(e);
         }
 
-        protected override bool IsDraggableAt(System.Numerics.Vector2 screenSpacePos) => handle.HandlingDrag;
+        protected override bool IsDraggableAt(Vector2 screenSpacePos) => handle.HandlingDrag;
 
         protected override bool OnHover(HoverEvent e)
         {

osu.Game/Graphics/Containers/ScalingContainer.cs

@@ -40,7 +40,7 @@ public partial class ScalingContainer : Container
         private readonly Container content;
         protected override Container<Drawable> Content => content;
 
-        public override bool ReceivePositionalInputAt(System.Numerics.Vector2 screenSpacePos) => true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         private readonly Container sizableContainer;
 
@@ -94,7 +94,7 @@ public partial class ScalingDrawSizePreservingFillContainer : DrawSizePreserving
 
             protected float CurrentScale { get; private set; } = 1;
 
-            public override bool ReceivePositionalInputAt(System.Numerics.Vector2 screenSpacePos) => true;
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
             public ScalingDrawSizePreservingFillContainer(bool applyUIScale)
             {
@@ -260,7 +260,7 @@ private partial class SizeableAlwaysInputContainer : Container
             private readonly bool confineHostCursor;
             private readonly LayoutValue cursorRectCache = new LayoutValue(Invalidation.RequiredParentSizeToFit);
 
-            public override bool ReceivePositionalInputAt(System.Numerics.Vector2 screenSpacePos) => true;
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
             /// <summary>
             /// Container used for sizing/positioning purposes in <see cref="ScalingContainer"/>. Always receives mouse input.

osu.Game/Graphics/UserInterface/RoundedSliderBar.cs

@@ -12,7 +12,6 @@
 using osu.Framework.Input.Events;
 using osu.Game.Overlays;
 
-
 namespace osu.Game.Graphics.UserInterface
 {
     public partial class RoundedSliderBar<T> : OsuSliderBar<T>

osu.Game/Graphics/UserInterface/ShearedRangeSlider.cs

@@ -246,7 +246,7 @@ protected virtual void UpdateDisplay(double value)
                     NubText.Text = value.ToLocalisableString(@"N1");
             }
 
-            public override bool ReceivePositionalInputAt(System.Numerics.Vector2 screenSpacePos)
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
             {
                 if (isUpper)
                     return base.ReceivePositionalInputAt(screenSpacePos) && screenSpacePos.X > rangeSlider.ScreenSpaceHalfwayPoint.X;