From: "João Távora" <joaotavora@gmail.com>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: "Alan Mackenzie" <acm@muc.de>,
"Clément Pit-Claudel" <cpitclaudel@gmail.com>,
emacs-devel <emacs-devel@gnu.org>,
"Dmitry Gutov" <dgutov@yandex.ru>
Subject: Re: contextual refontification (was: [PATCH] Re: Algorithm in electric-pair--unbalanced-strings-p unsuitable for CC Mode)
Date: Wed, 10 Jul 2019 10:32:28 +0100 [thread overview]
Message-ID: <CALDnm52iHwRrVu4dCt-Rn=nUhmZ5F+zUkz8LZwgXjO5_+gyhsw@mail.gmail.com> (raw)
In-Reply-To: <jwv4l3v6xcg.fsf-monnier+emacs@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 4412 bytes --]
On Tue, Jul 9, 2019 at 4:40 PM Stefan Monnier <monnier@iro.umontreal.ca>
wrote:
> IOW make it so that font-lock:
> - delays refontification after the current line if the end of line is
> now within a string/comment (and wasn't before).
> - "un-delays" this fontification if the end of line is now outside of any
> string/comment (but was within it before).
> - of course, with some kind of timeout, but one longer than 0.5s.
>
> Or something like that.
Here's my take on that. Clément/Dmitry if you find the time test this. ..
It should, in principle, reduce "blinking" in all modes (for people who
aren't using electric-pair-mode or something like that). If it doesn't,
I've made some kind of false assumption.
Btw to restart jit-lock-mode in a running emacs, you need to
do sth like this:
(progn
(jit-lock-mode -1)
(cancel-timer jit-lock-context-timer)
(setq jit-lock-context-timer nil)
(jit-lock-mode 1))
João
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 48998a81fe..0d7c434f3f 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -123,6 +123,15 @@ jit-lock-context-time
:type '(number :tag "seconds")
:group 'jit-lock)
+(defcustom jit-lock-multiline-string-grace 2
+ "Like `jit-lock-context-time' but for unterminated multiline strings.
+If the user has just opened an unterminated string at EOL, give
+him/her some grace time before deciding it is a multi-line string
+and fontifying accordingly, do so only if the user stares idle at
+that string for more than this many seconds."
+ :type '(number :tag "seconds")
+ :group 'jit-lock)
+
(defcustom jit-lock-defer-time nil ;; 0.25
"Idle time after which deferred fontification should take place.
If nil, fontification is not deferred.
@@ -232,7 +241,7 @@ jit-lock-mode
(unless jit-lock-context-timer
(setq jit-lock-context-timer
(run-with-idle-timer jit-lock-context-time t
- 'jit-lock-context-fontify)))
+ (jit--lock-context-timer-function))))
(setq jit-lock-context-unfontify-pos
(or jit-lock-context-unfontify-pos (point-max))))
@@ -306,6 +315,44 @@ jit-lock--debug-fontify
pos 'fontified)))))))))
(setq jit-lock-defer-buffers nil))))
+(defun jit--lock-context-timer-function ()
+ (let (last ; point marker the last time context timer was run
+ in-s-or-c-p ; t if in string or comment that time around
+ grace-timer ; idle timer for fontifying unterminated s-or-c, or
nil
+ )
+ (lambda ()
+ (let ((point (point-marker))
+ (new-in-s-or-c-p
+ (nth 8 (save-excursion (syntax-ppss (line-end-position))))))
+ (if (and jit-lock-multiline-string-grace
+ last
+ (eq (marker-buffer last) (current-buffer))
+ (eq (line-number-at-pos last) (line-number-at-pos)))
+ (cond ((and (null in-s-or-c-p) new-in-s-or-c-p (null
grace-timer))
+ (setq grace-timer
+ (run-with-idle-timer
jit-lock-multiline-string-grace nil
+ (lambda ()
+ (jit-lock-context-fontify)
+ (setq grace-timer nil)))))
+ ((and in-s-or-c-p
+ (null new-in-s-or-c-p)
+ grace-timer)
+ (cancel-timer grace-timer)
+ (setq grace-timer nil))
+ (t
+ ;; no state change, leave everything as it was
+ ))
+ ;; left the line somehow or customized feature away: cancel
+ ;; everything, resume normal operation.
+ (when grace-timer
+ (cancel-timer grace-timer)
+ (setq grace-timer nil)))
+ ;; proceed as usual, unless grace-timer is counting
+ (unless grace-timer
+ (jit-lock-context-fontify))
+ (setq last point in-s-or-c-p new-in-s-or-c-p)))))
+
+
(defun jit-lock-register (fun &optional contextual)
"Register FUN as a fontification function to be called in this buffer.
FUN will be called with two arguments START and END indicating the region
[-- Attachment #2: Type: text/html, Size: 5906 bytes --]
next prev parent reply other threads:[~2019-07-10 9:32 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-02 13:16 bug#36474: Algorithm in electric-pair--unbalanced-strings-p unsuitable for CC Mode Alan Mackenzie
[not found] ` <CALDnm51Hi10KMqYneWBamNL4sNdzHEz6_NasGk=oR_y-=1Y7nQ@mail.gmail.com>
2019-07-02 15:27 ` Fwd: " João Távora
2019-07-02 16:04 ` bug#36474: " Alan Mackenzie
2019-07-02 17:22 ` João Távora
2019-07-02 18:28 ` bug#36474: " Alan Mackenzie
2019-07-02 21:11 ` Stefan Monnier
2019-07-03 9:28 ` João Távora
2019-07-03 10:58 ` Alan Mackenzie
2019-07-03 13:07 ` Dmitry Gutov
2019-07-03 13:32 ` Alan Mackenzie
2019-07-03 14:25 ` Dmitry Gutov
2019-07-03 15:58 ` Eli Zaretskii
2019-07-03 20:54 ` Alan Mackenzie
2019-07-04 2:33 ` Eli Zaretskii
2019-07-04 1:36 ` Richard Stallman
2019-07-03 13:33 ` Eli Zaretskii
2019-07-03 13:35 ` João Távora
2019-07-03 13:31 ` João Távora
2019-07-03 18:25 ` Kévin Le Gouguec
2019-07-04 0:52 ` João Távora
2019-07-04 6:17 ` Kévin Le Gouguec
2019-07-04 15:05 ` Alan Mackenzie
2019-07-04 15:50 ` João Távora
2019-07-04 16:58 ` [PATCH] " Alan Mackenzie
2019-07-04 18:45 ` João Távora
2019-07-04 19:01 ` Alan Mackenzie
2019-07-04 21:44 ` João Távora
2019-07-08 10:05 ` Alan Mackenzie
2019-07-08 12:10 ` João Távora
2019-07-08 15:49 ` Stefan Monnier
2019-07-08 16:33 ` Stefan Monnier
2019-07-08 17:24 ` Alan Mackenzie
2019-07-08 17:32 ` Stefan Monnier
2019-07-08 16:45 ` Alan Mackenzie
2019-07-08 17:29 ` Stefan Monnier
2019-07-08 18:05 ` Alan Mackenzie
2019-07-08 20:59 ` Stefan Monnier
2019-07-09 6:41 ` Clément Pit-Claudel
2019-07-09 9:06 ` João Távora
2019-07-09 9:23 ` João Távora
2019-07-09 9:52 ` Alan Mackenzie
2019-07-09 10:54 ` João Távora
2019-07-09 11:18 ` João Távora
2019-07-09 15:18 ` Dmitry Gutov
2019-07-09 15:40 ` contextual refontification (was: [PATCH] Re: Algorithm in electric-pair--unbalanced-strings-p unsuitable for CC Mode) Stefan Monnier
2019-07-10 9:32 ` João Távora [this message]
2019-07-09 15:43 ` [PATCH] Re: Algorithm in electric-pair--unbalanced-strings-p unsuitable for CC Mode João Távora
2019-07-09 15:31 ` Alan Mackenzie
2019-07-09 16:14 ` João Távora
2019-07-09 12:33 ` Clément Pit-Claudel
2019-07-09 14:28 ` João Távora
2019-07-09 16:05 ` Clément Pit-Claudel
2019-07-09 16:32 ` João Távora
2019-07-09 17:09 ` João Távora
2019-07-09 13:45 ` Stefan Monnier
2019-07-09 16:00 ` Alan Mackenzie
2019-07-09 17:11 ` Stefan Monnier
2019-07-09 18:26 ` Alan Mackenzie
2019-07-09 18:47 ` Eli Zaretskii
2019-07-09 18:53 ` João Távora
2019-07-10 10:32 ` Alan Mackenzie
2019-07-10 10:40 ` Lars Ingebrigtsen
2019-07-10 12:24 ` João Távora
2019-07-10 14:14 ` Clément Pit-Claudel
2019-07-10 16:07 ` João Távora
2019-07-11 15:14 ` Lars Ingebrigtsen
2019-07-11 15:43 ` João Távora
2019-07-11 15:51 ` Lars Ingebrigtsen
2019-07-11 16:13 ` João Távora
2019-07-12 15:58 ` Lars Ingebrigtsen
2019-07-12 18:47 ` João Távora
2019-07-13 0:08 ` Lars Ingebrigtsen
2019-07-10 12:10 ` João Távora
2019-07-10 14:03 ` Alan Mackenzie
2019-07-10 16:05 ` João Távora
2019-07-10 17:56 ` Alan Mackenzie
2019-07-11 0:11 ` Richard Stallman
2019-07-03 16:56 ` Stefan Monnier
2019-07-03 16:58 ` Stefan Monnier
2019-07-04 15:24 ` Alan Mackenzie
2019-07-04 15:52 ` Stefan Monnier
2019-07-04 16:42 ` Alan Mackenzie
2019-07-04 20:16 ` Stefan Monnier
2019-07-04 21:27 ` João Távora
2019-07-02 17:22 ` bug#36474: " João Távora
[not found] ` <handler.36474.B.156207340818492.ack@debbugs.gnu.org>
2019-07-08 9:36 ` bug#36474: Acknowledgement (Algorithm in electric-pair--unbalanced-strings-p unsuitable for CC Mode) Alan Mackenzie
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CALDnm52iHwRrVu4dCt-Rn=nUhmZ5F+zUkz8LZwgXjO5_+gyhsw@mail.gmail.com' \
--to=joaotavora@gmail.com \
--cc=acm@muc.de \
--cc=cpitclaudel@gmail.com \
--cc=dgutov@yandex.ru \
--cc=emacs-devel@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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.