From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Toning down font-lock Date: Tue, 08 Mar 2022 10:18:36 -0500 Message-ID: References: <87v8wscm4x.fsf@gmail.com> <87czixa7ky.fsf@gmail.com> <87lexkbr3l.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39329"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Augusto Stoffel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Mar 08 16:20:05 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nRbd7-000A2Z-Lx for ged-emacs-devel@m.gmane-mx.org; Tue, 08 Mar 2022 16:20:05 +0100 Original-Received: from localhost ([::1]:40170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRbd6-0007qb-O8 for ged-emacs-devel@m.gmane-mx.org; Tue, 08 Mar 2022 10:20:04 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:43568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRbbo-0006D9-Gs for emacs-devel@gnu.org; Tue, 08 Mar 2022 10:18:47 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:39686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRbbl-0004iD-GB for emacs-devel@gnu.org; Tue, 08 Mar 2022 10:18:43 -0500 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 852961001CB; Tue, 8 Mar 2022 10:18:39 -0500 (EST) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id BFD42100120; Tue, 8 Mar 2022 10:18:37 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1646752717; bh=bWu3T0JzCUGB7erCPD1iDjaeqSYNc8yp9xg+U+9dkgs=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=O/m46M7Otwg6xcK2AV5FYUhegDjkdzaMm9Y0jhrMp41gDbNxFLdTwIOlt59UcFxIF b44eIP9BQlQvVEaM3oGcTlQR6MtFTssmsuM5wmPnzR7brVTZAtsxmIjNA3W0YS9DCT Ry5s287BzbaCCE4TFCRxD+ommosbf1vaO/b6bSpJkEwUI3EHN/3LRCepWbfFgW9Huk FfXoqjVEb5NNa/gBE+6i1YPI5wzqTTBKUYx5KMtlOyxYm9ppQ88/2TSnUvEyS1Cxzu uWGc0IYzMuXa/IRaQ+ZQ2SC2x0oDSTkg5Ae+kCDRIJkizbd0kf2map0m84+Y2UO6ab MF0dHBwzi+5hQ== Original-Received: from pastel (unknown [45.72.221.51]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 8C67D1201F0; Tue, 8 Mar 2022 10:18:37 -0500 (EST) In-Reply-To: <87lexkbr3l.fsf@gmail.com> (Augusto Stoffel's message of "Tue, 08 Mar 2022 12:50:38 +0100") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:286926 Archived-At: >> Nice. I'd suggest you merge `font-lock-ignore--test` and >> `font-lock-ignore--test-one` into a single (recursive) function. > The exclamation marks are not a recursive thing. > But I added `and' and `not' rules that use recursion. Ah, I see I had misunderstood the syntax and semantics of your toplevel, so indeed to bring it into the recursion, you'd need a new thingy which might be called maybe `or` with a syntax like (or RULES .. [!] RULE ..). See some nitpicks below. Stefan > + - A symbol, say a face name. It matches any font-lock rule > + mentioning that symbol anywhere. Asterisks are treated as > + wildcards. I suggest we call it a glob pattern so it's a known pattern matching thingy and we don't need to reinvent and re-document how to make it match an actual `*`. > @@ -1810,9 +1842,11 @@ font-lock-compile-keywords > (error "Font-lock trying to use keywords before setting them up")) > (if (eq (car-safe keywords) t) > keywords > - (setq keywords > - (cons t (cons keywords > - (mapcar #'font-lock-compile-keyword keywords)))) > + (let ((compiled (mapcar #'font-lock-compile-keyword keywords))) > + (setq keywords `(t ,keywords ,@(if (and font-lock-ignore > + (not syntactic-keywords)) > + (font-lock--filter-keywords compiled) > + compiled)))) I think I'd move the test of `font-lock-ignore` into `font-lock--filter-keywords` so it's the only function which consults it. > @@ -1883,6 +1917,56 @@ font-lock-choose-keywords > (t > (car keywords)))) > > +(defun font-lock--test-keyword (rule keyword) That sadly doesn't say whether it return nil when it matches or whether it returns non-nil when it matches. I suggest to rename it to something like `font-lock--matches-keyword` so the name clearly say when we return nil and when we return non-nil. > + "Test whether font-lock KEYWORD matches a RULE. > +See `font-lock-ignore' for the possible rules." Same comment ;-) > + (pcase-exhaustive rule > + ('* t) > + ((pred symbolp) > + (let* ((name (symbol-name rule)) > + (regexp (when (string-match-p "\\*" name) > + (let* ((words (mapcar #'regexp-quote > + (split-string name "\\*"))) > + (joined (string-join words ".*"))) > + (concat "\\`" joined "\\'"))))) We can use `wildcard-to-regexp` here. > + (if regexp > + (seq-some (lambda (obj) > + (when (symbolp obj) > + (string-match-p regexp (symbol-name obj)))) > + (flatten-tree keyword)) > + (memq rule (flatten-tree keyword))))) Performance likely doesn't matter, but I suspect it'd be faster if we recursed over the data-structure rather than flattening it. E.g. something like (named-let search ((obj keyword)) (cond ((consp obj) (or (search (car obj)) (search (cdr obj)))) ((and obj (symbolp obj)) (string-match-p regexp (symbol-name obj)))))