Merge pull request #6174 from Susko3/RequireStaticDelegate-annotation

Add `[RequireStaticDelegate]` annotations
ppy · Feb 17, 2024 · 5d98a51 · 5d98a51
2 parents b89c970 + 82174f4
commit 5d98a51
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/osu.Framework/Allocation/InvokeOnDisposal.cs b/osu.Framework/Allocation/InvokeOnDisposal.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 
 namespace osu.Framework.Allocation
 {
@@ -58,7 +59,7 @@ public class InvokeOnDisposal<T> : IDisposable
         /// </summary>
         /// <param name="sender">The sender which should appear in the <paramref name="action"/> callback.</param>
         /// <param name="action">The action to invoke during disposal.</param>
-        public InvokeOnDisposal(T sender, Action<T> action)
+        public InvokeOnDisposal(T sender, [RequireStaticDelegate(IsError = true)] Action<T> action)
         {
             this.sender = sender;
             this.action = action ?? throw new ArgumentNullException(nameof(action));

diff --git a/osu.Framework/Allocation/ValueInvokeOnDisposal.cs b/osu.Framework/Allocation/ValueInvokeOnDisposal.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 
 namespace osu.Framework.Allocation
 {
@@ -62,7 +63,7 @@ public void Dispose()
         /// </summary>
         /// <param name="sender">The sender which should appear in the <paramref name="action"/> callback.</param>
         /// <param name="action">The action to invoke during disposal.</param>
-        public ValueInvokeOnDisposal(T sender, Action<T> action)
+        public ValueInvokeOnDisposal(T sender, [RequireStaticDelegate(IsError = true)] Action<T> action)
         {
             this.sender = sender;
             this.action = action ?? throw new ArgumentNullException(nameof(action));

diff --git a/osu.Framework/Graphics/BufferedDrawNode.cs b/osu.Framework/Graphics/BufferedDrawNode.cs
@@ -150,7 +150,7 @@ protected IDisposable BindFrameBuffer(IFrameBuffer frameBuffer)
 
             frameBuffer.Bind();
 
-            return new ValueInvokeOnDisposal<IFrameBuffer>(frameBuffer, b => b.Unbind());
+            return new ValueInvokeOnDisposal<IFrameBuffer>(frameBuffer, static b => b.Unbind());
         }
 
         private IDisposable establishFrameBufferViewport(IRenderer renderer)
@@ -175,7 +175,7 @@ private IDisposable establishFrameBufferViewport(IRenderer renderer)
             renderer.PushScissor(new RectangleI(0, 0, (int)frameBufferSize.X, (int)frameBufferSize.Y));
             renderer.PushScissorOffset(screenSpaceMaskingRect.Location);
 
-            return new ValueInvokeOnDisposal<(BufferedDrawNode node, IRenderer renderer)>((this, renderer), tup => tup.node.returnViewport(tup.renderer));
+            return new ValueInvokeOnDisposal<(BufferedDrawNode node, IRenderer renderer)>((this, renderer), static tup => tup.node.returnViewport(tup.renderer));
         }
 
         private void returnViewport(IRenderer renderer)

diff --git a/osu.Framework/Graphics/Transforms/Transformable.cs b/osu.Framework/Graphics/Transforms/Transformable.cs
@@ -283,7 +283,7 @@ public IDisposable BeginDelayedSequence(double delay, bool recursive = true)
             AddDelay(delay, recursive);
             double newTransformDelay = TransformDelay;
 
-            return new ValueInvokeOnDisposal<DelayedSequenceSender>(new DelayedSequenceSender(this, delay, recursive, newTransformDelay), sender =>
+            return new ValueInvokeOnDisposal<DelayedSequenceSender>(new DelayedSequenceSender(this, delay, recursive, newTransformDelay), static sender =>
             {
                 if (!Precision.AlmostEquals(sender.NewTransformDelay, sender.Transformable.TransformDelay))
                 {
@@ -292,7 +292,7 @@ public IDisposable BeginDelayedSequence(double delay, bool recursive = true)
                         $"(begin={sender.NewTransformDelay} end={sender.Transformable.TransformDelay})");
                 }
 
-                AddDelay(-sender.Delay, sender.Recursive);
+                sender.Transformable.AddDelay(-sender.Delay, sender.Recursive);
             });
         }
 

diff --git a/osu.Framework/Platform/NativeMemoryTracker.cs b/osu.Framework/Platform/NativeMemoryTracker.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Statistics;
 
@@ -22,7 +23,7 @@ public static class NativeMemoryTracker
         public static NativeMemoryLease AddMemory(object source, long amount)
         {
             getStatistic(source).Value += amount;
-            return new NativeMemoryLease((source, amount), sender => removeMemory(sender.source, sender.amount));
+            return new NativeMemoryLease((source, amount), static sender => removeMemory(sender.source, sender.amount));
         }
 
         /// <summary>
@@ -42,7 +43,7 @@ private static void removeMemory(object source, long amount)
         /// </summary>
         public class NativeMemoryLease : InvokeOnDisposal<(object source, long amount)>
         {
-            internal NativeMemoryLease((object source, long amount) sender, Action<(object source, long amount)> action)
+            internal NativeMemoryLease((object source, long amount) sender, [RequireStaticDelegate(IsError = true)] Action<(object source, long amount)> action)
                 : base(sender, action)
             {
             }