Use IDEA code highlighting functionality

egorikftp · egorikftp · commit 701426ec41ea · 2026-03-02T12:58:40.000+03:00
diff --git a/tools/idea-plugin/CHANGELOG.md b/tools/idea-plugin/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Changed
+
+- Migrate to IDEA code highlighting for tooltip snippets
+
 ## 1.3.0 - 2026-02-28
 
 ### Added
diff --git a/tools/idea-plugin/build.gradle.kts b/tools/idea-plugin/build.gradle.kts
@@ -45,7 +45,6 @@ dependencies {
     implementation(projects.components.parser.jvm.svg)
     implementation(projects.components.parser.unified)
     implementation(projects.sdk.compose.foundation)
-    implementation(projects.sdk.compose.highlightsCore)
     implementation(projects.sdk.compose.icons)
     implementation(projects.sdk.core.extensions)
     implementation(projects.sdk.intellij.psi.iconpack)
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/jewel/EditorText.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/jewel/EditorText.kt
@@ -0,0 +1,29 @@
+package io.github.composegears.valkyrie.jewel
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import io.github.composegears.valkyrie.jewel.highlight.HighlightedCode
+import io.github.composegears.valkyrie.jewel.tooling.PreviewTheme
+import org.jetbrains.compose.ui.tooling.preview.Preview
+import org.jetbrains.jewel.foundation.theme.JewelTheme
+import org.jetbrains.jewel.ui.component.Text
+import org.jetbrains.jewel.ui.typography
+
+@Composable
+fun EditorText(
+    code: HighlightedCode,
+    modifier: Modifier = Modifier,
+) {
+    Text(
+        modifier = modifier,
+        text = code.value,
+        style = JewelTheme.typography.editorTextStyle,
+    )
+}
+
+@Preview
+@Composable
+private fun EditorTextPreview() = PreviewTheme(alignment = Alignment.Center) {
+    Text(text = "editor text style")
+}
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/jewel/highlight/CodeHighlight.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/jewel/highlight/CodeHighlight.kt
@@ -0,0 +1,123 @@
+package io.github.composegears.valkyrie.jewel.highlight
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.style.TextDecoration
+import io.github.composegears.valkyrie.jewel.EditorText
+import io.github.composegears.valkyrie.jewel.platform.LocalProject
+import io.github.composegears.valkyrie.jewel.tooling.ProjectPreviewTheme
+import io.github.composegears.valkyrie.jewel.tooling.debugBounds
+import kotlinx.coroutines.flow.map
+import org.jetbrains.compose.ui.tooling.preview.Preview
+import org.jetbrains.jewel.bridge.code.highlighting.CodeHighlighterFactory
+import org.jetbrains.jewel.foundation.ExperimentalJewelApi
+import org.jetbrains.jewel.foundation.code.MimeType
+import org.jetbrains.jewel.foundation.theme.JewelTheme
+
+@OptIn(ExperimentalJewelApi::class)
+@Composable
+fun rememberCodeHighlight(
+    text: String,
+    mimeType: MimeType = MimeType.Known.KOTLIN,
+    style: UnderlineDsl.() -> Unit = {},
+): HighlightedCode {
+    val dsl = UnderlineDsl(text).apply(style)
+
+    val project = LocalProject.current
+    val underlineColor = JewelTheme.globalColors.outlines.warning
+    val codeHighlighter = remember { CodeHighlighterFactory.getInstance(project).createHighlighter() }
+
+    val highlightedCode by codeHighlighter
+        .highlight(code = text, mimeType = mimeType)
+        .map {
+            if (dsl.ranges.isNotEmpty()) {
+                buildAnnotatedString {
+                    append(it)
+                    dsl.ranges.forEach { range ->
+                        addStyle(
+                            style = SpanStyle(
+                                background = underlineColor,
+                                textDecoration = TextDecoration.Underline,
+                            ),
+                            start = range.first,
+                            end = range.last + 1,
+                        )
+                    }
+                }
+            } else {
+                it
+            }
+        }
+        .collectAsState(AnnotatedString(text))
+
+    return HighlightedCode(highlightedCode)
+}
+
+@JvmInline
+value class HighlightedCode(val value: AnnotatedString)
+
+@DslMarker
+annotation class UnderlineDslMarker
+
+@UnderlineDslMarker
+class UnderlineDsl internal constructor(
+    private val text: String,
+) {
+
+    internal val ranges = mutableListOf<IntRange>()
+
+    fun underline(range: IntRange) {
+        require(range.first >= 0) { "Range start < 0" }
+        require(range.last < text.length) { "Range out of bounds" }
+        require(range.first <= range.last) { "Invalid range" }
+
+        ranges += range
+    }
+
+    fun underline(highlightText: String) {
+        require(highlightText.isNotEmpty())
+
+        var index = 0
+        while (true) {
+            index = text.indexOf(highlightText, startIndex = index)
+            if (index == -1) break
+
+            ranges += index..<index + highlightText.length
+            index += highlightText.length
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun KtCodeViewerPreview() = ProjectPreviewTheme(alignment = Alignment.Center) {
+    val highlightedCode = rememberCodeHighlight(
+        text = """
+         package io.github.composegears.valkyrie
+ 
+         val Pack.MyIcon: ImageVector
+             get() {
+                 if (_MyIcon != null) {
+                 return _MyIcon!!
+             }
+             ...
+         }
+        """.trimIndent(),
+        style = {
+            underline(8..38)
+            underline(highlightText = "_MyIcon")
+        },
+    )
+
+    EditorText(
+        code = highlightedCode,
+        modifier = Modifier.debugBounds(),
+    )
+}
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/jewel/highlight/CodeTooltip.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/jewel/highlight/CodeTooltip.kt
@@ -2,35 +2,34 @@ package io.github.composegears.valkyrie.jewel.highlight
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.runtime.Composable
-import dev.snipme.highlights.Highlights
-import io.github.composegears.valkyrie.jewel.tooling.PreviewTheme
-import io.github.composegears.valkyrie.sdk.compose.highlights.core.rememberCodeHighlight
+import androidx.compose.ui.Alignment
+import io.github.composegears.valkyrie.jewel.EditorText
+import io.github.composegears.valkyrie.jewel.tooling.ProjectPreviewTheme
 import io.github.composegears.valkyrie.util.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
-import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.component.Icon
 import org.jetbrains.jewel.ui.component.Tooltip
 import org.jetbrains.jewel.ui.icons.AllIconsKeys
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun CodeTooltip(
-    highlights: Highlights,
+    code: HighlightedCode,
     content: @Composable () -> Unit,
 ) {
     Tooltip(
         tooltip = {
-            KtCodeViewer(highlights = highlights)
+            EditorText(code = code)
         },
         content = content,
     )
 }
 
 @Preview
 @Composable
-private fun CodeTooltipPreview() = PreviewTheme {
+private fun CodeTooltipPreview() = ProjectPreviewTheme(alignment = Alignment.Center) {
     CodeTooltip(
-        highlights = rememberCodeHighlight(codeBlock = "", isDark = JewelTheme.isDark),
+        code = rememberCodeHighlight(text = "val t: Int = 0"),
         content = {
             Icon(
                 key = AllIconsKeys.General.ContextHelp,
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/jewel/highlight/KtCodeViewer.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/jewel/highlight/KtCodeViewer.kt
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/common/CodeTooltipHeader.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/common/CodeTooltipHeader.kt
@@ -5,31 +5,29 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import dev.snipme.highlights.Highlights
 import io.github.composegears.valkyrie.jewel.highlight.CodeTooltip
-import io.github.composegears.valkyrie.jewel.tooling.PreviewTheme
+import io.github.composegears.valkyrie.jewel.highlight.HighlightedCode
+import io.github.composegears.valkyrie.jewel.highlight.rememberCodeHighlight
+import io.github.composegears.valkyrie.jewel.tooling.ProjectPreviewTheme
 import io.github.composegears.valkyrie.sdk.compose.foundation.layout.CenterVerticalRow
 import io.github.composegears.valkyrie.sdk.compose.foundation.layout.Spacer
-import io.github.composegears.valkyrie.sdk.compose.highlights.core.getEmphasisLocations
-import io.github.composegears.valkyrie.sdk.compose.highlights.core.rememberCodeHighlight
 import io.github.composegears.valkyrie.util.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
-import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.component.Icon
 import org.jetbrains.jewel.ui.component.Text
 import org.jetbrains.jewel.ui.icons.AllIconsKeys
 
 @Composable
 fun CodeTooltipHeader(
     text: String,
-    highlights: Highlights,
+    code: HighlightedCode,
     modifier: Modifier = Modifier,
 ) {
     CenterVerticalRow(modifier = modifier) {
         Text(text)
         Spacer(8.dp)
         CodeTooltip(
-            highlights = highlights,
+            code = code,
             content = {
                 Icon(
                     key = AllIconsKeys.General.ContextHelp,
@@ -44,7 +42,7 @@ fun CodeTooltipHeader(
 fun buildPackPackageHighlight(
     packageName: String,
     iconPackName: String,
-): Highlights {
+): HighlightedCode {
     val packagePlaceholder = packageName.ifEmpty { "com.test.iconpack" }
     val iconPackPlaceholder = iconPackName.ifEmpty { "YourPackName" }
 
@@ -61,17 +59,15 @@ fun buildPackPackageHighlight(
     """.trimIndent()
 
     return rememberCodeHighlight(
-        codeBlock = codeBlock,
-        emphasisLocation = getEmphasisLocations(
-            codeBlock = codeBlock,
-            highlightText = packagePlaceholder,
-        ),
-        isDark = JewelTheme.isDark,
+        text = codeBlock,
+        style = {
+            underline(packagePlaceholder)
+        },
     )
 }
 
 @Composable
-fun buildIconPackHighlight(iconPackName: String): Highlights {
+fun buildIconPackHighlight(iconPackName: String): HighlightedCode {
     val iconPackPlaceholder = iconPackName.ifEmpty { "YourPackName" }
     val codeBlock = """
         object $iconPackPlaceholder
@@ -86,30 +82,28 @@ fun buildIconPackHighlight(iconPackName: String): Highlights {
     """.trimIndent()
 
     return rememberCodeHighlight(
-        codeBlock = codeBlock,
-        emphasisLocation = getEmphasisLocations(
-            codeBlock = codeBlock,
-            highlightText = iconPackPlaceholder,
-        ),
-        isDark = JewelTheme.isDark,
+        text = codeBlock,
+        style = {
+            underline(iconPackPlaceholder)
+        },
     )
 }
 
 @Preview
 @Composable
-private fun CodeTooltipHeaderPreview() = PreviewTheme(alignment = Alignment.Center) {
+private fun CodeTooltipHeaderPreview() = ProjectPreviewTheme(alignment = Alignment.Center) {
     Row {
         CodeTooltipHeader(
             text = "Package",
-            highlights = buildPackPackageHighlight(
+            code = buildPackPackageHighlight(
                 packageName = "com.example.iconpack",
                 iconPackName = "MyIconPack",
             ),
         )
         Spacer(16.dp)
         CodeTooltipHeader(
             text = "IconPack",
-            highlights = buildIconPackHighlight(
+            code = buildIconPackHighlight(
                 iconPackName = "MyIconPack",
             ),
         )
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/common/IconPackEditor.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/common/IconPackEditor.kt
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/settings/tabs/generator/GeneratorSettingsScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/settings/tabs/generator/GeneratorSettingsScreen.kt
