Bump version to 9.9.0 and fix caret layout sync

Author: heckmon

CHANGELOG.md

@@ -381,4 +381,8 @@ This release establishes **CodeForge** as a powerful, production-ready code edit
   - Enhanced large text handling.
 
 ## 9.8.0
-  - - FIX: LSP initialization bug.
+  -  FIX: LSP initialization bug.
+
+## 9.9.0
+  - FIX: Cursor jump on typing.
+  - FIX: Frozen horizontal scroll on dynamic font size.

README.md

@@ -45,8 +45,9 @@
 This will make the code_forge lightning fast like the [zed editor](https://zed.dev/).**
 
 
-### What's new in 9.8.0
-  - FIX: LSP initialization bug.
+### What's new in 9.9.0
+  - FIX: Cursor jump on typing.
+  - FIX: Frozen horizontal scroll on dynamic font size.
 
 
 
@@ -122,7 +123,7 @@ Add CodeForge to your `pubspec.yaml`:
 
 ```yaml
 dependencies:
-  code_forge: ^9.8.0
+  code_forge: ^9.9.0
 ```
 
 Then run:
@@ -733,15 +734,9 @@ CodeForge supports a variety of keyboard shortcuts for efficient editing:
 
 ---
 
-## Contributing
+## Used by
 
-Contributions are welcome! Whether it's bug fixes, new features, or documentation improvements.
-
-1. Fork the repository
-2. Create your feature branch (`git checkout -b feature/amazing-feature`)
-3. Commit your changes (`git commit -m 'Add amazing feature'`)
-4. Push to the branch (`git push origin feature/amazing-feature`)
-5. Open a Pull Request
+ - [ROXUM IDE](https://github.com/heckmon/roxum-ide) - A minimal and powerful IDE/Code editor for Android.
 
 ---
 

example/pubspec.lock

@@ -47,7 +47,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "9.5.0"
+    version: "9.8.0"
   collection:
     dependency: transitive
     description:

lib/LSP/lsp.dart

@@ -239,7 +239,6 @@ sealed class LspConfig {
   ///
   /// This method is used internally by the [CodeForge] widget and calling it directly is not recommended.
   ///
-  /// If [initialContent] is provided, it will be used as the document content.
   /// Otherwise, the content will be read from [filePath].
   Future<void> openDocument(String filePath) async {
     final version = (_openDocuments[filePath] ?? 0) + 1;

lib/code_forge/code_area.dart

@@ -3883,11 +3883,11 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
   late double _lineHeight;
   final _dtap = DoubleTapGestureRecognizer();
   final _onetap = TapGestureRecognizer();
-  late final double _gutterPadding;
+  late double _gutterPadding;
   late final Paint _caretPainter;
   late final Paint _bracketHighlightPainter;
   late ui.ParagraphStyle _paragraphStyle;
-  late final ui.TextStyle _uiTextStyle;
+  late ui.TextStyle _uiTextStyle;
   late SyntaxHighlighter _syntaxHighlighter;
   late double _gutterWidth;
   TextStyle? _ghostTextStyle;
@@ -3919,6 +3919,7 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
   bool _showBubble = false, _draggingCHandle = false, _readOnly;
   bool _isDeferringLayout = false, _hasCachedHeight = false;
   bool _isCachedHeightExact = false;
+  bool _caretSyncAfterLayoutScheduled = false;
   TextDirection _textDirection;
   Map<int, FoldRange>? _lastLspFoldRanges;
   Rect? _startHandleRect, _endHandleRect, _normalHandle;
@@ -4516,9 +4517,42 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
     _textStyle = style;
 
     final fontSize = style?.fontSize ?? 14.0;
+    final fontFamily = style?.fontFamily;
+    final color = style?.color ?? _editorTheme['root']?.color ?? Colors.black;
     final lineHeightMultiplier = style?.height ?? 1.2;
 
     _lineHeight = fontSize * lineHeightMultiplier;
+    _paragraphStyle = ui.ParagraphStyle(
+      fontFamily: fontFamily,
+      fontSize: fontSize,
+      height: lineHeightMultiplier,
+      textDirection: _textDirection,
+      textAlign: ui.TextAlign.start,
+    );
+    _uiTextStyle = ui.TextStyle(
+      color: color,
+      fontSize: fontSize,
+      fontFamily: fontFamily,
+    );
+
+    _gutterPadding = fontSize;
+    if (_enableGutter) {
+      if (_gutterStyle.gutterWidth != null) {
+        _gutterWidth = _gutterStyle.gutterWidth!;
+      } else {
+        final digits = controller.lineCount.toString().length;
+        final digitWidth = digits * _gutterPadding * 0.6;
+        final foldIconSpace = _enableFolding ? fontSize + 4 : 0;
+        _gutterWidth = digitWidth + foldIconSpace + _gutterPadding;
+      }
+    } else {
+      _gutterWidth = 0;
+    }
+
+    if (_selectionStyle.cursorColor == null) {
+      _caretPainter.color = color;
+    }
+    _bracketHighlightPainter.color = color;
 
     try {
       _syntaxHighlighter.dispose();
@@ -4543,6 +4577,10 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
     _lineOffsetCache.clear();
     _caretInfoCache.clear();
     _lineIndentCache.clear();
+    _longLineWidth = 0.0;
+    _cachedRtlContentWidth = 0.0;
+    _hasCachedHeight = false;
+    _isCachedHeightExact = false;
 
     markNeedsLayout();
     markNeedsPaint();
@@ -4703,8 +4741,19 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
     }
   }
 
-  void _deferLayout() {
+  void _deferLayout({required int lineDelta}) {
     _layoutDebounceTimer?.cancel();
+
+    // Apply layout immediately for small incremental edits (like pressing
+    // Enter) so caret position and gutter stay visually in sync.
+    if (lineDelta.abs() <= 4) {
+      _isDeferringLayout = false;
+      markNeedsLayout();
+      markNeedsPaint();
+      _scheduleCaretSyncAfterLayout();
+      return;
+    }
+
     _isDeferringLayout = true;
 
     if (_hasCachedHeight) {
@@ -4719,9 +4768,24 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
     }
     markNeedsPaint();
 
-    _layoutDebounceTimer = Timer(const Duration(milliseconds: 100), () {
+    _layoutDebounceTimer = Timer(const Duration(milliseconds: 24), () {
       _isDeferringLayout = false;
       markNeedsLayout();
+      _scheduleCaretSyncAfterLayout();
+    });
+  }
+
+  void _scheduleCaretSyncAfterLayout() {
+    if (_caretSyncAfterLayoutScheduled || _isFoldToggleInProgress) return;
+    _caretSyncAfterLayoutScheduled = true;
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _caretSyncAfterLayoutScheduled = false;
+      if (!attached) return;
+      if (!vscrollController.hasClients || !hscrollController.hasClients) {
+        return;
+      }
+      _ensureCaretVisible();
     });
   }
 
@@ -4901,6 +4965,8 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
       _indentGuideCache.clear();
       _indentEndLineCache.clear();
       _lineIndentCache.clear();
+      _caretInfoCache.clear();
+      _cachedCaretOffset = -1;
     }
 
     final dirtyRange = controller.dirtyRegion;
@@ -4952,6 +5018,9 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
           );
 
       _cachedLineCount = newLineCount;
+      _lineOffsetCache.clear();
+      _caretInfoCache.clear();
+      _cachedCaretOffset = -1;
 
       final startInvalidation = insertionLine > 0 ? insertionLine - 1 : 0;
       for (int i = startInvalidation; i <= newLineCount; i++) {
@@ -5023,7 +5092,7 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
         _invalidateFoldRanges(startInvalidation);
       }
 
-      _deferLayout();
+      _deferLayout(lineDelta: lineDelta);
     } else if (affectedLine != null) {
       _foldRanges.remove(affectedLine);
       if (affectedLine > 0) {
@@ -5712,84 +5781,10 @@ class _CodeFieldRenderer extends RenderBox implements MouseTrackerAnnotation {
 
     final hasActiveFolds = _hasActiveFolds;
 
-    if (controller.isBufferActive) {
-      final lineIndex = controller.bufferLineIndex!;
-      final columnIndex = controller.bufferCursorColumn;
-      final lineY = _getLineYOffset(lineIndex, hasActiveFolds);
-      final lineText = controller.bufferLineText ?? '';
-
-      final contentWidth =
-          size.width - _gutterWidth - (innerPadding?.horizontal ?? 0);
-      final paragraphWidth = lineWrap
-          ? _wrapWidth
-          : (isRTL ? max(contentWidth * 3, 10000.0) : null);
-
-      final para = _buildHighlightedParagraph(
-        lineIndex,
-        lineText,
-        width: paragraphWidth,
-      );
-      final clampedCol = columnIndex.clamp(0, lineText.length);
-
-      double caretX = 0.0;
-      double caretYInLine = 0.0;
-
-      if (isRTL) {
-        final paragraphOffset = lineWrap
-            ? 0.0
-            : (contentWidth - (paragraphWidth ?? 0));
-
-        if (lineText.isEmpty) {
-          caretX = contentWidth;
-        } else if (clampedCol == 0) {
-          final boxes = para.getBoxesForRange(0, 1);
-          if (boxes.isNotEmpty) {
-            caretX = boxes.first.right + paragraphOffset;
-            caretYInLine = boxes.first.top;
-          } else {
-            caretX = contentWidth;
-          }
-        } else if (clampedCol >= lineText.length) {
-          final boxes = para.getBoxesForRange(
-            lineText.length - 1,
-            lineText.length,
-          );
-          if (boxes.isNotEmpty) {
-            caretX = boxes.first.left + paragraphOffset;
-            caretYInLine = boxes.first.top;
-          } else {
-            caretX = paragraphOffset;
-          }
-        } else {
-          final boxes = para.getBoxesForRange(clampedCol - 1, clampedCol);
-          if (boxes.isNotEmpty) {
-            caretX = boxes.first.left + paragraphOffset;
-            caretYInLine = boxes.first.top;
-          } else {
-            caretX = contentWidth;
-          }
-        }
-      } else {
-        if (lineText.isEmpty) {
-          caretX = 0;
-        } else if (clampedCol > 0) {
-          final boxes = para.getBoxesForRange(clampedCol - 1, clampedCol);
-          if (boxes.isNotEmpty) {
-            caretX = boxes.first.right;
-            caretYInLine = boxes.first.top;
-          }
-        }
-      }
-
-      final ghostOffset = _getTotalVirtualOffset(lineIndex);
-
-      return (
-        lineIndex: lineIndex,
-        columnIndex: columnIndex,
-        offset: Offset(caretX, lineY + caretYInLine + ghostOffset),
-        height: _lineHeight,
-      );
-    }
+    // For buffered edits that include newlines, using a single multi-line
+    // buffer paragraph can place the caret one visual line behind. Keep caret
+    // mapping aligned with gutter by always resolving logical line/column
+    // through offset-based controller helpers.
 
     if (!isRTL && _caretInfoCache.containsKey(cursorOffset)) {
       return _caretInfoCache[cursorOffset]!;

pubspec.yaml

@@ -1,6 +1,6 @@
 name: code_forge
 description: "A sophisticated code editor package with AI completion, LSP support, syntax highlighting, and advanced editing capabilities."
-version: 9.8.0
+version: 9.9.0
 homepage: https://github.com/heckmon/code_forge
 
 environment: