fix: remove internal api usages

Author: carlrobertoh

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

@@ -1,18 +1,17 @@
 package ee.carlrobert.codegpt.codecompletions
 
-import com.intellij.codeInsight.inline.completion.InlineCompletionFontUtils
-import com.intellij.codeInsight.inline.completion.elements.InlineCompletionColorTextElement
 import com.intellij.codeInsight.inline.completion.elements.InlineCompletionElement
+import com.intellij.codeInsight.inline.completion.elements.InlineCompletionGrayTextElement
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 
 class CodeCompletionTextElement(
-    text: String,
+    override val text: String,
     private val insertOffset: Int,
     val textRange: TextRange,
     val offsetDelta: Int = 0,
     val originalText: String = text,
-) : InlineCompletionColorTextElement(text, InlineCompletionFontUtils::color) {
+) : InlineCompletionElement {
 
     override fun toPresentable(): InlineCompletionElement.Presentable =
         Presentable(this, insertOffset, textRange)
@@ -21,7 +20,7 @@ class CodeCompletionTextElement(
         element: InlineCompletionElement,
         private val insertOffset: Int,
         private val textRange: TextRange,
-    ) : InlineCompletionColorTextElement.Presentable(element, InlineCompletionFontUtils::color) {
+    ) : InlineCompletionGrayTextElement.Presentable(element) {
 
         override fun render(editor: Editor, offset: Int) {
             super.render(editor, insertOffset)

src/main/kotlin/ee/carlrobert/codegpt/predictions/CodeSuggestionDiffViewer.kt

@@ -6,7 +6,6 @@ import com.intellij.diff.DiffContentFactory
 import com.intellij.diff.DiffContext
 import com.intellij.diff.requests.DiffRequest
 import com.intellij.diff.requests.SimpleDiffRequest
-import com.intellij.diff.tools.combined.COMBINED_DIFF_MAIN_UI
 import com.intellij.diff.tools.fragmented.UnifiedDiffChange
 import com.intellij.diff.tools.fragmented.UnifiedDiffViewer
 import com.intellij.diff.util.DiffUtil
@@ -22,14 +21,10 @@ import com.intellij.openapi.editor.event.DocumentListener
 import com.intellij.openapi.editor.event.VisibleAreaEvent
 import com.intellij.openapi.editor.event.VisibleAreaListener
 import com.intellij.openapi.keymap.KeymapUtil
-import com.intellij.openapi.observable.util.whenDisposed
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.popup.JBPopup
 import com.intellij.openapi.ui.popup.JBPopupFactory
-import com.intellij.openapi.util.Key
-import com.intellij.openapi.util.TextRange
-import com.intellij.openapi.util.UserDataHolder
-import com.intellij.openapi.util.UserDataHolderBase
+import com.intellij.openapi.util.*
 import com.intellij.testFramework.LightVirtualFile
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBScrollPane
@@ -67,9 +62,8 @@ class CodeSuggestionDiffViewer(
         setupDiffEditor()
         mainEditor.scrollingModel.addVisibleAreaListener(visibleAreaListener)
         mainEditor.document.addDocumentListener(documentListener, this)
-        popup.whenDisposed {
-            clearListeners()
-        }
+
+        Disposer.register(popup) { clearListeners() }
     }
 
     override fun onDispose() {
@@ -203,10 +197,11 @@ class CodeSuggestionDiffViewer(
 
         myEditor.component.add(
             BorderLayoutPanel()
-                .addToRight(JBLabel(footerText)
-                    .apply {
-                        font = JBUI.Fonts.miniFont()
-                    })
+                .addToRight(
+                    JBLabel(footerText)
+                        .apply {
+                            font = JBUI.Fonts.miniFont()
+                        })
                 .apply {
                     background = editor.backgroundColor
                     border = JBUI.Borders.empty(4)
@@ -265,15 +260,19 @@ class CodeSuggestionDiffViewer(
     }
 
     private class MyDiffContext(private val project: Project?) : DiffContext() {
-        private val mainUi get() = getUserData(COMBINED_DIFF_MAIN_UI)
-
         private val ownContext: UserDataHolder = UserDataHolderBase()
 
         override fun getProject() = project
-        override fun isFocusedInWindow(): Boolean = mainUi?.isFocusedInWindow() ?: false
-        override fun isWindowFocused(): Boolean = mainUi?.isWindowFocused() ?: false
+
+        override fun isFocusedInWindow(): Boolean {
+            return false
+        }
+
+        override fun isWindowFocused(): Boolean {
+            return false
+        }
+
         override fun requestFocusInWindow() {
-            mainUi?.requestFocusInWindow()
         }
 
         override fun <T> getUserData(key: Key<T>): T? {

src/main/kotlin/ee/carlrobert/codegpt/util/EditorUtil.kt

@@ -13,10 +13,7 @@ import com.intellij.openapi.editor.EditorKind
 import com.intellij.openapi.editor.colors.EditorColorsManager
 import com.intellij.openapi.editor.ex.EditorEx
 import com.intellij.openapi.fileEditor.FileDocumentManager
-import com.intellij.openapi.fileEditor.FileEditor
 import com.intellij.openapi.fileEditor.FileEditorManager
-import com.intellij.openapi.fileEditor.TextEditor
-import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.openapi.util.text.StringUtil
@@ -112,31 +109,12 @@ object EditorUtil {
             .toList()
     }
 
-    @JvmStatic
-    fun getAllEditors(project: Project): List<FileEditor> {
-        return FileEditorManager.getInstance(project).allEditors.toList()
-    }
-
     @JvmStatic
     fun getSelectedEditorSelectedText(project: Project): String? {
         val selectedEditor = getSelectedEditor(project)
         return selectedEditor?.selectionModel?.selectedText
     }
 
-    @JvmStatic
-    fun isSelectedEditor(editor: Editor): Boolean {
-        val project = editor.project
-        if (project != null && !project.isDisposed) {
-            val editorManager = FileEditorManager.getInstance(project) ?: return false
-            if (editorManager is FileEditorManagerImpl) {
-                return editor == editorManager.getSelectedTextEditor(true)
-            }
-            val current = editorManager.selectedEditor
-            return (current is TextEditor) && editor == current.editor
-        }
-        return false
-    }
-
     @JvmStatic
     fun isMainEditorTextSelected(project: Project): Boolean {
         return hasSelection(getSelectedEditor(project))