bug fix #17

Author: tangzx

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/CaretImpl.kt

@@ -0,0 +1,9 @@
+package com.tang.intellij.lua.editor
+
+import com.intellij.openapi.editor.Caret
+
+class CaretImpl(private val caretOffset: Int) : Caret {
+    override fun getOffset(): Int {
+        return caretOffset
+    }
+}

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/CompletionService.kt

@@ -1,14 +1,17 @@
 package com.tang.intellij.lua.editor.completion
 
+import com.intellij.codeInsight.completion.CompletionInitializationContext
 import com.intellij.codeInsight.completion.CompletionParameters
 import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.codeInsight.completion.impl.CamelHumpMatcher
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.lang.PsiBuilderFactory
+import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.util.Consumer
 import com.tang.intellij.lua.configuration.IConfigurationManager
+import com.tang.intellij.lua.editor.CaretImpl
 import com.tang.intellij.lua.lang.LuaParserDefinition
 import com.tang.intellij.lua.lexer.LuaLexer
 import com.tang.intellij.lua.parser.LuaParser
@@ -35,32 +38,48 @@ object CompletionService {
             LuaDocCompletionContributor()
     )
 
-    fun collectCompletion(psi: PsiFile, pos: Int, consumer: Consumer<LookupElement>) {
-        val config = IConfigurationManager.get(psi.project)
-        val text = psi.text.replaceRange(pos, pos, "emmy")
-
-        val parser = LuaParser()
-        val builder = PsiBuilderFactory.getInstance().createBuilder(LuaParserDefinition(), LuaLexer(), text)
-        val node = parser.parse(LuaParserDefinition.FILE, builder)
-        val tempPsi = node.psi as LuaPsiFile
-        tempPsi.virtualFile = psi.virtualFile
-        val position = tempPsi.findElementAt(pos)
-
+    fun collectCompletion(file: PsiFile, caret: Int, consumer: Consumer<LookupElement>) {
+        val config = IConfigurationManager.get(file.project)
         val parameters = CompletionParameters()
         parameters.completionType = CompletionType.BASIC
-        parameters.position = position!!
-        parameters.originalFile = psi
-        parameters.offset = pos
+        parameters.originalFile = file
+        parameters.offset = caret
+        val context = CompletionInitializationContext()
+        context.file = file
+        context.caret = CaretImpl(caret)
+        context.startOffset = caret
+        context.dummyIdentifier = CompletionInitializationContext.DUMMY_IDENTIFIER
+        contributors.forEach { it.beforeCompletion(context) }
+        if (context.dummyIdentifier.isEmpty()) {
+            parameters.position = file.findElementAt(caret)!!
+        } else {
+            parameters.position = insertDummyIdentifier(context)
+        }
 
+        val text = file.text
         val result = CompletionResultSetImpl(consumer)
-        val prefix = findPrefix(text, pos)
+        val prefix = findPrefix(text, caret)
         result.prefixMatcher = CamelHumpMatcher(prefix, config.completionCaseSensitive)
 
         parameters.originalFile.putUserData(CompletionSession.KEY, CompletionSession(parameters, result))
 
         contributors.forEach { it.fillCompletionVariants(parameters, result) }
     }
 
+    private fun insertDummyIdentifier(context: CompletionInitializationContext): PsiElement {
+        val oriFile = context.file
+        val pos = context.startOffset
+        val text = oriFile.text.replaceRange(pos, pos, context.dummyIdentifier)
+        val parser = LuaParser()
+        val builder = PsiBuilderFactory.getInstance().createBuilder(LuaParserDefinition(), LuaLexer(), text)
+        val node = parser.parse(LuaParserDefinition.FILE, builder)
+        val copy = node.psi as LuaPsiFile
+        copy.virtualFile = oriFile.virtualFile
+        val position = copy.findElementAt(pos)
+        context.file = copy
+        return position!!
+    }
+
     private fun findPrefix(text: String, pos: Int): String {
         var i = pos
         while (i > 0) {

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LuaCompletionContributor.kt

@@ -83,7 +83,7 @@ class LuaCompletionContributor : CompletionContributor() {
     }*/
 
     override fun beforeCompletion(context: CompletionInitializationContext) {
-        /*suggestWords = true
+        suggestWords = true
         val file = context.file
         if (file is LuaPsiFile) {
             val element = file.findElementAt(context.caret.offset - 1)
@@ -101,7 +101,7 @@ class LuaCompletionContributor : CompletionContributor() {
                     }
                 }
             }
-        }*/
+        }
     }
 
     companion object {

IntelliJ-Core/src/main/java/com/intellij/codeInsight/completion/CompletionInitializationContext.java

@@ -15,15 +15,53 @@
  */
 package com.intellij.codeInsight.completion;
 
+import com.intellij.openapi.editor.Caret;
 import com.intellij.psi.PsiFile;
 
 /**
  * @author peter
  */
 public class CompletionInitializationContext {
+    public static String DUMMY_IDENTIFIER = "emmy ";
     public static String DUMMY_IDENTIFIER_TRIMMED = "emmy";
 
-    public String dummyIdentifier;
+    private String dummyIdentifier;
 
-    public PsiFile file;
+    private PsiFile file;
+
+    private int startOffset;
+
+    private Caret caret;
+
+    public int getStartOffset() {
+        return startOffset;
+    }
+
+    public void setStartOffset(int startOffset) {
+        this.startOffset = startOffset;
+    }
+
+    public Caret getCaret() {
+        return caret;
+    }
+
+    public void setCaret(Caret caret) {
+        this.caret = caret;
+    }
+
+    public PsiFile getFile() {
+        return file;
+    }
+
+    public void setFile(PsiFile file) {
+        this.file = file;
+    }
+
+    public String getDummyIdentifier() {
+        return dummyIdentifier;
+    }
+
+    public void setDummyIdentifier(String dummyIdentifier) {
+        this.dummyIdentifier = dummyIdentifier;
+    }
 }

IntelliJ-Core/src/main/java/com/intellij/openapi/editor/Caret.java

@@ -0,0 +1,5 @@
+package com.intellij.openapi.editor;
+
+public interface Caret {
+    int getOffset();
+}