improve override method completion

Author: tangzx

src/main/java/com/tang/intellij/lua/editor/completion/OverrideCompletionProvider.kt

@@ -48,31 +48,39 @@ class OverrideCompletionProvider : CompletionProvider<CompletionParameters>() {
             val classType = methodDef.getClassType(context)
             if (classType != null) {
                 val sup = classType.getSuperClass(context)
-                addOverrideMethod(completionParameters, completionResultSet, sup)
+                val memberNameSet = mutableSetOf<String>()
+                classType.processMembers(context, { _, m ->
+                    m.name?.let { memberNameSet.add(it) }
+                }, false)
+                addOverrideMethod(completionParameters, completionResultSet, memberNameSet, sup)
             }
         }
     }
 
-    private fun addOverrideMethod(completionParameters: CompletionParameters, completionResultSet: CompletionResultSet, sup: ITyClass?) {
+    private fun addOverrideMethod(completionParameters: CompletionParameters, completionResultSet: CompletionResultSet, memberNameSet:MutableSet<String>, sup: ITyClass?) {
         var superCls = sup
         if (superCls != null) {
             val project = completionParameters.originalFile.project
             val context = SearchContext(project)
             val clazzName = superCls.className
             LuaClassMemberIndex.processAll(TyLazyClass(clazzName), context, Processor { def ->
                 if (def is LuaClassMethod) {
-                    val elementBuilder = LookupElementBuilder.create(def.name!!)
-                            .withIcon(LuaIcons.CLASS_METHOD_OVERRIDING)
-                            .withInsertHandler(OverrideInsertHandler(def))
-                            .withTailText(def.paramSignature)
+                    def.name?.let {
+                        if (memberNameSet.add(it)) {
+                            val elementBuilder = LookupElementBuilder.create(def.name!!)
+                                    .withIcon(LuaIcons.CLASS_METHOD_OVERRIDING)
+                                    .withInsertHandler(OverrideInsertHandler(def))
+                                    .withTailText(def.paramSignature)
 
-                    completionResultSet.addElement(elementBuilder)
+                            completionResultSet.addElement(elementBuilder)
+                        }
+                    }
                 }
                 true
             })
 
             superCls = superCls.getSuperClass(context)
-            addOverrideMethod(completionParameters, completionResultSet, superCls)
+            addOverrideMethod(completionParameters, completionResultSet, memberNameSet, superCls)
         }
     }
 

src/main/java/com/tang/intellij/lua/ty/TyClass.kt

@@ -29,7 +29,10 @@ interface ITyClass : ITy {
     var superClassName: String?
     var aliasName: String?
     fun lazyInit(searchContext: SearchContext)
-    fun processMembers(context: SearchContext, processor: (ITyClass, LuaClassMember) -> Unit)
+    fun processMembers(context: SearchContext, processor: (ITyClass, LuaClassMember) -> Unit, deep: Boolean = true)
+    fun processMembers(context: SearchContext, processor: (ITyClass, LuaClassMember) -> Unit) {
+        processMembers(context, processor, true)
+    }
     fun findMember(name: String, searchContext: SearchContext): LuaClassMember?
     fun getSuperClass(context: SearchContext): ITyClass?
 }
@@ -48,7 +51,7 @@ abstract class TyClass(override val className: String, override var superClassNa
         return className.hashCode()
     }
 
-    override fun processMembers(context: SearchContext, processor: (ITyClass, LuaClassMember) -> Unit) {
+    override fun processMembers(context: SearchContext, processor: (ITyClass, LuaClassMember) -> Unit, deep: Boolean) {
         val clazzName = className
         val project = context.project
 
@@ -66,8 +69,10 @@ abstract class TyClass(override val className: String, override var superClassNa
         }
 
         // super
-        val superType = getSuperClass(context)
-        superType?.processMembers(context, processor)
+        if (deep) {
+            val superType = getSuperClass(context)
+            superType?.processMembers(context, processor, deep)
+        }
     }
 
     override fun findMember(name: String, searchContext: SearchContext): LuaClassMember? {
@@ -151,11 +156,11 @@ class TyTable(val table: LuaTableExpr) : TyClass(getTableTypeName(table)) {
         this.flags = TyFlags.ANONYMOUS
     }
 
-    override fun processMembers(context: SearchContext, processor: (ITyClass, LuaClassMember) -> Unit) {
+    override fun processMembers(context: SearchContext, processor: (ITyClass, LuaClassMember) -> Unit, deep: Boolean) {
         for (field in table.tableFieldList) {
             processor(this, field)
         }
-        super.processMembers(context, processor)
+        super.processMembers(context, processor, deep)
     }
 
     override val displayName: String