feat: init basic completion

feakin · Oct 7, 2022 · fafb650 · fafb650
1 parent 6ffeab4
commit fafb650
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -47,4 +47,7 @@ Plugin based on the [IntelliJ Platform Plugin Template][template].
 
 inspired and based on [https://github.com/intellij-rust/intellij-rust](https://github.com/intellij-rust/intellij-rust)
 
+- MIT license. Copyright (c) 2015 Aleksey Kladov, Evgeny Kurbatsky, Alexey Kudinkin and contributors
+- MIT license. Copyright (c) 2016 JetBrains
+
 @2022 This code is distributed under the MPL license. See `LICENSE` in this directory.
diff --git a/src/main/kotlin/com/feakin/intellij/completion/FkKeywordCompletionContributor.kt b/src/main/kotlin/com/feakin/intellij/completion/FkKeywordCompletionContributor.kt
@@ -1,29 +1,34 @@
 package com.feakin.intellij.completion
 
+
 import com.feakin.intellij.highlight.FkTokenTypeSets
-import com.feakin.intellij.psi.FkNamedElement
 import com.intellij.codeInsight.completion.*
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.openapi.project.DumbAware
-import com.intellij.patterns.PlatformPatterns
+import com.intellij.patterns.PlatformPatterns.psiElement
+import com.intellij.patterns.StandardPatterns.instanceOf
 import com.intellij.util.ProcessingContext
 
 
 // refs: https://github.com/JetBrains/intellij-community/blob/master/plugins/kotlin/completion/impl-shared/src/org/jetbrains/kotlin/idea/completion/implCommon/KeywordCompletion.kt
 class FkKeywordCompletionContributor : CompletionContributor(), DumbAware {
     init {
-        val psiElement = PlatformPatterns.psiElement(FkNamedElement::class.java)
-        extend(CompletionType.BASIC, psiElement, object : CompletionProvider<CompletionParameters>() {
-            override fun addCompletions(
-                parameters: CompletionParameters,
-                context: ProcessingContext,
-                result: CompletionResultSet
-            ) {
-                FkTokenTypeSets.KEY_WORDS.types.forEach {
-                    result.addElement(LookupElementBuilder.create(it.toString()))
-                }
+        extend(
+            CompletionType.BASIC, psiElement().inFile(instanceOf(FkFile::class.java)),
+            KeywordsCompletionProvider()
+        )
+    }
+
+    class KeywordsCompletionProvider : CompletionProvider<CompletionParameters>() {
+        override fun addCompletions(
+            parameters: CompletionParameters,
+            context: ProcessingContext,
+            result: CompletionResultSet
+        ) {
+            FkTokenTypeSets.KEY_WORDS.types.forEach {
+                result.addElement(LookupElementBuilder.create(it.debugName).bold())
             }
         }
-        )
     }
 }
+
diff --git a/src/main/kotlin/com/feakin/intellij/highlight/FkTokenTypeSets.kt b/src/main/kotlin/com/feakin/intellij/highlight/FkTokenTypeSets.kt
@@ -34,6 +34,5 @@ object FkTokenTypeSets {
         FkElementTypes.TO_KEYWORD,
         FkElementTypes.RECEIVE_KEYWORD,
         FkElementTypes.FLOW_KEYWORD,
-//        FkElementTypes.FROM_KEYWORD,
     )
 }
diff --git a/src/main/kotlin/com/feakin/intellij/resolve/ref/impl/FkContextDeclReferenceImpl.kt b/src/main/kotlin/com/feakin/intellij/resolve/ref/impl/FkContextDeclReferenceImpl.kt
@@ -4,7 +4,6 @@ import com.feakin.intellij.FkFile
 import com.feakin.intellij.FkFileType
 import com.feakin.intellij.psi.*
 import com.feakin.intellij.resolve.ref.FkReferenceBase
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiElement
@@ -25,7 +24,6 @@ class FkContextDeclReferenceImpl(
     }
 }
 
-
 private val CONTEXT_NAME_INFERENCE_KEY: Key<CachedValue<List<FkElement>>> = Key.create("CONTEXT_NAME_INFERENCE_KEY")
 
 typealias InferenceResult = List<FkElement>;
@@ -54,11 +52,11 @@ private fun inferContextName(
             PsiTreeUtil.getChildrenOfType(it, FkContextMapDeclaration::class.java)?.toList()
         }?.flatten()?.toTypedArray()
 
-        val mapBodys: Array<out FkContextMapBody>? = contextMaps?.mapNotNull {
+        val mapBodies: Array<out FkContextMapBody>? = contextMaps?.mapNotNull {
             PsiTreeUtil.getChildrenOfType(it, FkContextMapBody::class.java)?.toList()
         }?.flatten()?.toTypedArray()
 
-        mapBodys?.forEach { contextMapDeclaration ->
+        mapBodies?.forEach { contextMapDeclaration ->
             PsiTreeUtil.getChildrenOfType(contextMapDeclaration, FkContextName::class.java)
                 ?.forEach { contextName ->
                     if (contextName.text == element.name) {