fix: fix inaly issues

phodal · phodal · commit 990f0fa1cbc9 · 2023-08-05T10:33:08.000+08:00
diff --git a/src/main/kotlin/cc/unitmesh/devti/actions/LLMApplyInlaysAction.kt b/src/main/kotlin/cc/unitmesh/devti/actions/LLMApplyInlaysAction.kt
@@ -42,12 +42,20 @@ class LLMApplyInlaysAction : EditorAction(ApplyInlaysHandler()), DumbAware {
         val blockIndent = CodeStyle.getIndentOptions(project, document).INDENT_SIZE
         val caretOffset = editor.caretModel.offset
         val line = document.getLineNumber(caretOffset)
-        if (isNonEmptyLinePrefix(document, line, caretOffset)) {
+
+        val caretOffsetAfterTab = EditorUtilCopy.indentLine(project, editor, line, blockIndent, caretOffset)
+//        if (isNonEmptyLinePrefix(document, line, caretOffset) || caretOffsetAfterTab < caretOffset) {
+//            return false
+//        }
+
+        val instance = LLMInlayManager.getInstance()
+        val tabRange = TextRange.create(caretOffset, caretOffsetAfterTab)
+
+        if (instance.countCompletionInlays(editor, tabRange) > 0) {
             return false
         }
-        val caretOffsetAfterTab = EditorUtilCopy.indentLine(project, editor, line, blockIndent, caretOffset)
 
-        return caretOffsetAfterTab >= caretOffset
+        return true
     }
 
 
@@ -61,9 +69,10 @@ class LLMApplyInlaysAction : EditorAction(ApplyInlaysHandler()), DumbAware {
         }
 
         override fun doExecute(editor: Editor, caret: Caret?, dataContext: DataContext) {
-            if (editor.isDisposed) return@doExecute
+            if (editor.isDisposed) return
             val project = editor.project ?: return
-            if (project.isDisposed) return@doExecute
+            if (project.isDisposed) return
+
 
             // todo: update this to use the new API
             logger.info("doExecute for applyInlays")
diff --git a/src/main/kotlin/cc/unitmesh/devti/editor/inlay/LLMInlayManager.kt b/src/main/kotlin/cc/unitmesh/devti/editor/inlay/LLMInlayManager.kt
@@ -5,6 +5,7 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.TextRange
 import com.intellij.util.concurrency.annotations.RequiresEdt
 
 interface LLMInlayManager : Disposable {
@@ -25,6 +26,7 @@ interface LLMInlayManager : Disposable {
     fun editorModified(editor: Editor, changeOffset: Int)
 
     fun editorModified(editor: Editor)
+    fun countCompletionInlays(editor: Editor, tabRange: TextRange) : Int
 
     companion object {
         fun getInstance(): LLMInlayManager {
diff --git a/src/main/kotlin/cc/unitmesh/devti/editor/inlay/LLMInlayManagerImpl.kt b/src/main/kotlin/cc/unitmesh/devti/editor/inlay/LLMInlayManagerImpl.kt
@@ -18,6 +18,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.KeyWithDefaultValue
+import com.intellij.openapi.util.TextRange
 import com.intellij.psi.util.PsiUtilBase
 import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 import com.intellij.util.concurrency.annotations.RequiresEdt
@@ -41,11 +42,8 @@ class LLMInlayManagerImpl : LLMInlayManager {
         var isAvailable: Boolean? = KEY_EDITOR_SUPPORTED[editor]
         if (isAvailable == null) {
             isAvailable = editor !is EditorWindow && editor !is ImaginaryEditor && (
-                    editor !is EditorEx ||
-                            !editor.isEmbeddedIntoDialogWrapper
-                    ) &&
-                    !editor.isViewer &&
-                    !editor.isOneLineMode
+                    editor !is EditorEx || !editor.isEmbeddedIntoDialogWrapper) &&
+                    !editor.isViewer && !editor.isOneLineMode
 
             KEY_EDITOR_SUPPORTED[editor] = isAvailable
         }
@@ -147,6 +145,21 @@ class LLMInlayManagerImpl : LLMInlayManager {
         editorModified(editor, editor.caretModel.offset)
     }
 
+    override fun countCompletionInlays(editor: Editor, tabRange: TextRange): Int {
+        val inlays = collectInlays(editor, tabRange.startOffset, tabRange.endOffset)
+        if (inlays.isEmpty()) return 0
+
+        val completionCount = inlays.count {
+            it.getInlay()?.renderer?.javaClass?.name?.contains("LLMInlayRenderer") ?: false
+        }
+
+        if (completionCount > 0) {
+            logger.debug("Completion inlays found: $completionCount")
+        }
+
+        return completionCount
+    }
+
     private fun disposeInlays(renderers: List<LLMInlayRenderer>) {
         logger.debug("Disposing inlays: " + renderers.size)
         for (renderer in renderers) {
diff --git a/src/main/kotlin/cc/unitmesh/devti/editor/presentation/EditorUtilCopy.kt b/src/main/kotlin/cc/unitmesh/devti/editor/presentation/EditorUtilCopy.kt
@@ -3,16 +3,27 @@ package cc.unitmesh.devti.editor.presentation
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.actions.EditorActionUtil
 import com.intellij.openapi.project.Project
+import kotlin.math.min
 
 object EditorUtilCopy {
-    @JvmOverloads
+    fun indentLine(project: Project?, editor: Editor, lineNumber: Int, indent: Int, caretOffset: Int): Int {
+        return indentLine(
+            project,
+            editor,
+            lineNumber,
+            indent,
+            caretOffset,
+            EditorActionUtil.shouldUseSmartTabs(project, editor)
+        )
+    }
+
     fun indentLine(
         project: Project?,
         editor: Editor,
         lineNumber: Int,
         indent: Int,
         caretOffset: Int,
-        shouldUseSmartTabs: Boolean = EditorActionUtil.shouldUseSmartTabs(project, editor),
+        shouldUseSmartTabs: Boolean
     ): Int {
         val editorSettings = editor.settings
         val tabSize = editorSettings.getTabSize(project)
@@ -27,9 +38,7 @@ object EditorUtilCopy {
             lineEnd = document.getLineEndOffset(lineNumber)
             spacesEnd = lineStart
             var inTabs = true
-            while (spacesEnd <= lineEnd &&
-                spacesEnd != lineEnd
-            ) {
+            while (spacesEnd <= lineEnd && spacesEnd != lineEnd) {
                 val c = text[spacesEnd]
                 if (c != '\t') {
                     if (inTabs) {
@@ -47,37 +56,37 @@ object EditorUtilCopy {
             }
         }
         var newCaretOffset = caretOffset
-        if (newCaretOffset >= lineStart && newCaretOffset < lineEnd && spacesEnd == lineEnd) {
+        if (newCaretOffset in lineStart until lineEnd && spacesEnd == lineEnd) {
             spacesEnd = newCaretOffset
-            tabsEnd = Math.min(spacesEnd, tabsEnd)
+            tabsEnd = min(spacesEnd, tabsEnd)
         }
         val oldLength = getSpaceWidthInColumns(text, lineStart, spacesEnd, tabSize)
-        tabsEnd = getSpaceWidthInColumns(text, lineStart, tabsEnd, tabSize)
+        val tabsEnd2 = getSpaceWidthInColumns(text, lineStart, tabsEnd, tabSize)
         var newLength = oldLength + indent
         if (newLength < 0) {
             newLength = 0
         }
-        tabsEnd += indent
-        if (tabsEnd < 0) {
-            tabsEnd = 0
+        var tabsEnd3 = tabsEnd2 + indent
+        if (tabsEnd3 < 0) {
+            tabsEnd3 = 0
         }
         if (!shouldUseSmartTabs) {
-            tabsEnd = newLength
+            tabsEnd3 = newLength
         }
         val buf = StringBuilder(newLength)
         var i = 0
         while (i < newLength) {
-            if (tabSize > 0 && editorSettings.isUseTabCharacter(project) && i + tabSize <= tabsEnd) {
+            if (tabSize > 0 && editorSettings.isUseTabCharacter(project) && i + tabSize <= tabsEnd3) {
                 buf.append('\t')
                 i += tabSize
-                continue
+            } else {
+                buf.append(' ')
+                i++
             }
-            buf.append(' ')
-            i++
         }
         val newSpacesEnd = lineStart + buf.length
         if (newCaretOffset >= spacesEnd) {
-            newCaretOffset += buf.length - spacesEnd - lineStart
+            newCaretOffset += buf.length - (spacesEnd - lineStart)
         } else if (newCaretOffset >= lineStart && newCaretOffset > newSpacesEnd) {
             newCaretOffset = newSpacesEnd
         }
diff --git a/src/main/resources/META-INF/autodev-core.xml b/src/main/resources/META-INF/autodev-core.xml
@@ -22,6 +22,7 @@
                 implementation="cc.unitmesh.devti.runconfig.command.AutoDevFeatureConfigurationProducer"/>
         <runConfigurationProducer
                 implementation="cc.unitmesh.devti.runconfig.command.CompositeAutoBaseRunConfigurationProducer"/>
+
         <configurationType implementation="cc.unitmesh.devti.runconfig.AutoDevConfigurationType"/>
 
         <!-- Run Configurations -->
