fix: compatibility errors caused by lookup matcher

Author: carlrobertoh

src/main/kotlin/ee/carlrobert/codegpt/codecompletions/DebouncedCodeCompletionProvider.kt

@@ -121,8 +121,7 @@ class DebouncedCodeCompletionProvider : DebouncedInlineCompletionProvider() {
             return false
         }
 
-        return event is LookupInlineCompletionEvent
-                || event is InlineCompletionEvent.DirectCall
+        return event is InlineCompletionEvent.DirectCall
                 || event is InlineCompletionEvent.DocumentChange
     }
 }

src/main/kotlin/ee/carlrobert/codegpt/codecompletions/LookupInlineCompletionEvent.kt

@@ -6,7 +6,6 @@ import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.codeInsight.lookup.LookupElementPresentation
 import com.intellij.codeInsight.lookup.LookupElementRenderer
-import com.intellij.openapi.util.TextRange
 
 abstract class AbstractLookupItem : LookupItem {
     override fun createLookupElement(
@@ -23,10 +22,6 @@ abstract class AbstractLookupItem : LookupItem {
                     presentation: LookupElementPresentation
                 ) {
                     setPresentation(element, presentation)
-                    emphasizeMatch(
-                        presentation,
-                        searchTextProvider?.invoke() ?: searchText
-                    )
                 }
             })
         getAdditionalLookupStrings().forEach { lookupString ->
@@ -38,24 +33,6 @@ abstract class AbstractLookupItem : LookupItem {
         return PrioritizedLookupElement.withPriority(lookupElement, 1.0)
     }
 
-    private fun emphasizeMatch(
-        presentation: LookupElementPresentation,
-        searchText: String
-    ) {
-        val normalizedSearchText = searchText.trim()
-        if (normalizedSearchText.isEmpty()) {
-            return
-        }
-
-        val matcher = LookupMatchers.createMatcher(normalizedSearchText)
-        matcher.match(displayName)?.forEach { fragment ->
-            presentation.decorateItemTextRange(
-                TextRange(fragment.startOffset, fragment.endOffset),
-                LookupElementPresentation.LookupItemDecoration.HIGHLIGHT_MATCHED
-            )
-        }
-    }
-
     abstract fun getLookupString(): String
 
     protected open fun getAdditionalLookupStrings(): Collection<String> = emptyList()

src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/lookup/AbstractLookupItem.kt

@@ -0,0 +1,31 @@
+package ee.carlrobert.codegpt.ui.textarea.lookup
+
+import com.intellij.codeInsight.completion.PrefixMatcher
+import com.intellij.util.text.matching.MatchedFragment
+
+class LookupItemKeepOpenPrefixMatcher(
+    prefix: String,
+    private val highlightText: String,
+    private val highlightTextProvider: (() -> String)?
+) : PrefixMatcher(prefix) {
+
+    override fun prefixMatches(name: String): Boolean = true
+
+    override fun cloneWithPrefix(prefix: String): PrefixMatcher {
+        return LookupItemKeepOpenPrefixMatcher(prefix, highlightText, highlightTextProvider)
+    }
+
+    override fun matchingDegree(string: String): Int = 0
+
+    override fun getMatchingFragments(
+        pattern: String,
+        name: String
+    ): MutableList<MatchedFragment>? {
+        val effectivePattern = (highlightTextProvider?.invoke() ?: highlightText).trim()
+        if (effectivePattern.isEmpty()) {
+            return null
+        }
+
+        return LookupMatchers.createMatcher(effectivePattern).match(name)?.toMutableList()
+    }
+}

src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/lookup/LookupItemKeepOpenPrefixMatcher.kt

@@ -1,21 +1,9 @@
 package ee.carlrobert.codegpt.ui.textarea.lookup
 
-import com.intellij.codeInsight.completion.PrefixMatcher
 import com.intellij.codeInsight.completion.PrioritizedLookupElement
 import com.intellij.codeInsight.lookup.impl.LookupImpl
 
 object LookupUtil {
-    private fun keepLookupOpenMatcher(prefix: String): PrefixMatcher =
-        object : PrefixMatcher(prefix) {
-            override fun prefixMatches(name: String): Boolean = true
-
-            override fun cloneWithPrefix(prefix: String): PrefixMatcher {
-                return keepLookupOpenMatcher(prefix)
-            }
-
-            override fun matchingDegree(string: String): Int = 0
-        }
-
     fun addLookupItems(
         lookup: LookupImpl,
         lookupItems: List<Pair<LookupItem, Double>>,
@@ -24,7 +12,11 @@ object LookupUtil {
         matcherPrefix: String = searchText
     ) {
         if (!lookup.isLookupDisposed) {
-            val prefixMatcher = keepLookupOpenMatcher(matcherPrefix)
+            val prefixMatcher = LookupItemKeepOpenPrefixMatcher(
+                matcherPrefix,
+                searchText,
+                searchTextProvider
+            )
             lookupItems.forEach { (lookupItem, priority) ->
                 lookup.addItem(
                     PrioritizedLookupElement.withPriority(

src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/lookup/LookupUtil.kt

@@ -4,6 +4,7 @@ import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.lookup.LookupElementPresentation
 import com.intellij.openapi.project.Project
 import ee.carlrobert.codegpt.ui.textarea.lookup.AbstractLookupItem
+import ee.carlrobert.codegpt.ui.textarea.lookup.LookupItemKeepOpenPrefixMatcher
 import ee.carlrobert.codegpt.ui.textarea.lookup.LoadingLookupItem
 import ee.carlrobert.codegpt.ui.textarea.lookup.LookupActionItem
 import ee.carlrobert.codegpt.ui.textarea.lookup.StatusLookupItem
@@ -79,6 +80,30 @@ class PromptTextFieldLookupItemsTest {
         assertThat(items.last()).isInstanceOf(LoadingLookupItem::class.java)
     }
 
+    @Test
+    fun `keep open matcher exposes matching fragments for lookup highlighting`() {
+        val matcher = LookupItemKeepOpenPrefixMatcher("@files abc", "abc", null)
+
+        val fragments = matcher.getMatchingFragments("abc", "my-abc-file.kt")
+
+        assertThat(fragments).isNotNull
+        assertThat(fragments!!.map { it.startOffset to it.endOffset })
+            .contains(3 to 6)
+    }
+
+    @Test
+    fun `keep open matcher uses latest provided search text for lookup highlighting`() {
+        var searchText = "abc"
+        val matcher = LookupItemKeepOpenPrefixMatcher("@files abc", "ignored") { searchText }
+
+        searchText = "file"
+        val fragments = matcher.getMatchingFragments("@files abc", "my-abc-file.kt")
+
+        assertThat(fragments).isNotNull
+        assertThat(fragments!!.map { it.startOffset to it.endOffset })
+            .contains(7 to 11)
+    }
+
     private class TestLookupActionItem(
         override val displayName: String
     ) : AbstractLookupItem(), LookupActionItem {