feat(toolchain): add toolchain icon and improve command completion #307

Author: phodal

core/src/main/kotlin/cc/unitmesh/devti/AutoDevIcons.kt

@@ -49,4 +49,7 @@ object AutoDevIcons {
 
     @JvmField
     val Stop: Icon = IconLoader.getIcon("/icons/stop.svg", AutoDevIcons::class.java)
+
+    @JvmField
+    val TOOLCHAIN: Icon = IconLoader.getIcon("/icons/toolchain.svg", AutoDevIcons::class.java)
 }

core/src/main/kotlin/cc/unitmesh/devti/bridge/utils/StructureCommandUtil.kt

@@ -3,6 +3,7 @@ package cc.unitmesh.devti.bridge.utils
 import com.intellij.ide.structureView.StructureView
 import com.intellij.ide.structureView.StructureViewTreeElement
 import com.intellij.lang.LanguageStructureViewBuilder
+import com.intellij.openapi.application.invokeLater
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.fileEditor.FileEditor
 import com.intellij.openapi.fileEditor.FileEditorManager
@@ -18,9 +19,9 @@ object StructureCommandUtil {
      * (1000-9999)
      * ```
      */
-    private val maxLineWith = 11
-    private val maxDepth = 5
-    private val maxLinesForShowLinNO = 60
+    private const val MAX_LINE_WIDTH = 11
+    private const val MAX_DEPTH = 5
+    private const val MAX_LINES_FOR_SHOW_LINENO = 60
 
     fun getFileStructure(project: Project, file: VirtualFile, psiFile: PsiFile): String {
         val viewFactory = LanguageStructureViewBuilder.INSTANCE.forLanguage(psiFile.language)
@@ -33,8 +34,9 @@ object StructureCommandUtil {
                 ?.createStructureView(fileEditor, project)
                 ?: return "No StructureView found."
 
-            /// close the editor
-            FileEditorManager.getInstance(project).closeFile(file)
+            invokeLater {
+                FileEditorManager.getInstance(project).closeFile(file)
+            }
 
             val root: StructureViewTreeElement = view.treeModel.root
             return traverseStructure(root, 0, StringBuilder()).toString()
@@ -52,9 +54,7 @@ object StructureCommandUtil {
     private fun traverseStructure(element: StructureViewTreeElement, depth: Int, sb: StringBuilder): StringBuilder {
         val indent = formatBeforeCode(element, depth)
         var str = element.presentation.presentableText
-//        if (!str.isNullOrBlank() && !element.presentation.locationString.isNullOrBlank()) {
-//            str += " (${element.presentation.locationString})"
-//        }
+
         if (!str.isNullOrBlank()) {
             sb.append(indent).append(str).append("\n")
         }
@@ -72,13 +72,13 @@ object StructureCommandUtil {
         return if (element.value is PsiElement) {
             val psiElement = element.value as PsiElement
             val line = formatLine(psiElement)
-            if (line.length < maxLineWith) {
-                line + " ".repeat(maxLineWith - line.length) + "  ".repeat(depth)
+            if (line.length < MAX_LINE_WIDTH) {
+                line + " ".repeat(MAX_LINE_WIDTH - line.length) + "  ".repeat(depth)
             } else {
                 line + "  ".repeat(depth)
             }
         } else {
-            " ".repeat(maxLineWith) + "  ".repeat(depth)
+            " ".repeat(MAX_LINE_WIDTH) + "  ".repeat(depth)
         }
     }
 
@@ -88,10 +88,10 @@ object StructureCommandUtil {
         val start = document.getLineNumber(psiElement.textRange.startOffset)
         val end = document.getLineNumber(psiElement.textRange.endOffset)
 
-        if (end - start > maxLinesForShowLinNO) {
+        if (end - start > MAX_LINES_FOR_SHOW_LINENO) {
             return "(${start + 1}-${end + 1})"
         }
 
-        return " ".repeat(maxDepth)
+        return " ".repeat(MAX_DEPTH)
     }
 }

core/src/main/kotlin/cc/unitmesh/devti/devin/dataprovider/BuiltinCommand.kt

@@ -120,7 +120,7 @@ enum class BuiltinCommand(
 
     companion object {
         fun all(): List<BuiltinCommand> {
-            return values().toList()
+            return entries.filter { it != TOOLCHAIN_COMMAND }
         }
 
         fun example(command: BuiltinCommand): String {

core/src/main/resources/icons/toolchain.svg

@@ -1,7 +1,7 @@
 package cc.unitmesh.devti.language.completion.provider
 
+import cc.unitmesh.devti.AutoDevIcons
 import cc.unitmesh.devti.devin.dataprovider.BuiltinCommand
-import com.intellij.codeInsight.AutoPopupController
 import com.intellij.codeInsight.completion.*
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.util.ProcessingContext
@@ -20,14 +20,7 @@ class ToolchainCommandCompletion : CompletionProvider<CompletionParameters>() {
 
     private fun createCommandCompletionCandidate(it: String) =
         PrioritizedLookupElement.withPriority(
-            LookupElementBuilder.create(it)
-                .withInsertHandler { context, _ ->
-                    context.document.insertString(context.tailOffset, ":")
-                    context.editor.caretModel.moveCaretRelatively(1, 0, false, false, false)
-
-                    val editor = context.editor
-                    AutoPopupController.getInstance(editor.project!!).scheduleAutoPopup(editor)
-                },
+            LookupElementBuilder.create(it).withIcon(AutoDevIcons.TOOLCHAIN),
             98.0
         )
 }

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/completion/provider/ToolchainCommandCompletion.kt

@@ -135,12 +135,13 @@ class GitRevisionProvider : RevisionProvider {
     override fun history(project: Project, file: VirtualFile): String {
         val filePath: FilePath = VcsUtil.getFilePath(file)
         val history = GitFileHistory.collectHistory(project, filePath)
-        val historyCommitMessages = history.joinToString("\n") { it.commitMessage.toString() }
+        val historyCommitMessages = history.withIndex().joinToString("\n") { "${it.index + 1}. ${it.value.commitMessage}" }
 
         return """
             |filename: ${file.name}
             |changes: ${history.size}
-            |historyCommits: $historyCommitMessages
+            |historyCommits: 
+            |$historyCommitMessages
         """.trimMargin()
     }
 }