From: Dmitry Gutov <dmitry@gutov.dev>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Eli Zaretskii <eliz@gnu.org>,
66732@debbugs.gnu.org, Yuan Fu <casouri@gmail.com>,
dominik@honnef.co
Subject: bug#66732: tree-sitter fontification doesn't update multi-line syntax reliably
Date: Tue, 19 Dec 2023 01:08:19 +0200 [thread overview]
Message-ID: <94a85548-5b9f-0698-98aa-f6495babbd1a@gutov.dev> (raw)
In-Reply-To: <jwva5q7tk9h.fsf-monnier+emacs@gnu.org>
On 18/12/2023 21:12, Stefan Monnier wrote:
>>>> I found that if you don’t set text prop fontified to nil for the whole
>>>> extended region, redisplay doesn’t seem to, well, redisplay the full
>>>> region, even thought the new face has been correctly applied to them.
>>> That sounds like a bug in font-lock? At the end of jit-lock-fontify-now,
>>> there is a call creating a timer with jit-lock-force-redisplay.
>>> And that function ends with this:
>>> ;; Don't cause refontification (it's already been done), but just do
>>> ;; some random buffer change, so as to force redisplay.
>>> (put-text-property start end 'fontified t)))))
>>> If I just change t to nil there (or to some other value, like 42), either
>>> of our patches starts behaving well. Perhaps Stefan could comment.
>
> This chunk of code is present so as to cause a re-render (i.e. recompute
> the glyph matrices) of the affected region, but not a re-fontification.
> So a nil value would be wrong.
> I'm surprised that 42 behaves differently from t.
This patch also changes the visible behavior, fixing the problem that
I'm seeing:
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 452cbd1ca51..43db2d31856 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -499,6 +499,7 @@ jit-lock-force-redisplay
(setq start (point-min) end (max start end)))
;; Don't cause refontification (it's already been done), but
just do
;; some random buffer change, so as to force redisplay.
+ (put-text-property start end 'fontified nil)
(put-text-property start end 'fontified t)))))
\f
;;; Stealth fontification.
So it must be not about the eventual value of the property, but about
triggering some counter, like (buffer-modified-tick). Which does get
incremented after the above sequence (by 2).
> What we really need here is to force the redisplay to consider that this
> part of the buffer needs to be re-rendered. In practice changing any
> text-property on that chunk of text should do the trick, in my
> experience, but from what you describe it seems that some optimisation
> is sufficiently clever to notice that the old value was t and the new
> value is identical so the region is not marked as modified?
>
> Indeed, in `add_text_properties_1` I see we skip over intervals which
> already have the right property values, so that might be what's happening.
> I suggest we introduce a separate function with a name indicating what
> we intend it to do (like `force-region-update`) so the code will
> be clearer.
> And its implementation could consist in adding and then removing some
> dummy text property (tho a better implementation would go and modify
> the underlying C-level variables in the buffer like BUF_*_UNCHANGED).
Adding an extra 'put-text-property' call to jit-lock-force-redisplay
seems cheap enough, but something even faster could be good too.
next prev parent reply other threads:[~2023-12-18 23:08 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 14:22 bug#66732: tree-sitter fontification doesn't update multi-line syntax reliably Dominik Honnef
2023-10-24 23:15 ` Dmitry Gutov
2023-10-29 12:22 ` Eli Zaretskii
2023-11-18 8:37 ` Eli Zaretskii
2023-12-11 4:16 ` Yuan Fu
2023-12-11 12:05 ` Eli Zaretskii
2023-12-11 14:35 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-11 15:53 ` Dmitry Gutov
2023-12-12 7:50 ` Yuan Fu
2023-12-12 12:43 ` Dmitry Gutov
2023-12-13 3:28 ` Yuan Fu
2023-12-13 3:45 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-13 7:12 ` Yuan Fu
2023-12-13 14:30 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-14 1:43 ` Dmitry Gutov
2023-12-14 8:29 ` Yuan Fu
2023-12-15 1:01 ` Dmitry Gutov
2023-12-15 7:12 ` Yuan Fu
2023-12-16 5:56 ` Yuan Fu
2023-12-16 15:22 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-16 17:11 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-16 17:23 ` Dmitry Gutov
2023-12-16 17:43 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-16 19:18 ` Yuan Fu
2023-12-16 19:57 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-16 23:09 ` Dmitry Gutov
2023-12-17 1:16 ` Yuan Fu
2023-12-17 18:32 ` Dmitry Gutov
2023-12-19 3:12 ` Yuan Fu
2023-12-20 1:52 ` Dmitry Gutov
2023-12-20 5:43 ` Yuan Fu
2023-12-20 11:31 ` Dmitry Gutov
2023-12-16 23:02 ` Dmitry Gutov
2023-12-20 2:01 ` Dmitry Gutov
2023-12-20 3:08 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-16 22:56 ` Dmitry Gutov
2023-12-18 18:27 ` Dmitry Gutov
2023-12-18 19:12 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-18 19:33 ` Eli Zaretskii
2023-12-18 23:10 ` Dmitry Gutov
2023-12-19 3:22 ` Eli Zaretskii
2023-12-19 3:40 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-19 12:41 ` Eli Zaretskii
2023-12-19 12:44 ` Dmitry Gutov
2023-12-20 20:50 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-23 10:17 ` Eli Zaretskii
2023-12-23 18:02 ` Yuan Fu
2023-12-23 20:46 ` Dmitry Gutov
2023-12-23 20:51 ` Dmitry Gutov
2023-12-23 23:07 ` Yuan Fu
2023-12-24 2:10 ` Dmitry Gutov
2023-12-24 3:02 ` Yuan Fu
2023-12-23 20:55 ` Dmitry Gutov
2023-12-24 6:03 ` Eli Zaretskii
2024-02-08 1:40 ` Yuan Fu
2023-12-18 23:08 ` Dmitry Gutov [this message]
2023-12-20 20:50 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-12-12 15:34 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=94a85548-5b9f-0698-98aa-f6495babbd1a@gutov.dev \
--to=dmitry@gutov.dev \
--cc=66732@debbugs.gnu.org \
--cc=casouri@gmail.com \
--cc=dominik@honnef.co \
--cc=eliz@gnu.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).