feat(shirelang): add icon support and improve line marker provider #29

Enable icon support for variables in `VariableCompletionProvider`. Refactor `ShirePsiExprLineMarkerProvider` to handle different cases and add pipeline icon. Add new icons in `ShireIcons`.
phodal · Jul 2, 2024 · f12c199 · f12c199
1 parent 1d4bb4b
commit f12c199
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 16 deletions.
diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/ShireIcons.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/ShireIcons.kt
@@ -15,5 +15,9 @@ object ShireIcons {
     @JvmField
     val PsiExpr: Icon = IconLoader.getIcon("/icons/shire-psi-expr.svg", ShireIcons::class.java)
     @JvmField
-    val Variable: Icon = IconLoader.getIcon("/icons/variable.svg", ShireIcons::class.java)
+    val Variable: Icon = IconLoader.getIcon("/icons/shire-variable.svg", ShireIcons::class.java)
+    @JvmField
+    val Pipeline: Icon = IconLoader.getIcon("/icons/shire-pipeline.svg", ShireIcons::class.java)
+    @JvmField
+    val Case: Icon = IconLoader.getIcon("/icons/shire-case.svg", ShireIcons::class.java)
 }
diff --git a/...ng/src/main/kotlin/com/phodal/shirelang/completion/provider/VariableCompletionProvider.kt b/...ng/src/main/kotlin/com/phodal/shirelang/completion/provider/VariableCompletionProvider.kt
@@ -7,6 +7,7 @@ import com.intellij.codeInsight.completion.PrioritizedLookupElement
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.util.ProcessingContext
 import com.phodal.shirecore.provider.variable.PsiContextVariable
+import com.phodal.shirelang.ShireIcons
 import com.phodal.shirelang.completion.dataprovider.ContextVariable
 
 class VariableCompletionProvider : CompletionProvider<CompletionParameters>() {
@@ -19,7 +20,7 @@ class VariableCompletionProvider : CompletionProvider<CompletionParameters>() {
             val withTypeText =
                 PrioritizedLookupElement.withPriority(
                     LookupElementBuilder.create(it.variable)
-//                        .withIcon(ShireIcons.Variable)
+                        .withIcon(ShireIcons.Variable)
                         .withTypeText(it.description, true),
                     99.0
                 )
@@ -30,7 +31,7 @@ class VariableCompletionProvider : CompletionProvider<CompletionParameters>() {
             val withTypeText =
                 PrioritizedLookupElement.withPriority(
                     LookupElementBuilder.create(it.variableName)
-//                        .withIcon(ShireIcons.Variable)
+                        .withIcon(ShireIcons.Variable)
                         .withTypeText(it.description, true)
                         ,
                     90.0

diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/run/ShirePsiExprLineMarkerProvider.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/run/ShirePsiExprLineMarkerProvider.kt
@@ -15,21 +15,36 @@ class ShirePsiExprLineMarkerProvider : LineMarkerProvider {
             return null
         }
 
-        if (element.functionStatement?.functionBody?.queryStatement == null) {
-            return null
+        if (element.functionStatement?.functionBody?.queryStatement != null) {
+            val firstChildKeyElement = element.frontMatterKey!!.firstChild
+
+            return LineMarkerInfo(
+                firstChildKeyElement,
+                firstChildKeyElement.textRange,
+                ShireIcons.PsiExpr,
+                null,
+                null,
+                GutterIconRenderer.Alignment.LEFT
+            ) {
+                ""
+            }
         }
 
-        val firstChildKeyElement = element.frontMatterKey!!.firstChild
-
-        return LineMarkerInfo(
-            firstChildKeyElement,
-            firstChildKeyElement.textRange,
-            ShireIcons.PsiExpr,
-            null,
-            null,
-            GutterIconRenderer.Alignment.LEFT
-        ) {
-            ""
+        if (element.functionStatement?.functionBody?.actionBody != null) {
+            val firstChildKeyElement = element.frontMatterKey!!.firstChild
+
+            return LineMarkerInfo(
+                firstChildKeyElement,
+                firstChildKeyElement.textRange,
+                ShireIcons.Pipeline,
+                null,
+                null,
+                GutterIconRenderer.Alignment.LEFT
+            ) {
+                ""
+            }
         }
+
+        return null
     }
 }
diff --git a/shirelang/src/main/resources/icons/shire-case.svg b/shirelang/src/main/resources/icons/shire-case.svg
diff --git a/shirelang/src/main/resources/icons/shire-pipeline.svg b/shirelang/src/main/resources/icons/shire-pipeline.svg