fix font rendering for magit v4.4.0+

Author: andycandy-dev

pr-review-render.el

@@ -120,6 +120,18 @@
              (t
               (shr-generic td)))))))))
 
+(defun pr-review--copy-face-to-font-lock-face (start end)
+  "Copy 'face text properties to 'font-lock-face between START and END.
+This ensures compatibility with Magit v4.4.0+ which uses font-lock-face
+instead of face for rendering in magit-section-mode buffers."
+  (let ((pos start))
+    (while (< pos end)
+      (let* ((next-change (or (next-single-property-change pos 'face nil end) end))
+             (face-value (get-text-property pos 'face)))
+        (when face-value
+          (put-text-property pos next-change 'font-lock-face face-value))
+        (setq pos next-change)))))
+
 (defun pr-review--insert-html (body &optional indent extra-face)
   "Insert html content BODY.
 INDENT is an optional number, if provided,
@@ -157,7 +169,9 @@ in addition to other faces."
           (forward-line))))
     ;; additional face for the inserted region
     (when extra-face
-      (add-face-text-property start end extra-face))))
+      (add-face-text-property start end extra-face))
+    ;; Convert face properties to font-lock-face for Magit v4.4.0+
+    (pr-review--copy-face-to-font-lock-face start end)))
 
 (defun pr-review--maybe-insert-reactions (reaction-group &optional indent)
   "Insert REACTION-GROUP if not nil.
@@ -196,6 +210,9 @@ MARGIN count of spaces are added at the start of every line."
         (insert "\n"))
       (unless (eq major-mode lang-mode)
         (funcall lang-mode))
+      ;; Explicitly enable font-lock-mode for Magit v4.4.0+
+      (unless font-lock-mode
+        (font-lock-mode 1))
       (condition-case-unless-debug nil
           (font-lock-ensure)
         (error nil)))
@@ -212,14 +229,33 @@ MARGIN count of spaces are added at the start of every line."
       (save-excursion
         (dolist (ol (overlays-in (point-min) (point-max)))
           (when (eq (overlay-get ol 'diff-mode) 'syntax)
-            (when-let ((face (overlay-get ol 'face)))
-              (add-face-text-property (overlay-start ol)
-                                      (overlay-end ol)
-                                      face))))
+            ;; Magit v4.4.0+ uses font-lock-face instead of face
+            ;; Check both properties for backwards compatibility
+            (let ((face (or (overlay-get ol 'font-lock-face)
+                            (overlay-get ol 'face))))
+              (when face
+                ;; Add to both face and font-lock-face for compatibility
+                (add-face-text-property (overlay-start ol)
+                                        (overlay-end ol)
+                                        face)
+                ;; Also explicitly set font-lock-face
+                (put-text-property (overlay-start ol)
+                                   (overlay-end ol)
+                                   'font-lock-face face)))))
         (goto-char (point-min))
         (remove-overlays (point-min) (point-max) 'diff-mode 'syntax)))
 
     (let ((res (buffer-substring 2 (point-max))))  ;; start at 2: skip first newline
+      ;; Magit v4.4.0+ uses font-lock-face; ensure face property is also set
+      (when (eq lang-mode 'diff-mode)
+        (let ((start 0))
+          (while (< start (length res))
+            (let* ((next-change (or (next-single-property-change start 'font-lock-face res)
+                                    (length res)))
+                   (font-lock-face (get-text-property start 'font-lock-face res)))
+              (when font-lock-face
+                (put-text-property start next-change 'face font-lock-face res))
+              (setq start next-change)))))
       (when margin
         (setq res (replace-regexp-in-string (rx bol) (make-string margin ?\s) res)))
       res)))
@@ -231,7 +267,9 @@ MARGIN count of spaces are added at the start of every line."
     (insert (pr-review--fontify body lang-mode margin))
     (setq end (point))
     (when extra-face
-      (add-face-text-property start end extra-face))))
+      (add-face-text-property start end extra-face))
+    ;; Convert face properties to font-lock-face for Magit v4.4.0+
+    (pr-review--copy-face-to-font-lock-face start end)))
 
 (defun pr-review--insert-diff (diff)
   "Insert pull request diff DIFF, wash it using magit."
@@ -950,6 +988,12 @@ it can be displayed in a single line."
         (mapc 'pr-review--insert-in-diff-checkrun-annotation
               (let-alist context .annotations.nodes))))))
 
+(defun pr-review--convert-face-to-font-lock-face ()
+  "Convert all 'face text properties to 'font-lock-face for Magit v4.4.0+.
+This ensures all UI elements (titles, usernames, timestamps, buttons, etc.)
+are properly displayed in magit-section-mode buffers."
+  (pr-review--copy-face-to-font-lock-face (point-min) (point-max)))
+
 (defun pr-review--insert-pr (pr diff)
   "Insert pr buffer with PR and DIFF."
   (setq pr-review--char-pixel-width (shr-string-pixel-width "-"))
@@ -961,6 +1005,8 @@ it can be displayed in a single line."
         (propertize (alist-get 'title pr)'face 'pr-review-title-face)))
     (insert "\n")
     (pr-review--insert-pr-body pr diff))
+  ;; Convert all face properties to font-lock-face for Magit v4.4.0+
+  (pr-review--convert-face-to-font-lock-face)
   ;; need to call after this inserting all sections
   (pr-review--hide-generated-files))
 

pr-review.el

@@ -130,6 +130,8 @@ Which means that all sections are collapsed."
   (setq-local magit-hunk-section-map nil
               magit-file-section-map nil
               magit-diff-highlight-hunk-body nil)
+  ;; Enable font-lock-mode for Magit v4.4.0+ which uses font-lock-face
+  (font-lock-mode 1)
   (setq-local imenu-create-index-function #'magit--imenu-create-index
               imenu-default-goto-function #'magit--imenu-goto-function
               magit--imenu-item-types '(pr-review--review-section