refactor(devins): update symbol completion #101

Refactored symbol completion to support multiple languages. Added a new interface with a corresponding implementation class, and linked the custom completion provider in the XML configuration file. All symbol reference lookup now iterates through all available language providers. Fixed deprecated API usage and added support for interface-based completion.

Author: phodal

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/DevInCompletionContributor.kt

@@ -29,6 +29,11 @@ class DevInCompletionContributor : CompletionContributor() {
             valuePattern(BuiltinCommand.REV.agentName),
             RevisionReferenceLanguageProvider()
         )
+        extend(
+            CompletionType.BASIC,
+            valuePattern(BuiltinCommand.SYMBOL.agentName),
+            SymbolReferenceLanguageProvider()
+        )
     }
 
     override fun beforeCompletion(context: CompletionInitializationContext) {

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

@@ -18,12 +18,12 @@ enum class BuiltinCommand(
     REV("rev", "Read git change by file", AllIcons.Vcs.History, true, true),
 
     /**
-     * Every language will have a symbol completion, which is the most basic completion, for example:
+     * Every language will have a symbol completion, which is the most basic completion, for example,
      * - Java: [com.intellij.codeInsight.completion.JavaKeywordCompletion]
      * - Kotlin: [org.jetbrains.kotlin.idea.completion.KotlinCompletionContributor]
      * - Python: [com.jetbrains.python.codeInsight.completion.PyClassNameCompletionContributor]
      */
-    SYMBOL("symbol", "[TODO] Read content by Java/Kotlin canonicalName", AllIcons.Actions.GroupBy, false),
+    SYMBOL("symbol", "[TODO] Read content by Java/Kotlin canonicalName", AllIcons.Actions.GroupBy, true),
     WRITE("write", "Write content to a file, /write:path/to/file:L1-L2", AllIcons.Actions.Edit, true, true),
     PATCH("patch", "Apply patch to a file, /patch:path/to/file", AllIcons.Vcs.Patch_file, false),
     RUN("run", "Run the content of a file", AllIcons.Actions.Execute, false),

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

@@ -0,0 +1,23 @@
+package cc.unitmesh.devti.language.completion
+
+import cc.unitmesh.devti.provider.devins.DevInsCompletionProvider
+import com.intellij.codeInsight.completion.CompletionParameters
+import com.intellij.codeInsight.completion.CompletionProvider
+import com.intellij.codeInsight.completion.CompletionResultSet
+import com.intellij.util.ProcessingContext
+
+class SymbolReferenceLanguageProvider : CompletionProvider<CompletionParameters>() {
+    override fun addCompletions(
+        parameters: CompletionParameters,
+        context: ProcessingContext,
+        result: CompletionResultSet
+    ) {
+        DevInsCompletionProvider.all().forEach { completionProvider ->
+            val elements = completionProvider.lookupSymbol(parameters.editor.project!!, parameters, result)
+            elements.forEach {
+                result.addElement(it)
+            }
+        }
+    }
+
+}

java/src/main/kotlin/cc/unitmesh/idea/provider/JavaCustomDevInsCompletionProvider.kt

@@ -0,0 +1,35 @@
+package cc.unitmesh.idea.provider
+
+import cc.unitmesh.devti.provider.devins.DevInsCompletionProvider
+import com.intellij.codeInsight.completion.CompletionParameters
+import com.intellij.codeInsight.completion.CompletionResultSet
+import com.intellij.codeInsight.completion.CompletionUtil
+import com.intellij.codeInsight.completion.JavaClassNameCompletionContributor
+import com.intellij.codeInsight.lookup.LookupElement
+import com.intellij.ide.highlighter.JavaFileType
+import com.intellij.openapi.project.Project
+import com.intellij.psi.search.FileTypeIndex
+import com.intellij.psi.search.ProjectScope
+import com.intellij.util.SmartList
+
+class JavaCustomDevInsCompletionProvider : DevInsCompletionProvider {
+    override fun lookupSymbol(
+        project: Project,
+        parameters: CompletionParameters,
+        result: CompletionResultSet,
+    ): Iterable<LookupElement> {
+        val lookupElements: MutableList<LookupElement> = SmartList()
+        val searchScope = ProjectScope.getContentScope(project)
+        val javaFiles = FileTypeIndex.getFiles(JavaFileType.INSTANCE, searchScope)
+        if (javaFiles.isEmpty()) return lookupElements
+
+        val prefixMatcher = CompletionUtil.findReferenceOrAlphanumericPrefix(parameters)
+        result.withPrefixMatcher(prefixMatcher)
+
+        // TODO: fix this
+        JavaClassNameCompletionContributor
+            .addAllClasses(parameters, true, result.prefixMatcher, lookupElements::add)
+
+        return lookupElements
+    }
+}

java/src/main/resources/cc.unitmesh.idea.xml

@@ -60,6 +60,9 @@
             <bundleName>messages.AutoDevBundle</bundleName>
             <categoryKey>intention.category.llm</categoryKey>
         </autoDevIntention>
+
+        <customDevInsCompletionProvider
+                implementation="cc.unitmesh.idea.provider.JavaCustomDevInsCompletionProvider"/>
     </extensions>
 
     <extensions defaultExtensionNs="com.intellij">

src/222/main/resources/META-INF/autodev-core.xml

@@ -166,9 +166,8 @@
                         dynamic="true"/>
 
         <extensionPoint qualifiedName="cc.unitmesh.customDevInsCompletionProvider"
-                        beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
-            <with attribute="implementationClass" implements="cc.unitmesh.devti.provider.devins.DevInsCompletionProvider"/>
-        </extensionPoint>
+                        interface="cc.unitmesh.devti.provider.devins.DevInsCompletionProvider"
+                        dynamic="true"/>
     </extensionPoints>
 
     <applicationListeners>

src/233/main/resources/META-INF/autodev-core.xml

@@ -165,9 +165,8 @@
                         dynamic="true"/>
 
         <extensionPoint qualifiedName="cc.unitmesh.customDevInsCompletionProvider"
-                        beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
-            <with attribute="implementationClass" implements="cc.unitmesh.devti.provider.devins.DevInsCompletionProvider"/>
-        </extensionPoint>
+                        interface="cc.unitmesh.devti.provider.devins.DevInsCompletionProvider"
+                        dynamic="true"/>
     </extensionPoints>
 
     <applicationListeners>

src/main/kotlin/cc/unitmesh/devti/provider/devins/DevInsCompletionProvider.kt

@@ -1,25 +1,28 @@
 package cc.unitmesh.devti.provider.devins
 
 import com.intellij.codeInsight.completion.CompletionParameters
+import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.codeInsight.lookup.LookupElement
-import com.intellij.lang.Language
-import com.intellij.lang.LanguageExtension
+import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiElement
 
 interface DevInsCompletionProvider {
 
     /**
      * Lookup canonical name for different language
      */
-    fun lookupSymbol(project: Project, parameters: CompletionParameters, element: PsiElement): Iterable<LookupElement>
+    fun lookupSymbol(
+        project: Project,
+        parameters: CompletionParameters,
+        result: CompletionResultSet
+    ): Iterable<LookupElement>
 
     companion object {
-        private val languageExtension: LanguageExtension<DevInsCompletionProvider> =
-            LanguageExtension("cc.unitmesh.customDevInsCompletionProvider")
+        private val EP_NAME: ExtensionPointName<DevInsCompletionProvider> =
+            ExtensionPointName("cc.unitmesh.customDevInsCompletionProvider")
 
-        fun forLanguage(language: Language): DevInsCompletionProvider? {
-            return languageExtension.forLanguage(language)
+        fun all(): List<DevInsCompletionProvider> {
+            return EP_NAME.extensionList
         }
     }
 }