aecw/Ez2Lazer
1
0
Fork 0
mirror of https://github.com/SK-la/Ez2Lazer.git synced 2026-03-13 11:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply new inspections from 2026.1EAP1

Browse Source 
Nothing really egregious here so not bothering with PR review. One dodgy
bug which has been
[reported](https://youtrack.jetbrains.com/issue/RIDER-135036/Incorrect-recursive-on-all-execution-paths-inspection)
and temporarily ignored.
This commit is contained in:
Dean Herbert
2026-01-26 15:12:49 +09:00
committed by LA
parent 6999de4645
commit 3e0abdace8
23 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Mania/UI/Stage.cs
View File

@@ -207,7 +207,7 @@ namespace osu.Game.Rulesets.Mania.UI
var hitWindows = new ManiaHitWindows(); var hitWindows = new ManiaHitWindows();
AddInternal(judgementPooler = new JudgementPooler<DrawableManiaJudgement>(Enum.GetValues<HitResult>().Where(r => hitWindows.IsHitResultAllowed(r)))); AddInternal(judgementPooler = new JudgementPooler<DrawableManiaJudgement>(Enum.GetValues<HitResult>().Where(hitWindows.IsHitResultAllowed)));
RegisterPool<BarLine, DrawableBarLine>(50, 200); RegisterPool<BarLine, DrawableBarLine>(50, 200);
} }

2
osu.Game.Rulesets.Osu.Tests/TestSceneShaking.cs
View File

@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Tests
Debug.Assert(drawableHitObject.HitObject.HitWindows != null); Debug.Assert(drawableHitObject.HitObject.HitWindows != null);
double delay = drawableHitObject.HitObject.StartTime - (drawableHitObject.HitObject.HitWindows.WindowFor(HitResult.Miss) + RNG.Next(0, 300)) - Time.Current; double delay = drawableHitObject.HitObject.StartTime - (drawableHitObject.HitObject.HitWindows.WindowFor(HitResult.Miss) + RNG.Next(0, 300)) - Time.Current;
scheduledTasks.Add(Scheduler.AddDelayed(() => drawableHitObject.TriggerJudgement(), delay)); scheduledTasks.Add(Scheduler.AddDelayed(drawableHitObject.TriggerJudgement, delay));
return drawableHitObject; return drawableHitObject;
} }

2
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@@ -194,7 +194,7 @@ namespace osu.Game.Rulesets.Taiko.UI
var hitWindows = new TaikoHitWindows(); var hitWindows = new TaikoHitWindows();
HitResult[] usableHitResults = Enum.GetValues<HitResult>().Where(r => hitWindows.IsHitResultAllowed(r)).ToArray(); HitResult[] usableHitResults = Enum.GetValues<HitResult>().Where(hitWindows.IsHitResultAllowed).ToArray();
AddInternal(judgementPooler = new JudgementPooler<DrawableTaikoJudgement>(usableHitResults)); AddInternal(judgementPooler = new JudgementPooler<DrawableTaikoJudgement>(usableHitResults));

4
osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
View File

@@ -247,7 +247,7 @@ namespace osu.Game.Tests.Beatmaps
AddStep("change all start times", () => AddStep("change all start times", () =>
{ {
editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h); editorBeatmap.HitObjectUpdated += updatedObjects.Add;
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
allHitObjects[i].StartTime += 10; allHitObjects[i].StartTime += 10;
@@ -282,7 +282,7 @@ namespace osu.Game.Tests.Beatmaps
AddStep("change start time twice", () => AddStep("change start time twice", () =>
{ {
editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h); editorBeatmap.HitObjectUpdated += updatedObjects.Add;
editorBeatmap.HitObjects[0].StartTime = 10; editorBeatmap.HitObjects[0].StartTime = 10;
editorBeatmap.HitObjects[0].StartTime = 20; editorBeatmap.HitObjects[0].StartTime = 20;

5
osu.Game.Tests/Database/BeatmapImporterTests.cs
View File

@@ -104,10 +104,7 @@ namespace osu.Game.Tests.Database
Assert.AreNotEqual(detachedBeatmapSet.Status, BeatmapOnlineStatus.Ranked); Assert.AreNotEqual(detachedBeatmapSet.Status, BeatmapOnlineStatus.Ranked);
detachedBeatmapSet.Status = BeatmapOnlineStatus.Ranked; detachedBeatmapSet.Status = BeatmapOnlineStatus.Ranked;
beatmapSet.PerformWrite(s => beatmapSet.PerformWrite(detachedBeatmapSet.CopyChangesToRealm);
{
detachedBeatmapSet.CopyChangesToRealm(s);
});
beatmapSet.PerformRead(s => beatmapSet.PerformRead(s =>
{ {

2
osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
View File

@@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.Gameplay
{ {
List<SkinBlueprint> blueprints = new List<SkinBlueprint>(); List<SkinBlueprint> blueprints = new List<SkinBlueprint>();
AddStep("clear list", () => blueprints.Clear()); AddStep("clear list", blueprints.Clear);
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {

14
osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapTitleWedge.cs
View File

@@ -197,15 +197,15 @@ namespace osu.Game.Tests.Visual.SongSelectV2
AddUntilStep("favourites count is 2345", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().Text.ToString(), () => Is.EqualTo("2,345")); AddUntilStep("favourites count is 2345", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().Text.ToString(), () => Is.EqualTo("2,345"));
AddStep("click favourite button", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().TriggerClick()); AddStep("click favourite button", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().TriggerClick());
AddStep("allow request to complete", () => resetEvent.Set()); AddStep("allow request to complete", resetEvent.Set);
AddUntilStep("favourites count is 2346", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().Text.ToString(), () => Is.EqualTo("2,346")); AddUntilStep("favourites count is 2346", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().Text.ToString(), () => Is.EqualTo("2,346"));
AddStep("reset event", () => resetEvent.Reset()); AddStep("reset event", resetEvent.Reset);
AddStep("click favourite button", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().TriggerClick()); AddStep("click favourite button", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().TriggerClick());
AddStep("allow request to complete", () => resetEvent.Set()); AddStep("allow request to complete", resetEvent.Set);
AddUntilStep("favourites count is 2345", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().Text.ToString(), () => Is.EqualTo("2,345")); AddUntilStep("favourites count is 2345", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().Text.ToString(), () => Is.EqualTo("2,345"));
AddStep("reset event", () => resetEvent.Reset()); AddStep("reset event", resetEvent.Reset);
AddStep("click favourite button", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().TriggerClick()); AddStep("click favourite button", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().TriggerClick());
AddStep("change to another beatmap", () => AddStep("change to another beatmap", () =>
{ {
@@ -217,7 +217,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
Beatmap.Value = working; Beatmap.Value = working;
onlineLookupResult.Value = online; onlineLookupResult.Value = online;
}); });
AddStep("allow request to complete", () => resetEvent.Set()); AddStep("allow request to complete", resetEvent.Set);
AddUntilStep("favourites count is 9999", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().Text.ToString(), () => Is.EqualTo("9,999")); AddUntilStep("favourites count is 9999", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().Text.ToString(), () => Is.EqualTo("9,999"));
AddStep("set up request handler to fail", () => AddStep("set up request handler to fail", () =>
@@ -239,11 +239,11 @@ namespace osu.Game.Tests.Visual.SongSelectV2
} }
}; };
}); });
AddStep("reset event", () => resetEvent.Reset()); AddStep("reset event", resetEvent.Reset);
AddStep("click favourite button", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().TriggerClick()); AddStep("click favourite button", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().TriggerClick());
AddAssert("spinner visible", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single() AddAssert("spinner visible", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single()
.ChildrenOfType<LoadingSpinner>().Single().State.Value, () => Is.EqualTo(Visibility.Visible)); .ChildrenOfType<LoadingSpinner>().Single().State.Value, () => Is.EqualTo(Visibility.Visible));
AddStep("allow request to complete", () => resetEvent.Set()); AddStep("allow request to complete", resetEvent.Set);
AddAssert("spinner hidden", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single() AddAssert("spinner hidden", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single()
.ChildrenOfType<LoadingSpinner>().Single().State.Value, () => Is.EqualTo(Visibility.Hidden)); .ChildrenOfType<LoadingSpinner>().Single().State.Value, () => Is.EqualTo(Visibility.Hidden));
} }

10
osu.Game.Tests/Visual/UserInterface/TestSceneHoldToExitGameOverlay.cs
View File

@@ -40,20 +40,20 @@ namespace osu.Game.Tests.Visual.UserInterface
firedText firedText
}; };
AddStep("start confirming", () => overlay.Begin()); AddStep("start confirming", overlay.Begin);
AddStep("abort confirming", () => overlay.Abort()); AddStep("abort confirming", overlay.Abort);
AddAssert("ensure not fired internally", () => !overlay.Fired); AddAssert("ensure not fired internally", () => !overlay.Fired);
AddAssert("ensure aborted", () => !fired); AddAssert("ensure aborted", () => !fired);
AddStep("start confirming", () => overlay.Begin()); AddStep("start confirming", overlay.Begin);
AddUntilStep("wait until confirmed", () => fired); AddUntilStep("wait until confirmed", () => fired);
AddAssert("ensure fired internally", () => overlay.Fired); AddAssert("ensure fired internally", () => overlay.Fired);
AddStep("abort after fire", () => overlay.Abort()); AddStep("abort after fire", overlay.Abort);
AddAssert("ensure not fired internally", () => !overlay.Fired); AddAssert("ensure not fired internally", () => !overlay.Fired);
AddStep("start confirming", () => overlay.Begin()); AddStep("start confirming", overlay.Begin);
AddUntilStep("wait until fired again", () => overlay.Fired); AddUntilStep("wait until fired again", () => overlay.Fired);
} }

4
osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapBackgroundSprite.cs
View File

@@ -133,9 +133,9 @@ namespace osu.Game.Tests.Visual.UserInterface
var loadedBackgrounds = backgrounds.Where(b => b.ContentLoaded); var loadedBackgrounds = backgrounds.Where(b => b.ContentLoaded);
AddUntilStep("some loaded", () => loadedBackgrounds.Any()); AddUntilStep("some loaded", loadedBackgrounds.Any);
AddStep("scroll to bottom", () => scrollContainer.ScrollToEnd()); AddStep("scroll to bottom", () => scrollContainer.ScrollToEnd());
AddUntilStep("all unloaded", () => !loadedBackgrounds.Any()); AddUntilStep("all unloaded", loadedBackgrounds.Any, () => Is.False);
} }
private partial class TestUpdateableBeatmapBackgroundSprite : UpdateableBeatmapBackgroundSprite private partial class TestUpdateableBeatmapBackgroundSprite : UpdateableBeatmapBackgroundSprite

4
osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
View File

@@ -89,9 +89,9 @@ namespace osu.Game.Tests.Visual.UserInterface
var loadedCovers = covers.Where(c => c.ChildrenOfType<OnlineBeatmapSetCover>().SingleOrDefault()?.IsLoaded ?? false); var loadedCovers = covers.Where(c => c.ChildrenOfType<OnlineBeatmapSetCover>().SingleOrDefault()?.IsLoaded ?? false);
AddUntilStep("some loaded", () => loadedCovers.Any()); AddUntilStep("some loaded", loadedCovers.Any);
AddStep("scroll to end", () => scroll.ScrollToEnd()); AddStep("scroll to end", () => scroll.ScrollToEnd());
AddUntilStep("all unloaded", () => !loadedCovers.Any()); AddUntilStep("all unloaded", loadedCovers.Any, () => Is.False);
} }
[Test] [Test]

2
osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
View File

@@ -98,7 +98,7 @@ namespace osu.Game.Tournament.Screens.Editors
Width = 0.2f, Width = 0.2f,
Margin = new MarginPadding(10), Margin = new MarginPadding(10),
Text = "Add beatmap", Text = "Add beatmap",
Action = () => beatmapEditor.CreateNew() Action = beatmapEditor.CreateNew
}, },
beatmapEditor beatmapEditor
} }

2
osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
View File

@@ -80,7 +80,7 @@ namespace osu.Game.Tournament.Screens.Editors
Width = 0.2f, Width = 0.2f,
Margin = new MarginPadding(10), Margin = new MarginPadding(10),
Text = "Add beatmap", Text = "Add beatmap",
Action = () => beatmapEditor.CreateNew() Action = beatmapEditor.CreateNew
}, },
beatmapEditor beatmapEditor
} }

2
osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
View File

@@ -150,7 +150,7 @@ namespace osu.Game.Tournament.Screens.Editors
new SettingsButton new SettingsButton
{ {
Text = "Add player", Text = "Add player",
Action = () => playerEditor.CreateNew() Action = playerEditor.CreateNew
}, },
new Container new Container
{ {

6
osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
View File

@@ -170,21 +170,21 @@ namespace osu.Game.Beatmaps.Formats
{ {
SampleControlPoint sampleControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(hitObject.StartTime + CONTROL_POINT_LENIENCY + 1) SampleControlPoint sampleControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(hitObject.StartTime + CONTROL_POINT_LENIENCY + 1)
?? SampleControlPoint.DEFAULT; ?? SampleControlPoint.DEFAULT;
hitObject.Samples = hitObject.Samples.Select(o => sampleControlPoint.ApplyTo(o)).ToList(); hitObject.Samples = hitObject.Samples.Select(sampleControlPoint.ApplyTo).ToList();
for (int i = 0; i < hasRepeats.NodeSamples.Count; i++) for (int i = 0; i < hasRepeats.NodeSamples.Count; i++)
{ {
double time = hitObject.StartTime + i * hasRepeats.Duration / hasRepeats.SpanCount() + CONTROL_POINT_LENIENCY; double time = hitObject.StartTime + i * hasRepeats.Duration / hasRepeats.SpanCount() + CONTROL_POINT_LENIENCY;
var nodeSamplePoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(time) ?? SampleControlPoint.DEFAULT; var nodeSamplePoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(time) ?? SampleControlPoint.DEFAULT;
hasRepeats.NodeSamples[i] = hasRepeats.NodeSamples[i].Select(o => nodeSamplePoint.ApplyTo(o)).ToList(); hasRepeats.NodeSamples[i] = hasRepeats.NodeSamples[i].Select(nodeSamplePoint.ApplyTo).ToList();
} }
} }
else else
{ {
SampleControlPoint sampleControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(hitObject.GetEndTime() + CONTROL_POINT_LENIENCY) SampleControlPoint sampleControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(hitObject.GetEndTime() + CONTROL_POINT_LENIENCY)
?? SampleControlPoint.DEFAULT; ?? SampleControlPoint.DEFAULT;
hitObject.Samples = hitObject.Samples.Select(o => sampleControlPoint.ApplyTo(o)).ToList(); hitObject.Samples = hitObject.Samples.Select(sampleControlPoint.ApplyTo).ToList();
} }
} }

2
osu.Game/Overlays/MusicController.cs
View File

@@ -337,7 +337,7 @@ namespace osu.Game.Overlays
IDisposable duckOperation = Duck(parameters); IDisposable duckOperation = Duck(parameters);
Scheduler.AddDelayed(() => duckOperation.Dispose(), delayUntilRestore); Scheduler.AddDelayed(duckOperation.Dispose, delayUntilRestore);
} }
private bool next(bool allowProtectedTracks) private bool next(bool allowProtectedTracks)

2
osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
View File

@@ -248,7 +248,7 @@ namespace osu.Game.Overlays.SkinEditor
mods.Value = mods.Value.Except(invalid).ToArray(); mods.Value = mods.Value.Except(invalid).ToArray();
if (replayGeneratingMod != null) if (replayGeneratingMod != null)
screen.Push(new EndlessPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods))); screen.Push(new EndlessPlayer(replayGeneratingMod.CreateScoreFromReplayData));
}, new[] { typeof(Player), typeof(SoloSongSelect) }); }, new[] { typeof(Player), typeof(SoloSongSelect) });
} }

1
osu.Game/Screens/Footer/ScreenStackFooter.cs
View File

@@ -170,6 +170,7 @@ namespace osu.Game.Screens.Footer
/// <summary> /// <summary>
/// The screen which should be bound to the screen footer - the most nested subscreen. /// The screen which should be bound to the screen footer - the most nested subscreen.
/// </summary> /// </summary>
// ReSharper disable once FunctionRecursiveOnAllPaths (TODO: remove after fixed https://youtrack.jetbrains.com/issue/RIDER-135036/Incorrect-recursive-on-all-execution-paths-inspection)
private IScreen leadingScreen => subScreenTracker?.leadingScreen ?? stack.CurrentScreen; private IScreen leadingScreen => subScreenTracker?.leadingScreen ?? stack.CurrentScreen;
public ScreenStackTracker(ScreenStack stack) public ScreenStackTracker(ScreenStack stack)

2
osu.Game/Screens/Menu/OnlineMenuBanner.cs
View File

@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Menu
return; return;
var request = new GetMenuContentRequest(); var request = new GetMenuContentRequest();
Task.Run(() => request.Perform()) Task.Run(request.Perform)
.ContinueWith(r => .ContinueWith(r =>
{ {
if (!FetchOnlineContent) if (!FetchOnlineContent)

2
osu.Game/Screens/OnlinePlay/Matchmaking/Match/RoundResults/SubScreenRoundResults.cs
View File

@@ -91,7 +91,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.RoundResults
var request = new IndexPlaylistScoresRequest(client.Room.RoomID, client.Room.Settings.PlaylistItemId); var request = new IndexPlaylistScoresRequest(client.Room.RoomID, client.Room.Settings.PlaylistItemId);
request.Success += req => scoreTask.SetResult(req.Scores); request.Success += req => scoreTask.SetResult(req.Scores);
request.Failure += e => scoreTask.SetException(e); request.Failure += scoreTask.SetException;
api.Queue(request); api.Queue(request);
await Task.WhenAll(beatmapTask, scoreTask.Task).ConfigureAwait(false); await Task.WhenAll(beatmapTask, scoreTask.Task).ConfigureAwait(false);

2
osu.Game/Screens/Ranking/ResultsScreen.cs
View File

@@ -398,7 +398,7 @@ namespace osu.Game.Screens.Ranking
} }
// allow a frame for scroll container to adjust its dimensions with the added scores before fetching again. // allow a frame for scroll container to adjust its dimensions with the added scores before fetching again.
Schedule(() => tcs.SetResult()); Schedule(tcs.SetResult);
if (ScorePanelList.IsEmpty) if (ScorePanelList.IsEmpty)
{ {

2
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@@ -528,7 +528,7 @@ namespace osu.Game.Screens.Select
if (!notYetVisitedSets.Any()) if (!notYetVisitedSets.Any())
{ {
previouslyVisitedRandomSets.RemoveAll(s => visibleSets.Contains(s)); previouslyVisitedRandomSets.RemoveAll(visibleSets.Contains);
notYetVisitedSets = visibleSets; notYetVisitedSets = visibleSets;
} }

2
osu.Game/Screens/SelectV2/RealmPopulatingOnlineLookupSource.cs
View File

@@ -43,7 +43,7 @@ namespace osu.Game.Screens.SelectV2
var request = new GetBeatmapSetRequest(id); var request = new GetBeatmapSetRequest(id);
var tcs = new TaskCompletionSource<APIBeatmapSet?>(); var tcs = new TaskCompletionSource<APIBeatmapSet?>();
token.Register(() => request.Cancel()); token.Register(request.Cancel);
// async request success callback is a bit of a dangerous game, but there's some reasoning for it. // async request success callback is a bit of a dangerous game, but there's some reasoning for it.
// - don't really want to use `IAPIAccess.PerformAsync()` because we still want to respect request queueing & online status checks // - don't really want to use `IAPIAccess.PerformAsync()` because we still want to respect request queueing & online status checks

2
osu.Game/Screens/SelectV2/SoloSongSelect.cs
View File

@@ -135,7 +135,7 @@ namespace osu.Game.Screens.SelectV2
if (replayGeneratingMod != null) if (replayGeneratingMod != null)
{ {
player = new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods)); player = new ReplayPlayer(replayGeneratingMod.CreateScoreFromReplayData);
} }
else else
{ {