Enhance ImageVector gutter functionality and parsing logic

Author: egorikftp

sdk/intellij/psi/imagevector/api/imagevector.api

@@ -2,5 +2,6 @@ public final class io/github/composegears/valkyrie/sdk/intellij/psi/imagevector/
 	public static final field $stable I
 	public static final field INSTANCE Lio/github/composegears/valkyrie/sdk/intellij/psi/imagevector/ImageVectorPsiParser;
 	public final fun parseToIrImageVector (Lorg/jetbrains/kotlin/psi/KtFile;)Lio/github/composegears/valkyrie/sdk/ir/core/IrImageVector;
+	public final fun parseToIrImageVector (Lorg/jetbrains/kotlin/psi/KtProperty;)Lio/github/composegears/valkyrie/sdk/ir/core/IrImageVector;
 }
 

sdk/intellij/psi/imagevector/src/main/kotlin/io/github/composegears/valkyrie/sdk/intellij/psi/imagevector/ImageVectorPsiParser.kt

@@ -5,6 +5,7 @@ import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.parser.Regul
 import io.github.composegears.valkyrie.sdk.ir.core.IrImageVector
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtImportList
+import org.jetbrains.kotlin.psi.KtProperty
 
 object ImageVectorPsiParser {
 
@@ -17,6 +18,16 @@ object ImageVectorPsiParser {
         }
     }
 
+    fun parseToIrImageVector(ktProperty: KtProperty): IrImageVector? {
+        val ktFile = ktProperty.containingKtFile
+        val isMaterial = ktFile.importList?.isMaterial() ?: return null
+
+        return when {
+            isMaterial -> MaterialImageVectorPsiParser.parse(ktProperty)
+            else -> RegularImageVectorPsiParser.parse(ktProperty)
+        }
+    }
+
     private fun KtImportList.isMaterial(): Boolean {
         return imports.any {
             val fqName = it.importedFqName

sdk/intellij/psi/imagevector/src/main/kotlin/io/github/composegears/valkyrie/sdk/intellij/psi/imagevector/parser/MaterialImageVectorPsiParser.kt

@@ -31,7 +31,15 @@ internal object MaterialImageVectorPsiParser {
             .firstOrNull { it.typeReference?.text == "ImageVector" }
             ?: return null
 
-        val blockBody = property.getter?.bodyBlockExpression ?: return null
+        return property.parseImageVector()
+    }
+
+    fun parse(ktProperty: KtProperty): IrImageVector? {
+        return ktProperty.parseImageVector()
+    }
+
+    internal fun KtProperty.parseImageVector(): IrImageVector? {
+        val blockBody = getter?.bodyBlockExpression ?: return null
 
         val materialIconCall = blockBody.materialIconCall()
 
@@ -50,7 +58,7 @@ internal object MaterialImageVectorPsiParser {
         val builder = blockBody.builderExpression() ?: return null
 
         return IrImageVector(
-            name = builder.name().ifEmpty { property.name.orEmpty() },
+            name = builder.name().ifEmpty { name.orEmpty() },
             defaultWidth = builder.defaultWidth(24f),
             defaultHeight = builder.defaultHeight(24f),
             viewportWidth = builder.viewportWidth(24f),

sdk/intellij/psi/imagevector/src/main/kotlin/io/github/composegears/valkyrie/sdk/intellij/psi/imagevector/parser/RegularImageVectorPsiParser.kt

@@ -32,14 +32,22 @@ internal object RegularImageVectorPsiParser {
             .firstOrNull { it.typeReference?.text == "ImageVector" }
             ?: return null
 
-        val blockBody = property.getter?.bodyBlockExpression
-            ?: property.delegateExpression?.childrenOfType<KtBlockExpression>()?.firstOrNull()
+        return property.parseImageVector()
+    }
+
+    fun parse(ktProperty: KtProperty): IrImageVector? {
+        return ktProperty.parseImageVector()
+    }
+
+    internal fun KtProperty.parseImageVector(): IrImageVector? {
+        val blockBody = getter?.bodyBlockExpression
+            ?: delegateExpression?.childrenOfType<KtBlockExpression>()?.firstOrNull()
             ?: return null
 
         val builder = blockBody.builderExpression() ?: return null
 
         return IrImageVector(
-            name = builder.name().ifEmpty { property.name.orEmpty() },
+            name = builder.name().ifEmpty { name.orEmpty() },
             defaultWidth = builder.defaultWidth(0f),
             defaultHeight = builder.defaultHeight(0f),
             viewportWidth = builder.viewportWidth(0f),

tools/idea-plugin/CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Added
 
 - Add export as file action for `Simple mode` and `ImageVector to XML` tool
+- [Gutter] Add support for multiple icons in kt file
 
 ### Fixed
 

tools/idea-plugin/build.gradle.kts

@@ -95,12 +95,6 @@ dependencies {
     }
 }
 
-configurations {
-    testImplementation {
-        exclude(group = "org.jetbrains.kotlinx")
-    }
-}
-
 compose.resources {
     generateResClass = never
 }

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/completion/ImageVectorIcon.kt

@@ -85,6 +85,10 @@ class ImageVectorIcon(
     override fun getIconWidth(): Int = size
     override fun getIconHeight(): Int = size
 
+    override fun toString(): String {
+        return "ImageVectorIcon(size=$size, aspectRatio=$aspectRatio, dominantShade=$dominantShade, vectorXml=${vectorXml.take(100)})"
+    }
+
     companion object {
         private const val ICON_SCALE_FACTOR = 4
 

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/icon/ImageVectorIconProvider.kt

@@ -6,29 +6,36 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import io.github.composegears.valkyrie.service.PersistentSettings.Companion.persistentSettings
 import io.github.composegears.valkyrie.util.getOrCreateCachedIcon
+import io.github.composegears.valkyrie.util.getOrCreateGutterIcon
 import io.github.composegears.valkyrie.util.hasImageVectorProperties
+import io.github.composegears.valkyrie.util.isImageVector
 import javax.swing.Icon
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtProperty
 
 class ImageVectorIconProvider :
     IconProvider(),
     DumbAware {
 
     override fun getIcon(element: PsiElement, flags: Int): Icon? {
+        val project = element.project
+        if (project.isDisposed) return null
+
+        if (!project.persistentSettings.state.showIconsInProjectView) return null
+
+        if (element is KtProperty && element.isImageVector()) {
+            return element.getOrCreateGutterIcon()
+        }
+
         val ktFile = when (element) {
             is KtFile -> element
             is PsiFile -> null
             else -> element.containingFile as? KtFile
         } ?: return null
 
-        val project = element.project
-        if (project.isDisposed) return null
-        val showIconsInProjectView = project.persistentSettings.state.showIconsInProjectView
-
-        if (!showIconsInProjectView || !ktFile.hasImageVectorProperties()) {
-            return null
+        return when {
+            ktFile.hasImageVectorProperties() -> ktFile.getOrCreateCachedIcon()
+            else -> null
         }
-
-        return ktFile.getOrCreateCachedIcon()
     }
 }

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/util/ImageVectorPsiUtil.kt

@@ -79,18 +79,14 @@ private fun IrImageVector.toIcon(): Icon = ImageVectorIcon(
 )
 
 private fun parseImageVectorProperty(property: KtProperty): IrImageVector? {
-    // Try parsing the current file
-    val containingFile = property.containingKtFile
-    ImageVectorPsiParser.parseToIrImageVector(containingFile)?.let { return it }
+    ImageVectorPsiParser.parseToIrImageVector(property)?.let { return it }
 
     // For properties from libraries, navigate to decompiled/attached source
-    val navigationElement = property.navigationElement
-    if (navigationElement is KtProperty && navigationElement != property) {
-        val sourceFile = navigationElement.containingKtFile
-
+    val psiElement = property.navigationElement
+    if (psiElement is KtProperty && psiElement != property) {
         // Only parse if we have actual source code (not a stub)
-        if (COMPILED_CODE_MARKER !in sourceFile.text) {
-            return ImageVectorPsiParser.parseToIrImageVector(sourceFile)
+        if (COMPILED_CODE_MARKER !in psiElement.text) {
+            return ImageVectorPsiParser.parseToIrImageVector(psiElement)
         }
     }