fix infinite loop

sunny-chung · Nov 3, 2024 · 635b6af · 635b6af
1 parent fd484cc
commit 635b6af
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/util/ObjectRef.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/util/ObjectRef.kt
@@ -0,0 +1,8 @@
+package com.sunnychung.application.multiplatform.hellohttp.util
+
+class ObjectRef<T>(val ref: T) {
+    override fun equals(other: Any?): Boolean {
+        if (other !is ObjectRef<*>) return false
+        return ref === other.ref
+    }
+}
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/CodeEditorView.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/CodeEditorView.kt
@@ -65,6 +65,7 @@ import com.sunnychung.application.multiplatform.hellohttp.extension.insert
 import com.sunnychung.application.multiplatform.hellohttp.extension.intersect
 import com.sunnychung.application.multiplatform.hellohttp.extension.length
 import com.sunnychung.application.multiplatform.hellohttp.model.SyntaxHighlight
+import com.sunnychung.application.multiplatform.hellohttp.util.ObjectRef
 import com.sunnychung.application.multiplatform.hellohttp.util.TreeRangeMaps
 import com.sunnychung.application.multiplatform.hellohttp.util.chunkedLatest
 import com.sunnychung.application.multiplatform.hellohttp.util.log
@@ -491,7 +492,7 @@ fun CodeEditorView(
                                     val string = it.bigText.buildCharSequence() as AnnotatedString
                                     log.d { "${bigTextFieldState.text} : ${it.bigText} onTextChange(${string.text.abbr()})" }
                                     onTextChange(string.text)
-                                    secondCacheKey.value = string.text
+                                    secondCacheKey.value = ObjectRef(string.text)
                                 }
                                 bigTextValueId = it.changeId
                                 searchTrigger.trySend(Unit)

diff --git a/...kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigTextFieldState.kt b/...kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigTextFieldState.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.text.AnnotatedString
+import com.sunnychung.application.multiplatform.hellohttp.util.ObjectRef
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -40,16 +41,22 @@ fun rememberAnnotatedBigTextFieldState(initialValue: AnnotatedString = Annotated
 }
 
 @Composable
-fun rememberAnnotatedBigTextFieldState(initialValue: String = ""): Pair<MutableState<String>, MutableState<BigTextFieldState>> {
-    val secondCacheKey = rememberSaveable { mutableStateOf(initialValue) }
+fun rememberAnnotatedBigTextFieldState(initialValue: String = ""): Pair<MutableState<ObjectRef<String>>, MutableState<BigTextFieldState>> {
+    val secondCacheKey = rememberSaveable { mutableStateOf(ObjectRef(initialValue)) }
     val state = rememberSaveable {
-        log.d { "cache miss 1" }
+        log.i { "cache miss 1" }
         mutableStateOf(BigTextFieldState(BigText.createFromLargeAnnotatedString(AnnotatedString(initialValue)), BigTextViewState()))
     }
-    if (initialValue !== secondCacheKey.value) {
-        log.d { "cache miss. old key2 = ${secondCacheKey.value.abbr()}; new key2 = ${initialValue.abbr()}" }
-        secondCacheKey.value = initialValue
+    if (ObjectRef(initialValue) != secondCacheKey.value) {
+        log.i { "cache miss. old key2 = ${secondCacheKey.value.ref.abbr()}; new key2 = ${initialValue.abbr()}" }
+
+//        // set a value different from initialValue, otherwise the value 'equals' to the old value and would not be set to secondCacheKey.value
+//        secondCacheKey.value = if (initialValue.isNotEmpty()) "" else " "
+//        secondCacheKey.value = initialValue
+
+        secondCacheKey.value = ObjectRef(initialValue)
         state.value = BigTextFieldState(BigText.createFromLargeAnnotatedString(AnnotatedString(initialValue)), BigTextViewState())
+//        log.i { "new view state = ${state.value.viewState}" }
     }
     return secondCacheKey to state
 }