feat: Update version to 9.3.0, enhance multiple highlight grammars support, and update CHANGELOG and README

heckmon · heckmon · commit 6fae309ea0e3 · 2026-03-21T13:19:29.000+05:30
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -358,4 +358,8 @@ This release establishes **CodeForge** as a powerful, production-ready code edit
 
 ## 9.2.0
   - FEATURE: [#51](https://github.com/heckmon/code_forge/issues/51)
-  - FIX: [#53](https://github.com/heckmon/code_forge/issues/53)
+  - FIX: [#53](https://github.com/heckmon/code_forge/issues/53)
+
+## 9.3.0
+  - FIX: [#54](https://github.com/heckmon/code_forge/issues/54)
+  - FEATURE: Multiple highlight grammars for a single editor instance.
diff --git a/README.md b/README.md
@@ -38,9 +38,9 @@
 > code_forge does **not** support Flutter web, as it relies on `dart:io` for core functionality. Use [code_forge_web](https://pub.dev/packages/code_forge_web) for web support.
 
 
-### What's new in 9.2.0
-  - FEATURE: [#51](https://github.com/heckmon/code_forge/issues/51)
-  - FIX: [#53](https://github.com/heckmon/code_forge/issues/53)
+### What's new in 9.3.0
+  - FIX: [#54](https://github.com/heckmon/code_forge/issues/54)
+  - FEATURE: Multiple highlight grammars for a single editor instance.
 
 ## Why CodeForge?
 **Feature demos:** [CodeForge Features Showcase](https://heckmon.github.io/code_forge_demo/)
@@ -115,7 +115,7 @@ Add CodeForge to your `pubspec.yaml`:
 
 ```yaml
 dependencies:
-  code_forge: ^9.1.0
+  code_forge: ^9.3.0
 ```
 
 Then run:
@@ -467,6 +467,7 @@ CodeForge(
 | `enableGutterDivider` | `bool` | Show gutter divider |
 | `enableSuggestions` | `bool` | Enable autocomplete suggestions |
 | `enableKeyboardSuggestions` | `bool` | Show auto completions in OS virtual keyboard |
+| `extraLanguages` | `List<Mode>` | Useful for languages that embed other grammars (for example, TSX using XML/HTML sub-languages). |
 | `keyboardType` | `TextInputType` | Type of virtual keyboard |
 | `customCodeSnippets` | `List<CustomCodeSnippet>?` | Custom code snippets shown in the suggestion popup |
 | `deleteFoldRangeOnDeletingFirstLine` | `bool` | When true, deleting the first line of a folded block removes the entire block |
@@ -743,15 +744,6 @@ This project is licensed under the MIT License - see the [LICENSE](https://githu
 
 ---
 
-## In Memory
-This project is dedicated to my friend [@laraholand](https://github.com/laraholand) (Rafi Ahmed).
-
-For a month he opened issues, shared ideas, and helped improve this project almost every day.<br>
-His encouragement and enthusiasm meant a lot to me and this project.
-<br><br>
-Thank you for everything. Rest in peace brother🌹.
-<br>
-<br>
 <p align="center">
   <strong>Built with ❤️ for the Flutter community</strong>
 </p>
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -501,5 +501,5 @@ packages:
     source: hosted
     version: "1.1.0"
 sdks:
-  dart: ">=3.11.1 <4.0.0"
+  dart: ">=3.11.3 <4.0.0"
   flutter: ">=3.35.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -5,7 +5,7 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ^3.11.1
+  sdk: ^3.11.3
 
 dependencies:
   flutter:
diff --git a/lib/code_forge/code_area.dart b/lib/code_forge/code_area.dart
@@ -3,8 +3,6 @@ import 'dart:io';
 import 'dart:math';
 import 'dart:ui' as ui;
 
-import 'package:flutter/foundation.dart';
-
 import '../LSP/lsp.dart';
 import 'controller.dart';
 import 'find_controller.dart';
@@ -17,6 +15,7 @@ import 'package:re_highlight/re_highlight.dart';
 import 'package:re_highlight/styles/vs2015.dart';
 import 'package:re_highlight/languages/dart.dart';
 import 'package:markdown_widget/markdown_widget.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
@@ -80,6 +79,12 @@ class CodeForge extends StatefulWidget {
   /// by default if not specified.
   final Mode? language;
 
+  /// Additional language modes registered in the same highlighter instance.
+  ///
+  /// Useful for languages that embed other grammars (for example, TSX using
+  /// XML/HTML sub-languages).
+  final List<Mode> extraLanguages;
+
   /// The focus node for managing keyboard focus.
   ///
   /// If not provided, an internal focus node will be created.
@@ -233,6 +238,7 @@ class CodeForge extends StatefulWidget {
     this.undoController,
     this.editorTheme,
     this.language,
+    this.extraLanguages = const [],
     this.ghostTextStyle,
     this.filePath,
     this.initialText,
@@ -2211,6 +2217,8 @@ class _CodeForgeState extends State<CodeForge> with TickerProviderStateMixin {
                                                 controller: _controller,
                                                 editorTheme: _editorTheme,
                                                 language: _language,
+                                                extraLanguages:
+                                                    widget.extraLanguages,
                                                 languageId: _controller
                                                     .lspConfig
                                                     ?.languageId,
@@ -3671,6 +3679,7 @@ class _CodeField extends LeafRenderObjectWidget {
   final CodeForgeController controller;
   final Map<String, TextStyle> editorTheme;
   final Mode language;
+  final List<Mode> extraLanguages;
   final String? languageId;
   final LspConfig? lspConfig;
   final List<LspSemanticToken>? semanticTokens;
@@ -3705,6 +3714,7 @@ class _CodeField extends LeafRenderObjectWidget {
     required this.controller,
     required this.editorTheme,
     required this.language,
+    required this.extraLanguages,
     required this.vscrollController,
     required this.hscrollController,
     required this.focusNode,
@@ -3753,6 +3763,7 @@ class _CodeField extends LeafRenderObjectWidget {
       controller: controller,
       editorTheme: editorTheme,
       language: language,
+      extraLanguages: extraLanguages,
       languageId: languageId,
       lspConfig: lspConfig,
       innerPadding: innerPadding,
@@ -3809,6 +3820,7 @@ class _CodeField extends LeafRenderObjectWidget {
       ..updateDiagnostics(diagnostics)
       ..editorTheme = editorTheme
       ..language = language
+      ..extraLanguages = extraLanguages
       ..textStyle = textStyle
       ..innerPadding = innerPadding
       ..readOnly = readOnly
@@ -3881,6 +3893,7 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
   TextStyle? _ghostTextStyle;
   Map<String, TextStyle> _editorTheme;
   Mode _language;
+  List<Mode> _extraLanguages;
   EdgeInsets? _innerPadding;
   double _rightPaddingWidth = 0, _bottomPaddingHeight = 0;
   TextStyle? _textStyle;
@@ -4188,6 +4201,7 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
     required bool lineWrap,
     required Map<String, TextStyle> editorTheme,
     required Mode language,
+    required List<Mode> extraLanguages,
     required bool readOnly,
     required bool enableFolding,
     required bool enableGuideLines,
@@ -4208,6 +4222,7 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
   }) : _editorTheme = editorTheme,
        _ghostTextStyle = ghostTextStyle,
        _language = language,
+       _extraLanguages = extraLanguages,
        _readOnly = readOnly,
        _enableFolding = enableFolding,
        _enableGuideLines = enableGuideLines,
@@ -4231,6 +4246,7 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
 
     _syntaxHighlighter = SyntaxHighlighter(
       language: _language,
+      extraLanguages: _extraLanguages,
       editorTheme: _editorTheme,
       baseTextStyle: _textStyle,
       languageId: languageId,
@@ -4464,8 +4480,10 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
     }
     _syntaxHighlighter = SyntaxHighlighter(
       language: language,
+      extraLanguages: _extraLanguages,
       editorTheme: theme,
       baseTextStyle: textStyle,
+      languageId: languageId,
     );
     _paragraphCache.clear();
     _bracketCache.clear();
@@ -4481,8 +4499,10 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
     } catch (_) {}
     _syntaxHighlighter = SyntaxHighlighter(
       language: lang,
+      extraLanguages: _extraLanguages,
       editorTheme: editorTheme,
       baseTextStyle: textStyle,
+      languageId: languageId,
     );
     _paragraphCache.clear();
     _bracketCache.clear();
@@ -4504,8 +4524,10 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
     } catch (_) {}
     _syntaxHighlighter = SyntaxHighlighter(
       language: language,
+      extraLanguages: _extraLanguages,
       editorTheme: editorTheme,
       baseTextStyle: style,
+      languageId: languageId,
     );
 
     _paragraphCache.clear();
@@ -4534,6 +4556,25 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
     markNeedsPaint();
   }
 
+  set extraLanguages(List<Mode> value) {
+    if (listEquals(value, _extraLanguages)) return;
+    _extraLanguages = value;
+    try {
+      _syntaxHighlighter.dispose();
+    } catch (_) {}
+    _syntaxHighlighter = SyntaxHighlighter(
+      language: language,
+      extraLanguages: _extraLanguages,
+      editorTheme: editorTheme,
+      baseTextStyle: textStyle,
+      languageId: languageId,
+    );
+    _paragraphCache.clear();
+    _bracketCache.clear();
+    markNeedsLayout();
+    markNeedsPaint();
+  }
+
   set readOnly(bool value) {
     if (_readOnly == value) return;
     _readOnly = value;
@@ -4852,6 +4893,13 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
 
     final newText = controller.text;
     final previousText = _lastProcessedText ?? newText;
+    final textChanged = newText != previousText;
+
+    if (textChanged) {
+      _indentGuideCache.clear();
+      _indentEndLineCache.clear();
+      _lineIndentCache.clear();
+    }
 
     final dirtyRange = controller.dirtyRegion;
     if (dirtyRange != null) {
@@ -5483,7 +5531,9 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
 
   String? _extractOpeningTagName(String lineText) {
     final trimmed = lineText.trimRight();
-    final openTagMatch = RegExp(r'<(\w+)(?:\s[^>]*)?>$').firstMatch(trimmed);
+    final openTagMatch = RegExp(
+      r'<([A-Za-z][A-Za-z0-9:_-]*)(?:\s[^>]*)?>$',
+    ).firstMatch(trimmed);
     if (openTagMatch != null) {
       final tagName = openTagMatch.group(1);
       if (!trimmed.endsWith('/>') && !trimmed.endsWith('-->')) {
@@ -7482,6 +7532,12 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
     void processLine(int i) {
       if (hasActiveFolds && _isLineFolded(i)) return;
 
+      final cachedBlocks = _indentGuideCache[i];
+      if (cachedBlocks != null) {
+        blocks.addAll(cachedBlocks);
+        return;
+      }
+
       String lineText;
       if (_lineTextCache.containsKey(i)) {
         lineText = _lineTextCache[i]!;
@@ -7498,15 +7554,21 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
           trimmed.endsWith(':');
 
       final openingTagName = _extractOpeningTagName(lineText);
+      final normalizedLangId = languageId?.toLowerCase() ?? '';
       final isTagBasedLanguage =
           _language.name == 'html' ||
           _language.name == 'xml' ||
           (_language.aliases?.contains('html') ?? false) ||
           (_language.aliases?.contains('xml') ?? false) ||
+          (_language.aliases?.contains('tsx') ?? false) ||
+          (_language.aliases?.contains('jsx') ?? false) ||
           (languageId?.contains('html') ?? false) ||
-          (languageId?.contains('xml') ?? false);
+          (languageId?.contains('xml') ?? false) ||
+          normalizedLangId.contains('tsx') ||
+          normalizedLangId.contains('jsx');
 
       if (!endsWithBracket && (!isTagBasedLanguage || openingTagName == null)) {
+        _indentGuideCache[i] = const [];
         return;
       }
 
@@ -7531,19 +7593,25 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
           endLine = _findIndentBasedEndLine(i, leadingSpaces, hasActiveFolds);
         }
       } else if (openingTagName != null && isTagBasedLanguage) {
-        final matchLine = _findMatchingClosingTagLine(openingTagName, i);
-        if (matchLine != null) {
-          endLine = matchLine + 1;
+        final lspFold = controller.lspFoldRanges?[i];
+        if (lspFold != null && lspFold.endIndex > i) {
+          endLine = lspFold.endIndex + 1;
         } else {
-          endLine = _findIndentBasedEndLine(i, leadingSpaces, hasActiveFolds);
+          final matchLine = _findMatchingClosingTagLine(openingTagName, i);
+          if (matchLine != null) {
+            endLine = matchLine + 1;
+          } else {
+            endLine = _findIndentBasedEndLine(i, leadingSpaces, hasActiveFolds);
+          }
         }
       } else {
         endLine = _findIndentBasedEndLine(i, leadingSpaces, hasActiveFolds);
       }
 
-      if (endLine <= i + 1) return;
-
-      if (endLine < firstVisibleLine) return;
+      if (endLine <= i + 1) {
+        _indentGuideCache[i] = const [];
+        return;
+      }
 
       double guideX = 0;
       if (leadingSpaces > 0) {
@@ -7585,14 +7653,22 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
         }
       }
 
-      if (wouldPassThroughText) return;
+      if (wouldPassThroughText) {
+        _indentGuideCache[i] = const [];
+        return;
+      }
 
-      blocks.add((
+      final block = (
         startLine: i,
         endLine: endLine,
         indentLevel: indentLevel,
         guideX: guideX,
-      ));
+      );
+
+      _indentGuideCache[i] = [block];
+      if (endLine >= firstVisibleLine) {
+        blocks.add(block);
+      }
     }
 
     final scanBackLimit = 500;
diff --git a/lib/code_forge/controller.dart b/lib/code_forge/controller.dart
@@ -3523,11 +3523,11 @@ class CodeForgeController implements DeltaTextInputClient {
       case 26:
         return 'typeParameter';
       case 252:
-        return 'type'; // Type alias
+        return 'type';
       case 253:
         return 'parameter';
       case 254:
-        return 'variable'; // StaticMethod
+        return 'variable';
       case 255:
         return 'macro';
       default:
diff --git a/lib/code_forge/syntax_highlighter.dart b/lib/code_forge/syntax_highlighter.dart
diff --git a/pubspec.yaml b/pubspec.yaml
