Fix indentation bug

zhelenskiy · Apr 4, 2024 · c5d2d7b · c5d2d7b
1 parent cd31669
commit c5d2d7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/editor/src/commonMain/kotlin/editor/basic/CharEventHandlers.kt b/editor/src/commonMain/kotlin/editor/basic/CharEventHandlers.kt
@@ -108,8 +108,13 @@ public inline fun <T : Token, reified Bracket : ScopeChangingToken> closingBrack
         textFieldState.lineOffsets[finishLine]?.let { it + oldOffsetStart } ?: textFieldState.offsets[finishLine].last()
     if (position.column > (textFieldState.lineOffsets[finishLine] ?: Int.MAX_VALUE)) return@f null
     val token = textFieldState.tokens
-        .lastOrNull { it is Bracket && it.scopeChange == ScopeChange.OpensScope && it !in matchedBrackets }
-        ?.takeIf { it.text == openingBracket }
+        .lastOrNull {
+            it is Bracket && textFieldState.tokenOffsets[it]!!.last < textFieldState.selection.min &&
+            it.scopeChange == ScopeChange.OpensScope && it.text == openingBracket &&
+            matchedBrackets[it].let { paired ->
+                paired == null || textFieldState.tokenOffsets[paired as T]!!.first >= textFieldState.selection.max
+            }
+        }
         ?: return@f null
 
     val openTokenStartPosition = textFieldState.tokenPositions[token]?.first ?: return@f null

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,4 @@ development=true
 
 #Publication
 group=com.zhelenskiy
-version=0.0.4
+version=0.0.5