From 36a671e306a6a10b03118c2e175981d1ddab19cb Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 23 Apr 2018 14:56:45 +0900 Subject: [PATCH 1/3] Fix new detections in rider 2018.1 --- osu.Game/Online/API/Requests/GetMessagesRequest.cs | 2 +- osu.Game/Online/API/Requests/GetUserRequest.cs | 2 +- osu.Game/Screens/Ranking/ResultsPageScore.cs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/osu.Game/Online/API/Requests/GetMessagesRequest.cs b/osu.Game/Online/API/Requests/GetMessagesRequest.cs index d600f40716..68de194bae 100644 --- a/osu.Game/Online/API/Requests/GetMessagesRequest.cs +++ b/osu.Game/Online/API/Requests/GetMessagesRequest.cs @@ -11,7 +11,7 @@ namespace osu.Game.Online.API.Requests public class GetMessagesRequest : APIRequest> { private readonly List channels; - private long? since; + private readonly long? since; public GetMessagesRequest(List channels, long? sinceId) { diff --git a/osu.Game/Online/API/Requests/GetUserRequest.cs b/osu.Game/Online/API/Requests/GetUserRequest.cs index 9026d10334..607e8e5127 100644 --- a/osu.Game/Online/API/Requests/GetUserRequest.cs +++ b/osu.Game/Online/API/Requests/GetUserRequest.cs @@ -7,7 +7,7 @@ namespace osu.Game.Online.API.Requests { public class GetUserRequest : APIRequest { - private long? userId; + private readonly long? userId; public GetUserRequest(long? userId = null) { diff --git a/osu.Game/Screens/Ranking/ResultsPageScore.cs b/osu.Game/Screens/Ranking/ResultsPageScore.cs index 9d92439a4b..42d8af07b9 100644 --- a/osu.Game/Screens/Ranking/ResultsPageScore.cs +++ b/osu.Game/Screens/Ranking/ResultsPageScore.cs @@ -223,11 +223,11 @@ namespace osu.Game.Screens.Ranking private class DateTimeDisplay : Container { - private DateTime datetime; + private readonly DateTime date; - public DateTimeDisplay(DateTime datetime) + public DateTimeDisplay(DateTime date) { - this.datetime = datetime; + this.date = date; AutoSizeAxes = Axes.Y; @@ -251,7 +251,7 @@ namespace osu.Game.Screens.Ranking { Origin = Anchor.CentreLeft, Anchor = Anchor.CentreLeft, - Text = datetime.ToShortDateString(), + Text = date.ToShortDateString(), Padding = new MarginPadding { Horizontal = 10, Vertical = 5 }, Colour = Color4.White, }, @@ -259,7 +259,7 @@ namespace osu.Game.Screens.Ranking { Origin = Anchor.CentreRight, Anchor = Anchor.CentreRight, - Text = datetime.ToShortTimeString(), + Text = date.ToShortTimeString(), Padding = new MarginPadding { Horizontal = 10, Vertical = 5 }, Colour = Color4.White, } From 6e16f2a3c3c5dd187eca42e3c49ae81e375599f2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 23 Apr 2018 15:03:41 +0900 Subject: [PATCH 2/3] Add assert to appease rider/r# --- .../Screens/Edit/Screens/Compose/Layers/MaskContainer.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs index 6d75b8dc15..7caece2b3e 100644 --- a/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs +++ b/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; @@ -43,6 +44,9 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers public override void Add(HitObjectMask drawable) { + // Rider 2018.1 requires this (roslyn analyser issue?) + Debug.Assert(drawable != null); + base.Add(drawable); drawable.Selected += onMaskSelected; @@ -53,6 +57,9 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers public override bool Remove(HitObjectMask drawable) { + // Rider 2018.1 requires this (roslyn analyser issue?) + Debug.Assert(drawable != null); + var result = base.Remove(drawable); if (result) From 194992936d92a9e6765630a610603cf86608fdfd Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 23 Apr 2018 17:57:32 +0900 Subject: [PATCH 3/3] Use exceptions --- .../Edit/Screens/Compose/Layers/MaskContainer.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs index 7caece2b3e..993594f1d2 100644 --- a/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs +++ b/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; +using JetBrains.Annotations; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Input; @@ -44,8 +44,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers public override void Add(HitObjectMask drawable) { - // Rider 2018.1 requires this (roslyn analyser issue?) - Debug.Assert(drawable != null); + if (drawable == null) throw new ArgumentNullException(nameof(drawable)); base.Add(drawable); @@ -55,10 +54,9 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers drawable.DragRequested += onDragRequested; } - public override bool Remove(HitObjectMask drawable) + public override bool Remove([NotNull] HitObjectMask drawable) { - // Rider 2018.1 requires this (roslyn analyser issue?) - Debug.Assert(drawable != null); + if (drawable == null) throw new ArgumentNullException(nameof(drawable)); var result = base.Remove(drawable);