fix: calculation to find the closest delimited range

JetBrains · Jan 29, 2025 · ad37956 · ad37956
1 parent f1fd08c
commit ad37956
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 26 deletions.
diff --git a/src/main/java/com/maddyhome/idea/vim/extension/miniai/MiniAI.kt b/src/main/java/com/maddyhome/idea/vim/extension/miniai/MiniAI.kt
@@ -194,42 +194,63 @@ private fun addAction(action: TextObjectActionHandler) {
   keyHandlerState.commandBuilder.addAction(action)
 }
 
-private fun findClosestBracketRange(
+private fun findClosestDelimitedRange(
   editor: VimEditor,
   caret: ImmutableVimCaret,
-  count: Int,
-  isOuter: Boolean,
+  delimiters: List<Char>,
+  findRange: (Char) -> TextRange?
 ): TextRange? {
-  return listOf('(', '[', '{')
-    .mapNotNull { char ->
-      findBlockRange(editor, caret, char, count, isOuter)?.let { range -> range to char }
+  val allRanges = delimiters.mapNotNull { char ->
+    findRange(char)?.let { range ->
+      DelimitedRange(range, char)
     }
-    .minByOrNull { it.first.distanceTo(caret.offset) }?.first
+  }
+
+  // First, find all ranges that contain the caret
+  val containingRanges = allRanges.filter {
+    caret.offset in it.range.startOffset..it.range.endOffset
+  }
+
+  // If we have containing ranges, return the smallest one
+  if (containingRanges.isNotEmpty()) {
+    return containingRanges.minBy {
+      it.range.endOffset - it.range.startOffset
+    }.range
+  }
+
+  // If no containing ranges, find the closest one
+  return allRanges
+    .minByOrNull { range ->
+      val startDistance = kotlin.math.abs(caret.offset - range.range.startOffset)
+      val endDistance = kotlin.math.abs(caret.offset - range.range.endOffset)
+      startDistance + endDistance
+    }?.range
 }
 
-private fun findClosestQuoteRange(
+private fun findClosestBracketRange(
   editor: VimEditor,
   caret: ImmutableVimCaret,
-  isOuter: Boolean,
+  count: Int,
+  isOuter: Boolean
 ): TextRange? {
-  return listOf('`', '"', '\'')
-    .mapNotNull { char ->
-      injector.searchHelper.findBlockQuoteInLineRange(editor, caret, char, isOuter)?.let { range -> range to char }
-    }
-    .minByOrNull { it.first.distanceTo(caret.offset) }?.first
+  val brackets = listOf('(', '[', '{')
+  return findClosestDelimitedRange(editor, caret, brackets) { char ->
+    findBlockRange(editor, caret, char, count, isOuter)
+  }
 }
 
-private fun TextRange.distanceTo(caretOffset: Int): Int {
-  val rangeLength = endOffset - startOffset
-
-  // If caret is inside the range
-  if (caretOffset in startOffset..endOffset) {
-    // Return the length of the range - smaller ranges get priority
-    return rangeLength
+private fun findClosestQuoteRange(
+  editor: VimEditor,
+  caret: ImmutableVimCaret,
+  isOuter: Boolean
+): TextRange? {
+  val quotes = listOf('`', '"', '\'')
+  return findClosestDelimitedRange(editor, caret, quotes) { char ->
+    injector.searchHelper.findBlockQuoteInLineRange(editor, caret, char, isOuter)
   }
-
-  // If caret is outside, make the distance much larger
-  val startDistance = kotlin.math.abs(caretOffset - startOffset)
-  val endDistance = kotlin.math.abs(caretOffset - endOffset)
-  return (startDistance + endDistance) * 1000 + rangeLength
 }
+
+private data class DelimitedRange(
+  val range: TextRange,
+  val char: Char
+)
diff --git a/...sts/src/test/kotlin/org/jetbrains/plugins/ideavim/extension/miniai/MiniAIExtensionTest.kt b/...sts/src/test/kotlin/org/jetbrains/plugins/ideavim/extension/miniai/MiniAIExtensionTest.kt
@@ -23,6 +23,19 @@ class MiniAIExtensionTest : VimJavaTestCase() {
     enableExtensions("mini-ai")
   }
 
+
+  @Test
+  fun testFromAlex() {
+    doTest(
+      "ciq",
+      "<caret>This is a \"'simple'\" test",
+      "This is a \"<caret>\" test",
+      Mode.INSERT,
+      JavaFileType.INSTANCE,
+    )
+    assertSelection(null)
+  }
+
   @Test
   fun testChangeInsideNestedQuotes() {
     doTest(