Subject: Re: bug#67135: [PATCH] Fix font-lock for string escapes in lua-ts--font-lock-settings

From: [email-masked]
Date: Sun, 12 Nov 2023 22:26:16 +0000

November 12, 2023 at 7:45 PM, "Noah Peart" <[email-masked]> wrote:
> 
> Tags: patch
> 
> * lisp/progmodes/lua-ts-mode.el
> (lua-ts-mode--font-lock-settings): fix font-locking for string escapes
> 
> Bug: Strings aren't fontified when they have escape sequences in them.
> 
> Recipe to reproduce:
> In a `lua-ts-mode` buffer, with `treesit-font-lock-level` set to 4 to
> include escapes,
> 
>  "foo\nbar"
> 
> font-locks '\n' but not "foo" or "bar".
> 
> In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version
> 3.24.33, cairo version 1.16.0) of 2023-11-05 built on noah-X580VD
> Repository revision: b819b8d6e90337b4cb36b35c2c6d0112c90a8e24
> Repository branch: master
> Windowing system distributor 'The X.Org Foundation', version 11.0.12101004
> System Description: Ubuntu 22.04.3 LTS
> 
> Configured using:
>  'configure --prefix=/usr/local --with-modules --with-tree-sitter
> --with-threads --with-x-toolkit=gtk3 --with-xwidgets --with-gnutls
> --with-json --with-mailutils --with-jpeg --with-png --with-rsvg
> --with-tiff --with-xml2 --with-xpm --with-imagemagick CC=gcc-12
> CXX=gcc-12'

Thanks.

I updated the commit message to include the bug number and
match the format used in Emacs.

From db7655ef2dbcd68ef259dad1118fd21f152dd05a Mon Sep 17 00:00:00 2001
From: nverno <[email-masked]>
Date: Sun, 12 Nov 2023 11:36:09 -0800
Subject: [PATCH] Fix font-lock for string escapes in lua-ts-mode

* lua-ts-mode.el (lua-ts--font-lock-settings): Apply font-lock
to the entire string containing an escape sequence. (Bug#67135)
---
 lisp/progmodes/lua-ts-mode.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index 2193779b759..bb6d5cb8c91 100644
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -148,10 +148,6 @@ lua-ts--font-lock-settings
    :feature 'delimiter
    '(["," ";"] @font-lock-delimiter-face)
 
-   :language 'lua
-   :feature 'escape
-   '((escape_sequence) @font-lock-escape-face)
-
    :language 'lua
    :feature 'constant
    '((variable_list
@@ -213,6 +209,11 @@ lua-ts--font-lock-settings
    :feature 'string
    '((string) @font-lock-string-face)
 
+   :language 'lua
+   :feature 'escape
+   :override t
+   '((escape_sequence) @font-lock-escape-face)
+
    :language 'lua
    :feature 'comment
    '((comment) @font-lock-comment-face
-- 
2.41.0