Merge pull request #26956 from smoogipoo/update-inspectcode

Update inspectcode to 2023.3.3

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2022.2.3",
+      "version": "2023.3.3",
       "commands": [
         "jb"
       ]
     },
     "nvika": {
-      "version": "2.2.0",
+      "version": "3.0.0",
       "commands": [
         "nvika"
       ]

.globalconfig

@@ -1,5 +1,3 @@
-is_global = true
-
 # .NET Code Style
 # IDE styles reference: https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/
 
@@ -56,4 +54,4 @@ dotnet_diagnostic.RS0030.severity = error
 
 # Temporarily disable analysing CanBeNull = true in NRT contexts due to mobile issues.
 # See: https://github.com/ppy/osu/pull/19677
-dotnet_diagnostic.OSUF001.severity = none
+dotnet_diagnostic.OSUF001.severity = none

osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs

@@ -206,7 +206,7 @@ private void addContextMenuItemStep(string contextMenuText)
         {
             AddStep($"click context menu item \"{contextMenuText}\"", () =>
             {
-                MenuItem item = visualiser.ContextMenuItems.FirstOrDefault(menuItem => menuItem.Text.Value == "Curve type")?.Items.FirstOrDefault(menuItem => menuItem.Text.Value == contextMenuText);
+                MenuItem item = visualiser.ContextMenuItems!.FirstOrDefault(menuItem => menuItem.Text.Value == "Curve type")?.Items.FirstOrDefault(menuItem => menuItem.Text.Value == contextMenuText);
 
                 item?.Action.Value?.Invoke();
             });

osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs

@@ -183,7 +183,7 @@ private void addObjectsStep(Func<OsuHitObject[]> ctorFunc)
                             break;
                     }
 
-                    hitObjectContainer.Add(drawableObject);
+                    hitObjectContainer.Add(drawableObject!);
                     followPointRenderer.AddFollowPoints(objects[i]);
                 }
             });

osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -173,6 +174,7 @@ public Drawable GetDrawableComponent(ISkinComponentLookup lookup)
 
             public IEnumerable<ISkin> AllSources => new[] { this };
 
+            [CanBeNull]
             public event Action SourceChanged;
 
             private bool enabled = true;

osu.Game.Rulesets.Taiko/UI/DrumTouchInputArea.cs

@@ -179,10 +179,9 @@ private void handleDown(object source, Vector2 position)
             TaikoAction taikoAction = getTaikoActionFromPosition(position);
 
             // Not too sure how this can happen, but let's avoid throwing.
-            if (trackedActions.ContainsKey(source))
+            if (!trackedActions.TryAdd(source, taikoAction))
                 return;
 
-            trackedActions.Add(source, taikoAction);
             keyBindingContainer.TriggerPressed(taikoAction);
         }
 

osu.Game.Tests/Beatmaps/WorkingBeatmapTest.cs

@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Moq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
@@ -98,9 +99,10 @@ public TestConverter(IBeatmap beatmap, ManualResetEventSlim resetEvent)
                     Beatmap = beatmap;
                 }
 
+#pragma warning disable CS0067
+                [CanBeNull]
                 public event Action<HitObject, IEnumerable<HitObject>> ObjectConverted;
-
-                protected virtual void OnObjectConverted(HitObject arg1, IEnumerable<HitObject> arg2) => ObjectConverted?.Invoke(arg1, arg2);
+#pragma warning restore CS0067
 
                 public IBeatmap Beatmap { get; }
 

osu.Game.Tests/Database/RulesetStoreTests.cs

@@ -79,7 +79,7 @@ public void TestRulesetThrowingOnMethods()
                 Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName)!.Available), Is.True);
 
                 // Availability is updated on construction of a RealmRulesetStore
-                var _ = new RealmRulesetStore(realm, storage);
+                _ = new RealmRulesetStore(realm, storage);
 
                 Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName)!.Available), Is.False);
             });
@@ -104,13 +104,13 @@ public void TestOutdatedRulesetNotAvailable()
                 Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName)!.Available), Is.True);
 
                 // Availability is updated on construction of a RealmRulesetStore
-                var _ = new RealmRulesetStore(realm, storage);
+                _ = new RealmRulesetStore(realm, storage);
 
                 Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName)!.Available), Is.False);
 
                 // Simulate the ruleset getting updated
                 LoadTestRuleset.Version = Ruleset.CURRENT_RULESET_API_VERSION;
-                var __ = new RealmRulesetStore(realm, storage);
+                _ = new RealmRulesetStore(realm, storage);
 
                 Assert.That(realm.Run(r => r.Find<RulesetInfo>(rulesetShortName)!.Available), Is.True);
             });

osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs

@@ -203,9 +203,9 @@ public TestCustomSkinWorkingBeatmap(RulesetInfo ruleset, IStorageResourceProvide
 
         public IRenderer Renderer => host.Renderer;
         public AudioManager AudioManager => Audio;
-        public IResourceStore<byte[]> Files => null;
+        public IResourceStore<byte[]> Files => null!;
         public new IResourceStore<byte[]> Resources => base.Resources;
-        public RealmAccess RealmAccess => null;
+        public RealmAccess RealmAccess => null!;
         public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
 
         #endregion

osu.Game.Tests/Rulesets/TestSceneBrokenRulesetHandling.cs

@@ -56,9 +56,9 @@ private class TestRulesetWithNullMods : Ruleset
 
             public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[] { null };
 
-            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => null;
-            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => null;
-            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => null;
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => null!;
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => null!;
+            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => null!;
         }
 
         private class TestAPIIncompatibleRuleset : Ruleset
@@ -69,9 +69,9 @@ private class TestAPIIncompatibleRuleset : Ruleset
             // simulate API incompatibility by throwing similar exceptions.
             public override IEnumerable<Mod> GetModsFor(ModType type) => throw new MissingMethodException();
 
-            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => null;
-            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => null;
-            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => null;
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => null!;
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => null!;
+            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => null!;
         }
     }
 }

osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs

@@ -142,7 +142,7 @@ public void TestCancelGameplayTestWithUnsavedChanges()
 
             AddStep("dismiss prompt", () =>
             {
-                var button = DialogOverlay.CurrentDialog.Buttons.Last();
+                var button = DialogOverlay.CurrentDialog!.Buttons.Last();
                 InputManager.MoveMouseTo(button);
                 InputManager.Click(MouseButton.Left);
             });
@@ -167,7 +167,7 @@ public void TestSaveChangesBeforeGameplayTest()
             });
             AddUntilStep("save prompt shown", () => DialogOverlay.CurrentDialog is SaveRequiredPopupDialog);
 
-            AddStep("save changes", () => DialogOverlay.CurrentDialog.PerformOkAction());
+            AddStep("save changes", () => DialogOverlay.CurrentDialog!.PerformOkAction());
 
             EditorPlayer editorPlayer = null;
             AddUntilStep("player pushed", () => (editorPlayer = Stack.CurrentScreen as EditorPlayer) != null);

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

@@ -120,7 +120,7 @@ public void TestLimitedFrameRateWithImportantFrames()
         protected override void Update()
         {
             base.Update();
-            playbackManager?.ReplayInputHandler.SetFrameFromTime(Time.Current - 100);
+            playbackManager?.ReplayInputHandler?.SetFrameFromTime(Time.Current - 100);
         }
 
         [TearDownSteps]

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

@@ -198,7 +198,7 @@ private void onNewFrames(int userId, FrameDataBundle frames)
             foreach (var legacyFrame in frames.Frames)
             {
                 var frame = new TestReplayFrame();
-                frame.FromLegacy(legacyFrame, null);
+                frame.FromLegacy(legacyFrame, null!);
                 playbackReplay.Frames.Add(frame);
             }
 

osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs

@@ -250,7 +250,7 @@ public virtual void Hide()
             {
             }
 
-            public virtual IBindable<int> UnreadCount => null;
+            public virtual IBindable<int> UnreadCount { get; } = new Bindable<int>();
 
             public IEnumerable<Notification> AllNotifications => Enumerable.Empty<Notification>();
         }

osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs

@@ -58,7 +58,7 @@ public void TestBasicListChanges()
                                                               .SkipWhile(r => r.Room.Category.Value == RoomCategory.Spotlight)
                                                               .All(r => r.Room.Category.Value == RoomCategory.Normal));
 
-            AddStep("remove first room", () => RoomManager.RemoveRoom(RoomManager.Rooms.FirstOrDefault(r => r.RoomID.Value == 0)));
+            AddStep("remove first room", () => RoomManager.RemoveRoom(RoomManager.Rooms.First(r => r.RoomID.Value == 0)));
             AddAssert("has 4 rooms", () => container.Rooms.Count == 4);
             AddAssert("first room removed", () => container.Rooms.All(r => r.Room.RoomID.Value != 0));
 

osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs

@@ -179,7 +179,7 @@ public event Action RoomsUpdated
 
             public IBindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
 
-            public IBindableList<Room> Rooms => null;
+            public IBindableList<Room> Rooms => null!;
 
             public void AddOrUpdateRoom(Room room) => throw new NotImplementedException();
 

osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs

@@ -52,11 +52,11 @@ private void load(GameHost host, AudioManager audio)
         [SetUpSteps]
         public void SetupSteps()
         {
-            AddStep("set room", () => SelectedRoom.Value = new Room());
+            AddStep("set room", () => SelectedRoom!.Value = new Room());
 
             importBeatmap();
 
-            AddStep("load match", () => LoadScreen(match = new TestPlaylistsRoomSubScreen(SelectedRoom.Value)));
+            AddStep("load match", () => LoadScreen(match = new TestPlaylistsRoomSubScreen(SelectedRoom!.Value)));
             AddUntilStep("wait for load", () => match.IsCurrentScreen());
         }
 
@@ -115,7 +115,7 @@ public void TestPlaylistItemSelectedOnCreate()
                 });
             });
 
-            AddAssert("first playlist item selected", () => match.SelectedItem.Value == SelectedRoom.Value.Playlist[0]);
+            AddAssert("first playlist item selected", () => match.SelectedItem.Value == SelectedRoom!.Value.Playlist[0]);
         }
 
         [Test]
@@ -201,7 +201,7 @@ public void TestBeatmapUpdatedOnReImport()
 
         private void setupAndCreateRoom(Action<Room> room)
         {
-            AddStep("setup room", () => room(SelectedRoom.Value));
+            AddStep("setup room", () => room(SelectedRoom!.Value));
 
             AddStep("click create button", () =>
             {

osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs

@@ -432,7 +432,7 @@ protected override void LoadComplete()
 
         private class RulesetWithNoPerformanceCalculator : OsuRuleset
         {
-            public override PerformanceCalculator CreatePerformanceCalculator() => null;
+            public override PerformanceCalculator CreatePerformanceCalculator() => null!;
         }
     }
 }

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

@@ -213,7 +213,7 @@ public virtual void Hide()
             {
             }
 
-            public virtual IBindable<int> UnreadCount => null;
+            public virtual IBindable<int> UnreadCount { get; } = new Bindable<int>();
 
             public IEnumerable<Notification> AllNotifications => Enumerable.Empty<Notification>();
         }

osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs

@@ -567,10 +567,9 @@ private void flushPendingPoints()
             for (int i = pendingControlPoints.Count - 1; i >= 0; i--)
             {
                 var type = pendingControlPoints[i].GetType();
-                if (pendingControlPointTypes.Contains(type))
+                if (!pendingControlPointTypes.Add(type))
                     continue;
 
-                pendingControlPointTypes.Add(type);
                 beatmap.ControlPointInfo.Add(pendingControlPointsTime, pendingControlPoints[i]);
             }
 

osu.Game/Beatmaps/WorkingBeatmapCache.cs

@@ -116,7 +116,7 @@ public virtual WorkingBeatmap GetWorkingBeatmap([CanBeNull] BeatmapInfo beatmapI
         ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
         IRenderer IStorageResourceProvider.Renderer => host?.Renderer ?? new DummyRenderer();
         AudioManager IStorageResourceProvider.AudioManager => audioManager;
-        RealmAccess IStorageResourceProvider.RealmAccess => null;
+        RealmAccess IStorageResourceProvider.RealmAccess => null!;
         IResourceStore<byte[]> IStorageResourceProvider.Files => files;
         IResourceStore<byte[]> IStorageResourceProvider.Resources => resources;
         IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host?.CreateTextureLoaderStore(underlyingStore);

osu.Game/Graphics/Containers/SelectionCycleFillFlowContainer.cs

@@ -52,10 +52,10 @@ public void Select(T item)
 
         public override void Add(T drawable)
         {
-            base.Add(drawable);
-
             Debug.Assert(drawable != null);
 
+            base.Add(drawable);
+
             drawable.StateChanged += state => selectionChanged(drawable, state);
         }
 

osu.Game/Graphics/UserInterface/BreadcrumbControl.cs

@@ -10,6 +10,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
@@ -48,6 +49,7 @@ public partial class BreadcrumbTabItem : OsuTabItem, IStateful<Visibility>
         {
             protected virtual float ChevronSize => 10;
 
+            [CanBeNull]
             public event Action<Visibility> StateChanged;
 
             public readonly SpriteIcon Chevron;

osu.Game/IO/IStorageResourceProvider.cs

@@ -41,6 +41,6 @@ public interface IStorageResourceProvider
         /// </summary>
         /// <param name="underlyingStore">The underlying provider of texture data (in arbitrary image formats).</param>
         /// <returns>A texture loader store.</returns>
-        IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore);
+        IResourceStore<TextureUpload>? CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore);
     }
 }

osu.Game/Online/Spectator/SpectatorClient.cs

@@ -264,13 +264,12 @@ public virtual void WatchUser(int userId)
         {
             Debug.Assert(ThreadSafety.IsUpdateThread);
 
-            if (watchedUsersRefCounts.ContainsKey(userId))
+            if (!watchedUsersRefCounts.TryAdd(userId, 1))
             {
                 watchedUsersRefCounts[userId]++;
                 return;
             }
 
-            watchedUsersRefCounts.Add(userId, 1);
             WatchUserInternal(userId);
         }
 

osu.Game/Overlays/Comments/VotePill.cs

@@ -30,7 +30,7 @@ public partial class VotePill : LoadingButton, IHasAccentColour
 
         public Color4 AccentColour { get; set; }
 
-        protected override IEnumerable<Drawable> EffectTargets => null;
+        protected override IEnumerable<Drawable> EffectTargets => Enumerable.Empty<Drawable>();
 
         [Resolved]
         private IAPIProvider api { get; set; }

osu.Game/Overlays/MedalSplash/DrawableMedal.cs

@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework;
 using osuTK;
 using osu.Framework.Allocation;
@@ -24,6 +25,7 @@ public partial class DrawableMedal : Container, IStateful<DisplayState>
         private const float scale_when_unlocked = 0.76f;
         private const float scale_when_full = 0.6f;
 
+        [CanBeNull]
         public event Action<DisplayState> StateChanged;
 
         private readonly Medal medal;

osu.Game/Overlays/Volume/VolumeMeter.cs

@@ -5,6 +5,7 @@
 
 using System;
 using System.Globalization;
+using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -48,6 +49,7 @@ public partial class VolumeMeter : Container, IStateful<SelectionState>
         private Sample notchSample;
         private double sampleLastPlaybackTime;
 
+        [CanBeNull]
         public event Action<SelectionState> StateChanged;
 
         private SelectionState state;