Merge pull request #446 from JetBrains/im/keepalive-assert

Lifetime.Eternal.KeepAlive should throw an assertion
JetBrains · Nov 6, 2023 · 571a9c4 · 571a9c4
2 parents d5dbf03 + 243ec2d
commit 571a9c4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/rd-net/Lifetimes/Lifetimes/Lifetime.cs b/rd-net/Lifetimes/Lifetimes/Lifetime.cs
@@ -8,10 +8,6 @@
 using JetBrains.Diagnostics;
 using JetBrains.Threading;
 
-#if !NET35
-
-#endif
-
 namespace JetBrains.Lifetimes
 {
   /// <summary>
@@ -612,6 +608,7 @@ public async Task UsingNestedAsync([InstantHandle] Func<Lifetime, Task> action)
     [PublicAPI]
     public Lifetime KeepAlive(object @object)
     {
+      LifetimeDefinition.Log.Assert(!IsEternal);
       if (@object == null) throw new ArgumentNullException(nameof(@object));      
 
       return OnTermination(() => GC.KeepAlive(@object));

diff --git a/rd-net/Test.Lifetimes/Lifetimes/LifetimeTest.cs b/rd-net/Test.Lifetimes/Lifetimes/LifetimeTest.cs
@@ -7,8 +7,11 @@
 using JetBrains.Diagnostics;
 using JetBrains.Diagnostics.Internal;
 using JetBrains.Lifetimes;
-using JetBrains.Threading;
 using NUnit.Framework;
+#if !NET35
+using JetBrains.Threading;
+#endif
+
 // ReSharper disable MethodSupportsCancellation
 
 namespace Test.Lifetimes.Lifetimes
@@ -1414,5 +1417,20 @@ public void DefineLifetimeInheritTimeoutKindTest()
 
       Assert.AreEqual(LifetimeTerminationTimeoutKind.ExtraLong, OuterLifetime.Define(definition.Lifetime, "id", (ld, lf) => {}).TerminationTimeoutKind);
     }
+
+    [Test]
+    public void EternalLifetimeKeepalive()
+    {
+      Assert.DoesNotThrow(() =>
+      {
+        var o = new object();
+        Lifetime.Eternal.KeepAlive(o);
+      });
+      var ex = Assert.Throws<Exception>(() =>
+      {
+        TestLogger.ExceptionLogger.ThrowLoggedExceptions();
+      });
+      Assert.True(ex.Message.Contains("!IsEternal"));
+    }
   }
 }