From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Theodor Thornhill via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#59651: 29.0.50; [PATCH]: Add new font-lock settings to css-ts-mode Date: Mon, 28 Nov 2022 09:58:09 +0100 Message-ID: <87mt8bjw0u.fsf@thornhill.no> Reply-To: Theodor Thornhill Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35905"; mail-complaints-to="usenet@ciao.gmane.io" Cc: casouri@gmail.com, stefankangas@gmail.com To: 59651@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Nov 28 09:59:36 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1ozZzD-0009B4-Vm for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 28 Nov 2022 09:59:36 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZyp-0005KM-Ft; Mon, 28 Nov 2022 03:59:11 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ozZyg-0005Is-3M for bug-gnu-emacs@gnu.org; Mon, 28 Nov 2022 03:59:06 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ozZyf-0000I9-R5 for bug-gnu-emacs@gnu.org; Mon, 28 Nov 2022 03:59:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ozZyf-0003Ok-N8; Mon, 28 Nov 2022 03:59:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Theodor Thornhill Original-Sender: "Debbugs-submit" Resent-CC: casouri@gmail.com, stefankangas@gmail.com, bug-gnu-emacs@gnu.org Resent-Date: Mon, 28 Nov 2022 08:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59651 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: casouri@gmail.com, stefankangas@gmail.com Original-Received: via spool by submit@debbugs.gnu.org id=B.166962591513028 (code B ref -1); Mon, 28 Nov 2022 08:59:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 28 Nov 2022 08:58:35 +0000 Original-Received: from localhost ([127.0.0.1]:47322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozZyF-0003O4-3z for submit@debbugs.gnu.org; Mon, 28 Nov 2022 03:58:35 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:54614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozZyE-0003Ny-3A for submit@debbugs.gnu.org; Mon, 28 Nov 2022 03:58:34 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ozZyD-0005I0-9k for bug-gnu-emacs@gnu.org; Mon, 28 Nov 2022 03:58:33 -0500 Original-Received: from out2.migadu.com ([2001:41d0:2:aacc::]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ozZy4-0000Ey-6y for bug-gnu-emacs@gnu.org; Mon, 28 Nov 2022 03:58:31 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thornhill.no; s=key1; t=1669625898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=SaTBi3G+F7m7hRcn9fjtmp/5TLi3rNbdb64324117ns=; b=hsbeW9LivsCn3mdi5dhcfJ7ge9OA2FanbxwsBzUQP+kwycBPuskGesN0kUZ4Qif7Sm6To7 dpTLQbR0pu4UG3UlBpKjbgTlKysqpqjq/LAkBCkk/N3htFAYPEvKwTwyN7m/A1lP+IlexQ DxtEkxiHj4h8TBPGAFYPaf7JQP+NB4/u8PifUdA7ZU3Pbh/bpMCS47IMOXAk57FXz2SJ02 gGu9UFjGulYVNcBCid2kFe9jCiVcJF6wTmiWdd83N+kMgDUUIAK6Xxb11YSrjpzZaN5TDj 2JEuTWbtPKUykA3JhUnw1a2o5QWSrqFY/SWK3KNhllEsESChXRRIf27Ptfu2/w== X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=2001:41d0:2:aacc::; envelope-from=theo@thornhill.no; helo=out2.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:249271 Archived-At: --=-=-= Content-Type: text/plain Hi Yuan and Stefan! I added some more font-lock settings to css-ts-mode. See attached patch. Theo --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Add-more-font-lock-settings-to-css-ts-mode.patch >From c2b134de55573117ad88b8651ff1f2d75662e2a2 Mon Sep 17 00:00:00 2001 From: Theodor Thornhill Date: Mon, 28 Nov 2022 09:35:15 +0100 Subject: [PATCH] Add more font-lock settings to css-ts-mode * lisp/textmodes/css-mode.el (css--treesit-settings): Add new font-lock features 'query', 'keyword', 'operator' and 'bracket'. (css-ts-mode): Use new features. --- lisp/textmodes/css-mode.el | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 734252ee66..123ce23762 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -1353,10 +1353,27 @@ css--treesit-settings :language 'css '((string_value) @font-lock-string-face) + :feature 'keyword + :language 'css + '(["@media" + "@import" + "@charset" + "@namespace" + "@keyframes"] @font-lock-builtin-face + ["and" + "or" + "not" + "only" + "selector"] @font-lock-keyword-face) + :feature 'variable :language 'css '((plain_value) @font-lock-variable-name-face) + :language 'css + :feature 'operator + `(["=" "~=" "^=" "|=" "*=" "$="] @font-lock-operator-face) + :feature 'selector :language 'css '((class_selector) @css-selector @@ -1377,7 +1394,18 @@ css--treesit-settings :language 'css '((integer_value) @font-lock-number-face (float_value) @font-lock-number-face - (unit) @font-lock-constant-face) + (unit) @font-lock-constant-face + (important) @font-lock-builtin-face) + + :feature 'query + :language 'css + '((keyword_query) @font-lock-property-face + (feature_name) @font-lock-property-face) + + + :feature 'bracket + :language 'css + '((["(" ")" "[" "]" "{" "}"]) @font-lock-bracket-face) :feature 'error :language 'css @@ -1808,9 +1836,9 @@ css-ts-mode (setq-local treesit-defun-type-regexp "rule_set") (setq-local treesit-font-lock-settings css--treesit-settings) (setq-local treesit-font-lock-feature-list - '((selector comment) + '((selector comment query keyword) (property constant string) - (error variable function))) + (error variable function operator bracket))) ;; Tree-sitter-css, for whatever reason, cannot reliably return ;; the captured nodes in a given range (it instead returns the ;; nodes preceding range). Before this is fixed in -- 2.34.1 --=-=-=--