branch: elpa/aidermacs commit ef922c07ea5ffd3e75894eb6db321ecf588fa7dc Author: Mingde (Matthew) Zeng <matthew...@posteo.net> Commit: Mingde (Matthew) Zeng <matthew...@posteo.net>
Workaround tree-sitter temp buffer highlighting Partly addresses #83 Signed-off-by: Mingde (Matthew) Zeng <matthew...@posteo.net> --- aidermacs-models.el | 5 +++-- aidermacs-output.el | 16 +++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/aidermacs-models.el b/aidermacs-models.el index 1dcbfe1398..16b7c3bf5e 100644 --- a/aidermacs-models.el +++ b/aidermacs-models.el @@ -26,17 +26,18 @@ (require 'json) (require 'url) -(defvar url-http-end-of-headers) - (declare-function aidermacs--send-command "aidermacs") (declare-function aidermacs-buffer-name "aidermacs") (declare-function aidermacs-exit "aidermacs") (declare-function aidermacs-aider-version "aidermacs") +(declare-function aidermacs-get-buffer-name "aidermacs") (defvar aidermacs--current-output) (defvar aidermacs-use-architect-mode) (defvar aidermacs--current-mode) +(defvar url-http-end-of-headers) + (defgroup aidermacs-models nil "Model selection for Aidermacs." :group 'aidermacs) diff --git a/aidermacs-output.el b/aidermacs-output.el index 1fb2e01604..9825582737 100644 --- a/aidermacs-output.el +++ b/aidermacs-output.el @@ -129,13 +129,15 @@ and syntax highlighting to match the original file." (insert-file-contents filename) (set-buffer-modified-p nil) ;; Use same major mode as the original file - (let ((buffer-file-name filename) - (delay-mode-hooks t)) - (set-auto-mode) - ;; Ensure syntax highlighting is applied - (font-lock-mode 1)) - ;; Make buffer read-only - (setq buffer-read-only t)) + (with-demoted-errors "" + (let ((buffer-file-name filename) + (delay-mode-hooks t)) + (set-auto-mode) + ;; Ensure syntax highlighting is applied + (font-lock-mode 1) + (font-lock-fontify-buffer)) + ;; Make buffer read-only + (setq buffer-read-only t))) (cons filename temp-buffer)) (error (message "Error capturing file state for %s: %s"