Using CodeFenceLanguageGuesser + TextMate

Author: DanielSouzaBertoldi

platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/code/MimeType.kt

@@ -232,44 +232,6 @@ public value class MimeType(private val mimeType: String) {
         }
     }
 
-    private fun normalizeString(): String {
-        val normalizedBase = getBaseMimeType()
-
-        val attributes =
-            mimeType
-                .split(';')
-                .asSequence()
-                .drop(1)
-                .sorted()
-                .mapNotNull {
-                    val index = it.indexOf('=')
-                    if (index != -1) {
-                        it.substring(0, index).trim() to it.substring(index + 1).trim()
-                    } else {
-                        null
-                    }
-                }
-                .filter { isRelevantAttribute(it.first) }
-                .map { "${it.first}=${it.second}" }
-                .joinToString("; ")
-
-        return if (attributes.isNotBlank()) {
-            "$normalizedBase; $attributes"
-        } else {
-            normalizedBase
-        }
-    }
-
-    /** Returns whether the given attribute should be included in a normalized string */
-    private fun isRelevantAttribute(attribute: String): Boolean =
-        when (attribute) {
-            ATTR_ROLE,
-            ATTR_ROOT_TAG,
-            ATTR_FOLDER_TYPE -> true
-
-            else -> false
-        }
-
     /**
      * Returns just the language portion of the mime type.
      *
@@ -280,8 +242,6 @@ public value class MimeType(private val mimeType: String) {
 
     internal fun getRole(): String? = getAttribute(ATTR_ROLE)
 
-    private fun getFolderType(): String? = getAttribute(ATTR_FOLDER_TYPE)
-
     private fun getAttribute(name: String): String? {
         val marker = "$name="
         var start = mimeType.indexOf(marker)

platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/code/highlighting/CodeHighlighter.kt

@@ -6,6 +6,7 @@ import androidx.compose.ui.text.AnnotatedString
 import kotlinx.coroutines.flow.Flow
 import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.jewel.foundation.ExperimentalJewelApi
+import org.jetbrains.jewel.foundation.code.MimeType
 
 @ApiStatus.Experimental
 @ExperimentalJewelApi
@@ -25,7 +26,40 @@ public interface CodeHighlighter {
      *
      * @see [NoOpCodeHighlighter]
      */
-    public fun highlight(code: String, langName: String?): Flow<AnnotatedString>
+    @ApiStatus.Obsolete
+    @Deprecated(
+        message =
+            "This method is not scalable as it relies on a pre-resolved MimeType object. " +
+                "This prevents automatic support for languages not explicitly defined in the MimeType system" +
+                "(e.g., from TextMate bundles). Use the overload that accepts the raw " +
+                "`languageFileExtension` string instead.",
+        replaceWith = ReplaceWith("highlight(code, languageFileExtension = \"\")"),
+    )
+    public fun highlight(code: String, mimeType: MimeType?): Flow<AnnotatedString>
+
+    /**
+     * Highlights the given `code` string based on the provided `languageFileExtension`.
+     *
+     * This function is highly dynamic. It first attempts to find a native IntelliJ Platform plugin that supports the
+     * given language extension. If no native plugin is found, it gracefully falls back to using any enabled TextMate
+     * bundles that match the extension. This allows it to automatically support a wide range of languages without prior
+     * configuration.
+     *
+     * The result is returned as a [Flow] to support dynamic updates, such as when the user changes the active IDE color
+     * scheme. For simple, static highlighting, you can simply collect the first emitted value.
+     *
+     * If the `languageFileExtension` is null or does not correspond to any known language or active TextMate bundle,
+     * the code will be emitted as a plain, un-styled `AnnotatedString`.
+     *
+     * @param code The source code to be highlighted.
+     * @param languageFileExtension The file extension or Markdown info string identifying the programming language
+     *   (e.g., "kt", "py", "js", "bat"). This is case-insensitive. Common aliases (like "js" for "javascript") are
+     *   supported if there is a native IntelliJ Platform plugin installed that supports the language extension.
+     * @return A [Flow] that emits an `AnnotatedString` with syntax highlighting applied. The flow may emit new values
+     *   if the underlying color scheme changes.
+     * @see [NoOpCodeHighlighter]
+     */
+    public fun highlight(code: String, languageFileExtension: String = ""): Flow<AnnotatedString>
 }
 
 public val LocalCodeHighlighter: ProvidableCompositionLocal<CodeHighlighter> = staticCompositionLocalOf {

platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/code/highlighting/NoOpCodeHighlighter.kt

@@ -3,7 +3,19 @@ package org.jetbrains.jewel.foundation.code.highlighting
 import androidx.compose.ui.text.AnnotatedString
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
+import org.jetbrains.jewel.foundation.code.MimeType
 
 public object NoOpCodeHighlighter : CodeHighlighter {
-    override fun highlight(code: String, langName: String?): Flow<AnnotatedString> = flowOf(AnnotatedString(code))
+    @Deprecated(
+        message =
+            "This method is not scalable as it relies on a pre-resolved MimeType object. " +
+                "This prevents automatic support for languages not explicitly defined in the MimeType system" +
+                "(e.g., from TextMate bundles). Use the overload that accepts the raw " +
+                "`languageFileExtension` string instead.",
+        replaceWith = ReplaceWith("highlight(code, languageFileExtension = \"\")"),
+    )
+    override fun highlight(code: String, mimeType: MimeType?): Flow<AnnotatedString> = flowOf(AnnotatedString(code))
+
+    override fun highlight(code: String, languageFileExtension: String): Flow<AnnotatedString> =
+        flowOf(AnnotatedString(code))
 }

platform/jewel/foundation/src/test/kotlin/org/jetbrains/jewel/foundation/code/MimeTypeTest.kt

@@ -14,9 +14,7 @@
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.2.0/kotlin-compose-compiler-plugin-2.2.0.jar</arg>
-              </args>
+              <args>$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compose-compiler-plugin/2.2.0/kotlin-compose-compiler-plugin-2.2.0.jar</args>
             </arrayArg>
           </arrayArguments>
         </compilerArguments>
@@ -29,6 +27,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/ide-laf-bridge-tests/src/test/kotlin" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
@@ -49,5 +48,10 @@
     <orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop.junit" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.markdown" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.textmate" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="io.mockk.jvm" level="project" />
   </component>
 </module>