Changelog

 - up plugin version
 - modify CHANGELOG.md
 - modify README.md
 - add completion for user-defined variables and functions

Author: devyatkinalexandr

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## [Unreleased]
 
+## [0.0.3]
+### Added
+- Added Ride file creation from lookup
+- Added reference contributor for functions in one file
+- Added find usages for functions in one file
+- Added completion for user-defined functions
+- Added completion for user-defined variables
+
+### Fixed
+- Language grammar errors
+
 ## [0.0.2]
 ### Added
 - Built-in structures, types and functions completion

README.md

@@ -11,8 +11,12 @@ Features:<br>
 <ul>
   <li>Syntax validation</li>
   <li>Keyword completion</li>
-  <li>Syntax highlighting and color schemes</li>
   <li>Built-in structures, types and functions completion</li>
+  <li>User-defined functions completion</li>
+  <li>User-defined variables completion</li>
+  <li>Syntax highlighting and color schemes</li>
+  <li>Ride file creation from lookup</li>
+  <li>Code navigation</li>
 </ul>
 <!-- Plugin description end -->
 

gradle.properties

@@ -2,7 +2,7 @@ kotlin.code.style=official
 # plugin
 pluginGroup=com.wavesplatform
 pluginName=rideplugin
-pluginVersion=0.0.2
+pluginVersion=0.0.3
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion = 7.5.1
 # platform

src/main/kotlin/com/wavesplatform/rideplugin/completion/RideFunctionsCompletionContributor.kt

@@ -0,0 +1,52 @@
+package com.wavesplatform.rideplugin.completion
+
+import com.intellij.codeInsight.completion.*
+import com.intellij.codeInsight.lookup.LookupElementBuilder
+import com.intellij.icons.AllIcons
+import com.intellij.openapi.project.DumbAware
+import com.intellij.psi.util.PsiTreeUtil
+import com.intellij.util.ProcessingContext
+import com.wavesplatform.rideplugin.icons.RideIcons
+import com.wavesplatform.rideplugin.psi.RideFunctionDefinition
+
+class RideFunctionsCompletionContributor : CompletionContributor(), DumbAware {
+    init {
+        val provider = object : CompletionProvider<CompletionParameters>() {
+            override fun addCompletions(
+                parameters: CompletionParameters,
+                context: ProcessingContext,
+                result: CompletionResultSet
+            ) {
+
+                val declaredFunctions = PsiTreeUtil
+                    .findChildrenOfType(
+                        parameters.originalPosition?.containingFile,
+                        RideFunctionDefinition::class.java
+                    ).map { it.text }
+
+                declaredFunctions
+                    .asSequence()
+                    .map { "$it()" }
+                    .map(LookupElementBuilder::create)
+                    .map {
+                        it.withInsertHandler { context, item ->
+                            val start = context.startOffset
+                            val end = context.selectionEndOffset
+                            context.editor.caretModel.moveToOffset(end - 1)
+                        }
+                    }
+                    .map {
+                        it.withIcon(RideIcons.FUNCTION)
+                            .withTypeIconRightAligned(true)
+                    }
+                    .map(result::addElement)
+                    .toList()
+            }
+        }
+        extend(
+            CompletionType.BASIC,
+            RidePatterns.InvocationPattern.functionCallPattern(),
+            provider
+        )
+    }
+}

src/main/kotlin/com/wavesplatform/rideplugin/completion/RidePatterns.kt

@@ -93,6 +93,13 @@ object RidePatterns {
         }
     }
 
+    object RefPattern {
+        @JvmStatic
+        fun varRefPattern(): PsiElementPattern.Capture<PsiElement> {
+            return psiElement().inside(RideAll::class.java)
+        }
+    }
+
     object InvocationPattern {
         @JvmStatic
         fun structCreationPattern(): PsiElementPattern.Capture<PsiElement> {

src/main/kotlin/com/wavesplatform/rideplugin/completion/RideVarCompletionContributor.kt

@@ -0,0 +1,44 @@
+package com.wavesplatform.rideplugin.completion
+
+import com.intellij.codeInsight.completion.*
+import com.intellij.codeInsight.lookup.LookupElementBuilder
+import com.intellij.openapi.project.DumbAware
+import com.intellij.psi.util.PsiTreeUtil
+import com.intellij.util.ProcessingContext
+import com.wavesplatform.rideplugin.icons.RideIcons
+import com.wavesplatform.rideplugin.psi.RideVarDefinition
+
+class RideVarCompletionContributor : CompletionContributor(), DumbAware {
+    init {
+        val provider = object : CompletionProvider<CompletionParameters>() {
+            override fun addCompletions(
+                parameters: CompletionParameters,
+                context: ProcessingContext,
+                result: CompletionResultSet
+            ) {
+                val declaredVariables = PsiTreeUtil
+                    .findChildrenOfType(
+                        parameters.originalPosition?.containingFile,
+                        RideVarDefinition::class.java
+                    ).map { it.text }
+
+                declaredVariables
+                    .asSequence()
+                    .map(LookupElementBuilder::create)
+                    .map {
+                        it.withInsertHandler { context, _ ->
+                            val end = context.selectionEndOffset
+                            context.editor.caretModel.moveToOffset(end - 1)
+                        }
+                    }
+                    .map(result::addElement)
+                    .toList()
+            }
+        }
+        extend(
+            CompletionType.BASIC,
+            RidePatterns.RefPattern.varRefPattern(),
+            provider
+        )
+    }
+}

src/main/resources/META-INF/plugin.xml

@@ -35,6 +35,10 @@
                                 implementationClass="com.wavesplatform.rideplugin.completion.RideStructCreationCompletionContributor"/>
         <completion.contributor language="RIDE"
                                 implementationClass="com.wavesplatform.rideplugin.completion.RideBuildInFunctionsCompletionContributor"/>
+        <completion.contributor language="RIDE"
+                                implementationClass="com.wavesplatform.rideplugin.completion.RideFunctionsCompletionContributor"/>
+        <completion.contributor language="RIDE"
+                                implementationClass="com.wavesplatform.rideplugin.completion.RideVarCompletionContributor"/>
         <lang.braceMatcher language="RIDE"
                            implementationClass="com.wavesplatform.rideplugin.editor.RideBraceMatcher"/>
         <annotator language="RIDE"