Lifetime.Eternal.KeepAlive should throw an assertion

JetBrains · Nov 3, 2023 · 5a66ce2 · 5a66ce2
1 parent d5dbf03
commit 5a66ce2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/rd-net/Lifetimes/Lifetimes/Lifetime.cs b/rd-net/Lifetimes/Lifetimes/Lifetime.cs
@@ -7,7 +7,6 @@
 using JetBrains.Core;
 using JetBrains.Diagnostics;
 using JetBrains.Threading;
-
 #if !NET35
 
 #endif
@@ -612,6 +611,7 @@ public async Task UsingNestedAsync([InstantHandle] Func<Lifetime, Task> action)
     [PublicAPI]
     public Lifetime KeepAlive(object @object)
     {
+      Assertion.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,15 @@ public void DefineLifetimeInheritTimeoutKindTest()
 
       Assert.AreEqual(LifetimeTerminationTimeoutKind.ExtraLong, OuterLifetime.Define(definition.Lifetime, "id", (ld, lf) => {}).TerminationTimeoutKind);
     }
+
+    [Test]
+    public void EternalLifetimeKeepalive()
+    {
+      Assert.Throws<Assertion.AssertionException>(() =>
+      {
+        var o = new object();
+        Lifetime.Eternal.KeepAlive(o);
+      });
+    }
   }
 }