Optimize intersection

JetBrains · Oct 19, 2023 · 3cdf2b8 · 3cdf2b8
1 parent 7634b15
commit 3cdf2b8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/rd-kt/rd-core/src/main/kotlin/com/jetbrains/rd/util/lifetime/RLifetime.kt b/rd-kt/rd-core/src/main/kotlin/com/jetbrains/rd/util/lifetime/RLifetime.kt
@@ -49,7 +49,15 @@ sealed class Lifetime {
          * Creates an intersection of some lifetimes: new lifetime that terminate when either one terminates.
          * Created lifetime inherits the smallest [terminationTimeoutKind]
          */
-        fun intersect(lifetime1: Lifetime, lifetime2: Lifetime): Lifetime = defineIntersection(lifetime1, lifetime2).lifetime
+        fun intersect(lifetime1: Lifetime, lifetime2: Lifetime): Lifetime  {
+            if (lifetime1 === lifetime2 || lifetime2.isEternal)
+                return lifetime1
+
+            if (lifetime1.isEternal)
+                return lifetime2
+
+            return defineIntersection(lifetime1, lifetime2).lifetime
+        }
 
         /**
          * Creates an intersection of some lifetimes: new lifetime that terminate when either one terminates.
@@ -642,7 +650,8 @@ operator fun Lifetime.plusAssign(action : () -> Unit) = onTermination(action)
  * Creates an intersection of some lifetimes: new lifetime that terminate when either one terminates.
  * Created lifetime inherits the smallest [terminationTimeoutKind]
  */
-fun Lifetime.intersect(lifetime: Lifetime): LifetimeDefinition = Lifetime.defineIntersection(this, lifetime)
+fun Lifetime.intersect(lifetime: Lifetime): Lifetime = Lifetime.intersect(this, lifetime)
+fun Lifetime.defineIntersection(lifetime: Lifetime): LifetimeDefinition = Lifetime.defineIntersection(this, lifetime)
 
 inline fun <T> Lifetime.view(viewable: IViewable<T>, crossinline handler: Lifetime.(T) -> Unit) {
     viewable.view(this) { lt, value -> lt.handler(value) }

diff --git a/rd-kt/rd-core/src/main/kotlin/com/jetbrains/rd/util/reactive/Property.kt b/rd-kt/rd-core/src/main/kotlin/com/jetbrains/rd/util/reactive/Property.kt
@@ -114,7 +114,7 @@ class WriteOnceProperty<T : Any> : IOptProperty<T> {
             if (def.isNotAlive || lifetime.isNotAlive) return
 
             val nestedDef = def.intersect(lifetime)
-            super.advise(nestedDef.lifetime, handler)
+            super.advise(nestedDef, handler)
         }
 
         override fun fire(value: T) {