clean code

Author: tangzx

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

@@ -20,7 +20,6 @@ import com.intellij.codeInsight.completion.*
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.Project
-import com.intellij.util.ProcessingContext
 import com.intellij.util.Processor
 import com.tang.intellij.lua.lang.LuaIcons
 import com.tang.intellij.lua.psi.*
@@ -38,15 +37,16 @@ enum class MemberCompletionMode {
 
  * Created by tangzx on 2016/12/25.
  */
-open class ClassMemberCompletionProvider : CompletionProvider<CompletionParameters>() {
+open class ClassMemberCompletionProvider : LuaCompletionProvider() {
     protected abstract class HandlerProcessor {
         open fun processLookupString(lookupString: String, member: LuaClassMember, memberTy: ITy?): String = lookupString
         abstract fun process(element: LuaLookupElement, member: LuaClassMember, memberTy: ITy?): LookupElement
     }
 
-    override fun addCompletions(completionParameters: CompletionParameters,
-                                processingContext: ProcessingContext,
-                                completionResultSet: CompletionResultSet) {
+    override fun addCompletions(session: CompletionSession) {
+        val completionParameters = session.parameters
+        val completionResultSet = session.resultSet
+
         val psi = completionParameters.position
         val indexExpr = psi.parent
 

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

@@ -16,11 +16,8 @@
 
 package com.tang.intellij.lua.editor.completion
 
-import com.intellij.codeInsight.completion.CompletionParameters
-import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.psi.tree.TokenSet
-import com.intellij.util.ProcessingContext
 import com.intellij.util.Processor
 import com.tang.intellij.lua.Constants
 import com.tang.intellij.lua.highlighting.LuaSyntaxHighlighter
@@ -33,7 +30,7 @@ import com.tang.intellij.lua.ty.*
  * suggest local/global vars and functions
  * Created by TangZX on 2017/4/11.
  */
-class LocalAndGlobalCompletionProvider internal constructor(private val mask: Int) : ClassMemberCompletionProvider() {
+class LocalAndGlobalCompletionProvider(private val mask: Int) : ClassMemberCompletionProvider() {
 
     private fun has(flag: Int): Boolean {
         return mask and flag == flag
@@ -78,8 +75,9 @@ class LocalAndGlobalCompletionProvider internal constructor(private val mask: In
         }
     }
 
-    override fun addCompletions(completionParameters: CompletionParameters, processingContext: ProcessingContext, completionResultSet: CompletionResultSet) {
-        val session = completionParameters.editor.getUserData(CompletionSession.KEY)!!
+    override fun addCompletions(session: CompletionSession) {
+        val completionParameters = session.parameters
+        val completionResultSet = session.resultSet
         val cur = completionParameters.position
         val nameExpr = cur.parent
 

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

@@ -17,29 +17,28 @@
 package com.tang.intellij.lua.editor.completion
 
 import com.intellij.codeInsight.completion.CompletionParameters
-import com.intellij.codeInsight.completion.CompletionProvider
 import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.codeInsight.template.Template
 import com.intellij.codeInsight.template.TemplateManager
 import com.intellij.psi.util.PsiTreeUtil
-import com.intellij.util.ProcessingContext
 import com.intellij.util.Processor
 import com.tang.intellij.lua.lang.LuaIcons
 import com.tang.intellij.lua.psi.*
 import com.tang.intellij.lua.search.SearchContext
 import com.tang.intellij.lua.stubs.index.LuaClassMemberIndex
 import com.tang.intellij.lua.ty.ITy
-import com.tang.intellij.lua.ty.ITyClass
 import com.tang.intellij.lua.ty.TyClass
 import com.tang.intellij.lua.ty.TyLazyClass
 
 /**
  * override supper
  * Created by tangzx on 2016/12/25.
  */
-class OverrideCompletionProvider : CompletionProvider<CompletionParameters>() {
-    override fun addCompletions(completionParameters: CompletionParameters, processingContext: ProcessingContext, completionResultSet: CompletionResultSet) {
+class OverrideCompletionProvider : LuaCompletionProvider() {
+    override fun addCompletions(session: CompletionSession) {
+        val completionParameters = session.parameters
+        val completionResultSet = session.resultSet
         val id = completionParameters.position
         val methodDef = PsiTreeUtil.getParentOfType(id, LuaClassMethodDef::class.java)
         if (methodDef != null) {

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

@@ -25,7 +25,6 @@ import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.roots.impl.ProjectFileIndexFacade
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.util.ProcessingContext
 import com.tang.intellij.lua.lang.LuaFileType
 import com.tang.intellij.lua.lang.LuaIcons
 import com.tang.intellij.lua.lang.type.LuaString
@@ -34,9 +33,10 @@ import com.tang.intellij.lua.lang.type.LuaString
  *
  * Created by tangzx on 2016/12/25.
  */
-class RequirePathCompletionProvider : CompletionProvider<CompletionParameters>() {
-
-    override fun addCompletions(completionParameters: CompletionParameters, processingContext: ProcessingContext, completionResultSet: CompletionResultSet) {
+class RequirePathCompletionProvider : LuaCompletionProvider() {
+    override fun addCompletions(session: CompletionSession) {
+        val completionParameters = session.parameters
+        val completionResultSet = session.resultSet
         val file = completionParameters.originalFile
         val cur = file.findElementAt(completionParameters.offset - 1)
         if (cur != null) {

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

@@ -16,11 +16,8 @@
 
 package com.tang.intellij.lua.editor.completion
 
-import com.intellij.codeInsight.completion.CompletionParameters
-import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.psi.util.PsiTreeUtil
-import com.intellij.util.ProcessingContext
 import com.tang.intellij.lua.psi.LuaClassMember
 import com.tang.intellij.lua.psi.LuaClassMethodDef
 import com.tang.intellij.lua.psi.LuaPsiTreeUtil
@@ -35,9 +32,9 @@ import com.tang.intellij.lua.ty.isVisibleInScope
  * Created by TangZX on 2017/4/11.
  */
 class SuggestSelfMemberProvider : ClassMemberCompletionProvider() {
-    override fun addCompletions(completionParameters: CompletionParameters,
-                                processingContext: ProcessingContext,
-                                completionResultSet: CompletionResultSet) {
+    override fun addCompletions(session: CompletionSession) {
+        val completionParameters = session.parameters
+        val completionResultSet = session.resultSet
         val position = completionParameters.position
         val methodDef = PsiTreeUtil.getParentOfType(position, LuaClassMethodDef::class.java)
         if (methodDef != null && !methodDef.isStatic) {

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

@@ -16,13 +16,10 @@
 
 package com.tang.intellij.lua.editor.completion
 
-import com.intellij.codeInsight.completion.CompletionParameters
-import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.codeInsight.completion.PrioritizedLookupElement
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.psi.util.PsiTreeUtil
-import com.intellij.util.ProcessingContext
 import com.intellij.util.Processor
 import com.tang.intellij.lua.lang.LuaIcons
 import com.tang.intellij.lua.psi.LuaClassField
@@ -55,8 +52,9 @@ class TableCompletionProvider : ClassMemberCompletionProvider() {
                 "__metatable" to "Meta method"
         )
     }
-
-    override fun addCompletions(completionParameters: CompletionParameters, processingContext: ProcessingContext, completionResultSet: CompletionResultSet) {
+    override fun addCompletions(session: CompletionSession) {
+        val completionParameters = session.parameters
+        val completionResultSet = session.resultSet
         metaMethodNames.forEach {
             val b = LookupElementBuilder.create(it.key)
                     .withTypeText(it.value)