From unknown Wed Jun 18 23:09:58 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#75764 <75764@debbugs.gnu.org> To: bug#75764 <75764@debbugs.gnu.org> Subject: Status: 30.0.50; [PATCH] java-ts-mode: Constant highlighting no longer captures Java annotations. Reply-To: bug#75764 <75764@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:09:58 +0000 retitle 75764 30.0.50; [PATCH] java-ts-mode: Constant highlighting no longe= r captures Java annotations. reassign 75764 emacs submitter 75764 Vincenzo Pupillo severity 75764 normal tag 75764 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 22 10:38:46 2025 Received: (at submit) by debbugs.gnu.org; 22 Jan 2025 15:38:46 +0000 Received: from localhost ([127.0.0.1]:35960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tacoX-0000b6-S4 for submit@debbugs.gnu.org; Wed, 22 Jan 2025 10:38:46 -0500 Received: from lists.gnu.org ([2001:470:142::17]:37106) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tacoV-0000am-2C for submit@debbugs.gnu.org; Wed, 22 Jan 2025 10:38:44 -0500 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 1tacoI-0003d4-03 for bug-gnu-emacs@gnu.org; Wed, 22 Jan 2025 10:38:30 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tacoE-0003aw-Uo for bug-gnu-emacs@gnu.org; Wed, 22 Jan 2025 10:38:28 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-438a39e659cso29899055e9.2 for ; Wed, 22 Jan 2025 07:38:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737560303; x=1738165103; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=PKxTyAHOdqHCn5va3KdfixrUARpLC2Cc9X4mEdBHlVM=; b=SXw1xH9xF3NU5+Y5MHs142j8H/gQkqv06JNYfm4lq/EJ5va746Mi29/YqYJhXLjoz1 NyghxiJEudhvsPTdhsmfvcN56hOMPNRKOb1lzfCZCEKs08Gg/TivsmijPjbFZ/iX52SA NNWMPPh6U5/EjYaxmsVtkHC13iSjqbXzugYJbQRUfC4/G2x8WaPCpVFaHc0rDk2GKrk5 EBY6N3+UyuNgbgF5Fo2qM8kBGDzaqlXLwjsgHJfthpUeOQuXLBblUtiUw5HorJ9Qzzq0 rx3RmHL5W1ckOKOVRQHBOk45ajlgu8tvOJa3wMu384njaSoY93cqpmWCQnZ9aP0cMx2e /Q8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737560303; x=1738165103; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PKxTyAHOdqHCn5va3KdfixrUARpLC2Cc9X4mEdBHlVM=; b=fv2xDP1JhujJxCyswOJp79wZNs7JbFPdWTU+rh9J24NXTcdQil1mSoVOBaS6jYKW2z 9uUpo4rcwkfdS6ZNZFVo52lCCDN9KyD+CLVOsMyJ+QzLae3GH2myenNZXOcnzzdwHw+b zGV47DF66Mfz4361rjVEp34kN0fMRDz40QltTlDsprXPoIdHuvXYBNZRto+++fJHx5la N269e9qNcQqfa7vqu3eUln0upWRNE2ZHBkZ/SzG4zLqyeMdoSITSxmS1g6x8p+tnHA7v +887N3CZOrqHTfoikFFfxrmQD+c44mBti10R887K7nth6h4k/+tefo/H7iXIu71DztYl M/3A== X-Gm-Message-State: AOJu0Yxn6Sov9+9iAKy9BfLqXF/Eo3bidTubIjVrK7nQwzreDJHRTr9C AXrm5CrocbZBYy6oUeTj1SRdYDNeUad89WERp/OCj23yVOTN9k+BBSbRaQ== X-Gm-Gg: ASbGncuewSUkCzV73550wjyrzIVw2/48dx9Ah+S7WSmc47UN5QE0U53bxWU4RUnHe0G LlpmoY6b5IOSnKzxPGSova/BDr8jGD6e7B3qve9WjkafHAoK7zgY1yrsIURejvXHgPDxNmpX+ZN NmrVSOnYZERTPr/NUqYXuDR4ROwLBS2CMSoyLG6oWS7csNw2qCflyFKPeH2BiUKmfDE5DfLBpSI 2SHm6vuyNazkMq2xHxqYC5tVtwLVoPqtWHkZE8bKMVhpiWcb3Ii9yGEuTB03jXHzuTIYpV+GKfZ ZLcU4pfXRDZ3qXl2DCf9q/S9uYE3yloQuA== X-Google-Smtp-Source: AGHT+IGMhuljjKg/P1ljYCdA57klNVJA3DayLFDpslgn8Kl214d5Ha7cdLHRf7g0K5TkbqqYaP+iMQ== X-Received: by 2002:a05:600c:138a:b0:434:9d62:aa23 with SMTP id 5b1f17b1804b1-4389142e88dmr184864445e9.20.1737560303005; Wed, 22 Jan 2025 07:38:23 -0800 (PST) Received: from fedora.localnet (2-230-139-124.ip202.fastwebnet.it. [2.230.139.124]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438b31adcc3sm29702695e9.18.2025.01.22.07.38.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2025 07:38:22 -0800 (PST) From: Vincenzo Pupillo To: bug-gnu-emacs@gnu.org Subject: 30.0.50; [PATCH] java-ts-mode: Constant highlighting no longer captures Java annotations. Date: Wed, 22 Jan 2025 16:38:20 +0100 Message-ID: <2718942.lGaqSPkdTl@fedora> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart2533204.XAFRqVoOGU" Content-Transfer-Encoding: 7Bit Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=v.pupillo@gmail.com; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This is a multi-part message in MIME format. --nextPart2533204.XAFRqVoOGU Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Ciao, the attached patch fixes a problem with highlighting constants in java-ts mode. Annotations such as @GET were previously being captured by the regular expression used for constants. The patch can be safely applied to Emacs 31. Thanks. Vincenzo --nextPart2533204.XAFRqVoOGU Content-Disposition: attachment; filename="0001-Constant-highlighting-no-longer-captures-Java-annota.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0001-Constant-highlighting-no-longer-captures-Java-annota.patch" >From 82e2e6d1d8827f9ed811760e3b08fb637b33f958 Mon Sep 17 00:00:00 2001 From: Vincenzo Pupillo Date: Wed, 22 Jan 2025 16:14:41 +0100 Subject: [PATCH] Constant highlighting no longer captures Java annotations. * lisp/progmodes/java-ts-mode.el (java-ts-mode--fontify-constant): New function. (java-ts-mode--font-lock-settings): Use it. --- lisp/progmodes/java-ts-mode.el | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el index 6823cb4f38a..849ab23ef3e 100644 --- a/lisp/progmodes/java-ts-mode.el +++ b/lisp/progmodes/java-ts-mode.el @@ -164,6 +164,23 @@ java-ts-mode--string-highlight-helper (error `((string_literal) @font-lock-string-face)))) +(defun java-ts-mode--fontify-constant (node override start end &rest _) + "Fontify a Java constant. +In Java the names of variables declared class constants and of ANSI +constants should be all uppercase with words separated by underscores. +This function also prevents annotations from being highlighted as if +they were constants. +For NODE, OVERRIDE, START, and END, see `treesit-font-lock-rules'." + (let ((node-start (treesit-node-start node)) + (case-fold-search nil)) + (when (and + (not (equal (char-before node-start) ?@)) ;; skip annotations + (string-match "\\`[A-Z_][0-9A-Z_]*\\'" (treesit-node-text node))) + (treesit-fontify-with-override + node-start (treesit-node-end node) + 'font-lock-constant-face override + start end)))) + (defvar java-ts-mode--font-lock-settings (treesit-font-lock-rules :language 'java @@ -174,8 +191,7 @@ java-ts-mode--font-lock-settings :language 'java :override t :feature 'constant - `(((identifier) @font-lock-constant-face - (:match "\\`[A-Z_][0-9A-Z_]*\\'" @font-lock-constant-face)) + `((identifier) @java-ts-mode--fontify-constant [(true) (false)] @font-lock-constant-face) :language 'java :override t -- 2.48.1 --nextPart2533204.XAFRqVoOGU-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 25 05:45:39 2025 Received: (at 75764) by debbugs.gnu.org; 25 Jan 2025 10:45:39 +0000 Received: from localhost ([127.0.0.1]:48693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tbdfX-00057v-CT for submit@debbugs.gnu.org; Sat, 25 Jan 2025 05:45:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41808) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tbdfV-00057a-24 for 75764@debbugs.gnu.org; Sat, 25 Jan 2025 05:45:37 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tbdfP-0001LU-Ed; Sat, 25 Jan 2025 05:45:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=k4gcocf4Klmo4ldK2rrN0yfmCulLFH2608sn1tm22sg=; b=VjeKB1I/osED Nnb3ZWyk8QzV3uPY/jmIpjqogZIpbNRLPYCGJbskrn9v7eAdqM/VlQ9mH3lIKQQlMv91GAJ+qYesb VRxiYpXQzC/ZYYWYvafP4W46PH8Pgrm8QkPGbeZ2HwNnU92UyciOQbYuaD1OlfjOKwsLom9qPKV4f yzuahBmwArXuqFoglyF9+acksagHx/BSo0dmne5mEuktjDqqdIfH1C36ikGdp4o5J63n0nJFumsKv JbnETmeCX8z0TG4bqxfSmohxJCebo2QJxlbyxkO9gR/9+Off8VtppvN57l6SGYxhighZ8ZbvcPPEp L0M0DyyLZxv6+yqdL0/c8Q==; Date: Sat, 25 Jan 2025 12:45:29 +0200 Message-Id: <86msffuq7q.fsf@gnu.org> From: Eli Zaretskii To: Vincenzo Pupillo , Yuan Fu , Theodor Thornhill In-Reply-To: <2718942.lGaqSPkdTl@fedora> (message from Vincenzo Pupillo on Wed, 22 Jan 2025 16:38:20 +0100) Subject: Re: bug#75764: 30.0.50; [PATCH] java-ts-mode: Constant highlighting no longer captures Java annotations. References: <2718942.lGaqSPkdTl@fedora> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75764 Cc: 75764@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Vincenzo Pupillo > Date: Wed, 22 Jan 2025 16:38:20 +0100 > > Ciao, > the attached patch fixes a problem with highlighting constants in java-ts > mode. Annotations such as @GET were previously being captured by the regular > expression used for constants. > The patch can be safely applied to Emacs 31. > > Thanks. > > Vincenzo Yuan and Theo, any comments? > >From 82e2e6d1d8827f9ed811760e3b08fb637b33f958 Mon Sep 17 00:00:00 2001 > From: Vincenzo Pupillo > Date: Wed, 22 Jan 2025 16:14:41 +0100 > Subject: [PATCH] Constant highlighting no longer captures Java annotations. > > * lisp/progmodes/java-ts-mode.el > (java-ts-mode--fontify-constant): New function. > (java-ts-mode--font-lock-settings): Use it. > --- > lisp/progmodes/java-ts-mode.el | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) > > diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el > index 6823cb4f38a..849ab23ef3e 100644 > --- a/lisp/progmodes/java-ts-mode.el > +++ b/lisp/progmodes/java-ts-mode.el > @@ -164,6 +164,23 @@ java-ts-mode--string-highlight-helper > (error > `((string_literal) @font-lock-string-face)))) > > +(defun java-ts-mode--fontify-constant (node override start end &rest _) > + "Fontify a Java constant. > +In Java the names of variables declared class constants and of ANSI > +constants should be all uppercase with words separated by underscores. > +This function also prevents annotations from being highlighted as if > +they were constants. > +For NODE, OVERRIDE, START, and END, see `treesit-font-lock-rules'." > + (let ((node-start (treesit-node-start node)) > + (case-fold-search nil)) > + (when (and > + (not (equal (char-before node-start) ?@)) ;; skip annotations > + (string-match "\\`[A-Z_][0-9A-Z_]*\\'" (treesit-node-text node))) > + (treesit-fontify-with-override > + node-start (treesit-node-end node) > + 'font-lock-constant-face override > + start end)))) > + > (defvar java-ts-mode--font-lock-settings > (treesit-font-lock-rules > :language 'java > @@ -174,8 +191,7 @@ java-ts-mode--font-lock-settings > :language 'java > :override t > :feature 'constant > - `(((identifier) @font-lock-constant-face > - (:match "\\`[A-Z_][0-9A-Z_]*\\'" @font-lock-constant-face)) > + `((identifier) @java-ts-mode--fontify-constant > [(true) (false)] @font-lock-constant-face) > :language 'java > :override t > -- > 2.48.1 > From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 27 20:35:53 2025 Received: (at 75764) by debbugs.gnu.org; 28 Jan 2025 01:35:53 +0000 Received: from localhost ([127.0.0.1]:34968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tcaW8-0006eg-KM for submit@debbugs.gnu.org; Mon, 27 Jan 2025 20:35:53 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:60710) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tcaW4-0006eS-Ds for 75764@debbugs.gnu.org; Mon, 27 Jan 2025 20:35:50 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-21654fdd5daso86873155ad.1 for <75764@debbugs.gnu.org>; Mon, 27 Jan 2025 17:35:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738028142; x=1738632942; darn=debbugs.gnu.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=AsQ/JiOTge8SE+UfyxGvutEAjBVrnl981nLWHAe56aU=; b=ksMqelNg9MEkl+qzm/9T+UQoLo16sLUodiRUaQHs371rCOoxLXG3lG6wfO7Km/8LcU XFv4UTafbFpFkes3FGlCvwTUaAaxEbJStTB2i6zH0VqfUNn7J2vvR5UEhPxfVYzqDVB9 yRbkLdHfTntXHapsjslmh5U7welEmze7qmTkAwdoEbhBxHLukCKYpE3Gh6MubeW4EW3N JUNmWwHejoBoBnn2/Joi3y/1HSQ22B6BgRWMu64IEm4gfDx/LvxuLisj2wM/PFJEH+sY 31Kd4O7PmC5tSaO0gxnE5AJ+yTN1oEVag2BCGQy2N3CS2w1NjgKwbGalSG9tikeR35pU 05nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738028142; x=1738632942; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AsQ/JiOTge8SE+UfyxGvutEAjBVrnl981nLWHAe56aU=; b=UUI2QdKAOFkfxzBsv8x/gcaACt/iez/LqkputYetk6ILyYcu6w1CySKVRj4v2cd1Mb CL42xmexKfB8PpDpaanquERhqVbng0xeDLTe3MNbjDRcPN6OO6cWD2zE/DvBxgIstTLv gKGuhQUgDQDVPCD1hCRnKAm9asCnQvQBeOE2gl0LWTrXp9SNDJPsFWTSHYn6sp3k8IMB EGfupfJdhvr1azZWNyE28gHDTWpUTk5MpKbS0aUm7RHkPiQQyJiBt2dk6F6bjv8GE6HU mXfB1uhqNExpo2cahcgSrRQF2GE4aYC2/kS9fv+LrydXvFP0s4uWQdhd82XUpV4gazml 4E2w== X-Forwarded-Encrypted: i=1; AJvYcCU6moBcuSuZ2WGI8HBzPq2cKZ9bBkqd+L2SeO9/27wF2iGk/LoJgBVwOJKRs5Who2VJWJ7Dfg==@debbugs.gnu.org X-Gm-Message-State: AOJu0YxcrhZDYctCgLcWOFCZvx+0y6QUApP83E1zxZYXNLki3s2qArYT bkj9T8+Sn3fvdMRk+ZTBEeeU2ZJ9NBUy1zEw8rV2oVv2wglQgrqa X-Gm-Gg: ASbGncudQP7kdpfQvCP1kS6SPzUjFim3Eq7DwnCwFJa5vw+jQOpb2vnf50vtO8OqEy/ SbVj9Y18XM6Dcc957YpGxYmmGS6e6LZ6tni8GZd1vK4x1ZqAtBeAEojolHYDFk3z87/G7+LPJQq SfzL1kjmT5fdRQ0vnD5Uy7OZCDn4S3LpwJSPHGNhKU6mfpA3F4KmKWxWeILo6fLRs/7GoOsty93 VjVv/r6TwaBshjuUkLdmv71+j9tpR4bOafkt+1zHZHdd4OtOahAUuADsH07RI+0crUTE3+WypWI HXeWbjT9zGk8BWjyNWWcrYchMrPV X-Google-Smtp-Source: AGHT+IGEZxAmGvvFDZDQ399/SYOHH6Vyq4TETu9d4jBswB2y4/xZa6H3bMnpSKOSbGw0KR+rAl8liA== X-Received: by 2002:a17:902:ce01:b0:215:aae1:40f0 with SMTP id d9443c01a7336-21c34cc0d1emr704862865ad.0.1738028142257; Mon, 27 Jan 2025 17:35:42 -0800 (PST) Received: from smtpclient.apple ([2601:646:8f81:6120:954a:ef64:25ce:1e3c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da3be23a9sm71187995ad.0.2025.01.27.17.35.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jan 2025 17:35:41 -0800 (PST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3776.700.51\)) Subject: Re: bug#75764: 30.0.50; [PATCH] java-ts-mode: Constant highlighting no longer captures Java annotations. From: Yuan Fu In-Reply-To: <86msffuq7q.fsf@gnu.org> Date: Mon, 27 Jan 2025 17:35:30 -0800 Content-Transfer-Encoding: quoted-printable Message-Id: References: <2718942.lGaqSPkdTl@fedora> <86msffuq7q.fsf@gnu.org> To: Eli Zaretskii X-Mailer: Apple Mail (2.3776.700.51) X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 75764 Cc: 75764@debbugs.gnu.org, Vincenzo Pupillo , Theodor Thornhill X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > On Jan 25, 2025, at 2:45=E2=80=AFAM, Eli Zaretskii = wrote: >=20 >> From: Vincenzo Pupillo >> Date: Wed, 22 Jan 2025 16:38:20 +0100 >>=20 >> Ciao, >> the attached patch fixes a problem with highlighting constants in = java-ts=20 >> mode. Annotations such as @GET were previously being captured by the = regular=20 >> expression used for constants.=20 >> The patch can be safely applied to Emacs 31. >>=20 >> Thanks. >>=20 >> Vincenzo >=20 > Yuan and Theo, any comments? >=20 >>> =46rom 82e2e6d1d8827f9ed811760e3b08fb637b33f958 Mon Sep 17 00:00:00 = 2001 >> From: Vincenzo Pupillo >> Date: Wed, 22 Jan 2025 16:14:41 +0100 >> Subject: [PATCH] Constant highlighting no longer captures Java = annotations. >>=20 >> * lisp/progmodes/java-ts-mode.el >> (java-ts-mode--fontify-constant): New function. >> (java-ts-mode--font-lock-settings): Use it. >> --- >> lisp/progmodes/java-ts-mode.el | 20 ++++++++++++++++++-- >> 1 file changed, 18 insertions(+), 2 deletions(-) >>=20 >> diff --git a/lisp/progmodes/java-ts-mode.el = b/lisp/progmodes/java-ts-mode.el >> index 6823cb4f38a..849ab23ef3e 100644 >> --- a/lisp/progmodes/java-ts-mode.el >> +++ b/lisp/progmodes/java-ts-mode.el >> @@ -164,6 +164,23 @@ java-ts-mode--string-highlight-helper >> (error >> `((string_literal) @font-lock-string-face)))) >>=20 >> +(defun java-ts-mode--fontify-constant (node override start end &rest = _) >> + "Fontify a Java constant. >> +In Java the names of variables declared class constants and of ANSI >> +constants should be all uppercase with words separated by = underscores. >> +This function also prevents annotations from being highlighted as if >> +they were constants. >> +For NODE, OVERRIDE, START, and END, see `treesit-font-lock-rules'." >> + (let ((node-start (treesit-node-start node)) >> + (case-fold-search nil)) >> + (when (and >> + (not (equal (char-before node-start) ?@)) ;; skip annotations >> + (string-match "\\`[A-Z_][0-9A-Z_]*\\'" (treesit-node-text node))) >> + (treesit-fontify-with-override >> + node-start (treesit-node-end node) >> + 'font-lock-constant-face override >> + start end)))) >> + >> (defvar java-ts-mode--font-lock-settings >> (treesit-font-lock-rules >> :language 'java >> @@ -174,8 +191,7 @@ java-ts-mode--font-lock-settings >> :language 'java >> :override t >> :feature 'constant >> - `(((identifier) @font-lock-constant-face >> - (:match "\\`[A-Z_][0-9A-Z_]*\\'" @font-lock-constant-face)) >> + `((identifier) @java-ts-mode--fontify-constant >> [(true) (false)] @font-lock-constant-face) >> :language 'java >> :override t >> --=20 >> 2.48.1 >>=20 Seems reasonable to me. Tree-sitter=E2=80=99s query doesn=E2=80=99t = support negation match, so we can=E2=80=99t match constants that are not = annotations. But I don=E2=80=99t want these fixes to delay emacs 30 = (they will keep coming), so perhaps we can apply this to emacs-30 after = release, WDYT, Eli? Yuan= From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 28 07:43:12 2025 Received: (at 75764) by debbugs.gnu.org; 28 Jan 2025 12:43:13 +0000 Received: from localhost ([127.0.0.1]:35860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tckvw-0000hc-Hx for submit@debbugs.gnu.org; Tue, 28 Jan 2025 07:43:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56892) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tckvt-0000hL-7I for 75764@debbugs.gnu.org; Tue, 28 Jan 2025 07:43:10 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tckvk-00043M-Jm; Tue, 28 Jan 2025 07:43:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=K9364D3KLbSx0/Y78zc4Wgy2ojQPdOff/t6g3ZOoR5g=; b=nxeaelmfFbTxmfXvc3Vv tozJ3RMf0HeNwEEkc2cwRmtNKfknv9ELdeqYOKZKkqmRUo59C6kjzqOZJAWRK/eaeU4KCysfOGJY9 5VHHa4ImL1OxmyhVa2bEI14wYaqqZqS6QiXsVkDp6jdTi6bZPqSSGAslS6T6zx/lvj1oLV0QrMaTM qyEBt27d8pH865E8oHYE38e157A6A+fLTsr78IMUQDIc8pKSKLUdtOoHLdZY6DKCFfq5MvmS0Ajfb BUwfYRJ8zQzuvAs+mVRPnCWWLFV/W4PEN7MfyU2TotcmTNryK/31ME3b5J8a0ty1UczAcOK7PX/4p onoSYkneTUBbRg==; Date: Tue, 28 Jan 2025 14:42:55 +0200 Message-Id: <86frl3nm7k.fsf@gnu.org> From: Eli Zaretskii To: Yuan Fu In-Reply-To: (message from Yuan Fu on Mon, 27 Jan 2025 17:35:30 -0800) Subject: Re: bug#75764: 30.0.50; [PATCH] java-ts-mode: Constant highlighting no longer captures Java annotations. References: <2718942.lGaqSPkdTl@fedora> <86msffuq7q.fsf@gnu.org> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75764 Cc: 75764@debbugs.gnu.org, v.pupillo@gmail.com, theo@thornhill.no X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Yuan Fu > Date: Mon, 27 Jan 2025 17:35:30 -0800 > Cc: Vincenzo Pupillo , > Theodor Thornhill , > 75764@debbugs.gnu.org > > Seems reasonable to me. Tree-sitter’s query doesn’t support negation match, so we can’t match constants that are not annotations. But I don’t want these fixes to delay emacs 30 (they will keep coming), so perhaps we can apply this to emacs-30 after release, WDYT, Eli? Fine by me, thanks. From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 11 02:18:02 2025 Received: (at control) by debbugs.gnu.org; 11 Feb 2025 07:18:02 +0000 Received: from localhost ([127.0.0.1]:53943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1thkWw-0002BP-7P for submit@debbugs.gnu.org; Tue, 11 Feb 2025 02:18:02 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:61928) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1thkWs-0002B1-Qe for control@debbugs.gnu.org; Tue, 11 Feb 2025 02:17:59 -0500 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5de4d3bbc76so6746648a12.3 for ; Mon, 10 Feb 2025 23:17:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739258272; x=1739863072; darn=debbugs.gnu.org; h=to:subject:message-id:date:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=PPX+0u2uDXtL9r4z9v7WP0YSKSw4N9nLb5TEoiVb1Ug=; b=UQXz+YO8va+uYJl8S//kT2Incuuzd5kNIPMEoqk1WwMh5K5IDrH034pcbOgz1jkl1A Gsdw1pBDKfvY0gZ2I8IRr8BxjWXfpGU52TdJiiRN3EV7e+3jwACp22GzVqUvskkMRSET YkwVxAic7BxruOvp2e86+RlnqOJj3pE/3uAV70rZHkEwlSYm8Wnuw0SDdJvi+VgQd8wF gI/f74ErnimXf6hqtQAnn6tgo3uedMlBMDPeb5VZSGd7ZzGuDQRZRNU5EgZYQ6UEg16J JU1b42oy1io4z5UvIzXQX1vqFVJfxPNRMZ2qiq4GsXgOORyI5vxAj8/sxTx3ezGgTXxh AW3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739258272; x=1739863072; h=to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PPX+0u2uDXtL9r4z9v7WP0YSKSw4N9nLb5TEoiVb1Ug=; b=Is0PszlAQ8p/TDi3H5QbEwMm4AZXy6vQkTY4v15k7zwgyvFXyygcfgqtfRQgtRjKm6 cNF6aSh7BIYmdP8i4px8Xv27hLK4p6LdNDjEeS5Sf4iQ5TYLHrs1YUVio8cGWa+zOhNs Nr5cdkHXFiPR0vGIEcF+zBKhBwnDSgMgDkNMkyLxePc9djr/edjkpKqFpc4zjGQhY10p PlU4nOAOKj5aRF5OBEM6lXftiaLeAvy0kSETArz/adr4l8rlzhWLvmSDEEjbsCnF0Uw8 UOlLp4KVsDPudsQQKzIgsRB5A09O08XBLv81ry5q4mICSIAMeizulm8OjiV1SfY19epW qcXA== X-Gm-Message-State: AOJu0YyI49uG75Df9wdgo6ApukF3L+yk2q6JIAFjUruvt132KaZJQJ4k QJhD8HClQp43EBI6Ae3S7h09UFvsQeY/m7Xxk1ebyEZ9syXVa1YAuvupWpyyNmMMZF032K0JYYb MKSlcAXziiYDLMAdrzqZJTHME/Lw/2NoMoXQ= X-Gm-Gg: ASbGncvoRxqHSSrOEbiwjYFf0UKg4G9j34QmYDgmxAcspnxdIMfnd6sBRPao4rDljy5 7TgLY2e1o/ynRfBk5N9S3BJZcOT5LU06MnTjzddPGRkOiyEkZnFSZ5BYOAcr0FZt3bJBE6FXmpw == X-Google-Smtp-Source: AGHT+IETyvssxJsiGeQNBa5wWDtvk+HjcBKHlNorECC7PYgZc94gPAFvlvMPTCd0vQd9XFQVd7o2csWIuCA0pQW7u4g= X-Received: by 2002:a05:6402:3907:b0:5d0:b925:a8a with SMTP id 4fb4d7f45d1cf-5de45019b56mr16915226a12.16.1739258272449; Mon, 10 Feb 2025 23:17:52 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 10 Feb 2025 23:17:51 -0800 From: Stefan Kangas MIME-Version: 1.0 Date: Mon, 10 Feb 2025 23:17:51 -0800 X-Gm-Features: AWEUYZm-ejVYUQOIC1RQo34n9FrmSx0W43KYXkd6JHI-_EsfaP6XexIZqBTUwag Message-ID: Subject: control message for bug #75764 To: control@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 75764 + pending quit From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 23 14:49:12 2025 Received: (at 75764-done) by debbugs.gnu.org; 23 Feb 2025 19:49:12 +0000 Received: from localhost ([127.0.0.1]:36239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmHyS-00030e-Ap for submit@debbugs.gnu.org; Sun, 23 Feb 2025 14:49:12 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:61490) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmHyP-00030Q-94 for 75764-done@debbugs.gnu.org; Sun, 23 Feb 2025 14:49:10 -0500 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5dec817f453so6128401a12.2 for <75764-done@debbugs.gnu.org>; Sun, 23 Feb 2025 11:49:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740340143; x=1740944943; darn=debbugs.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date :mime-version:references:in-reply-to:from:from:to:cc:subject:date :message-id:reply-to; bh=G8TKgllyf/kFyjKFMNGp2IHRvSrLNOox5Pbr6iaCaYM=; b=MEYUbgyaPTHdthKLydSuNsdlUGGvAyMQ+Hegyd6kjV6y8sGd7H0zA+UjA9Gvs90ijx VNd13mgDiZB29aITvsMnIFRR8KxdpESn9C5zFEOUgNkARuYONxChEExtWS955zJKkMlt poymdWeea4cu4mP6WwpfdHgXBiPAnXxCX9WMtACbQxjLpl49PFP7jEcODnFbptOTIqdm mEiV5EftaUDqlj3E5Alu5B2m9GRWFgwomEzk93qso8usR3SADDz4kjA22c7wkECpfLfr 2pKOZeDCQ3lNarck0/nuH5oHwjNcnlUkA+fCUBHGubrneB2rXHsLcOgjQaL0Y/i47ciC 72sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740340143; x=1740944943; h=content-transfer-encoding:cc:to:subject:message-id:date :mime-version:references:in-reply-to:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=G8TKgllyf/kFyjKFMNGp2IHRvSrLNOox5Pbr6iaCaYM=; b=Wqc8eg6o2+nGEAqP9fbHJu9KQLX5+VhC9eB6rspPQ+KlHbkjn5qoCuI9SPlUFvqVSn A54NfaZpa56mcN04sUnbeitGzadZ7hHuZ5pZ24u4NJ9uSf8Q11F9ZoFEiStFYYPbtLax AlRk9Hm4/kv1cRHGpvfPCN+/l93FaMdK68ajYG2Injs5nZPpD8VeHl5TTkJPTTfWFPs3 0wjx+/BKYmkd62qTU3d2+mmjWOnmB8m+MCK3ZG+Cs0hd2lldMUeKXWPHVJJxDjcC1IOG 79pAENkO/K1boRP1LdBB3BgPjnFPHtZS0PjGxpp5+W0C0qiz/5gAjKGF8ewOxfD2fU8c 6qqg== X-Forwarded-Encrypted: i=1; AJvYcCWtD8PsIabby8hzExRAqCwN6cm4FCEgdjWhEprPXtExkZ00giBwzCqryK7Ufix6ej4HegLYR+q6IvGU@debbugs.gnu.org X-Gm-Message-State: AOJu0Yyhjp+MH13BZJsAkQddN6P7WtqEvObscQTrVFxX6lXnqhY7NhRR ADksHKl8mIBtNyo+sSp/eRb1m03zugYvOi1MqIwEjaXS/rEss75ORPmO0NBEIp+cIeBMESuFBry V78elIUkWB5Uy4ssAefIC/Fw2T98= X-Gm-Gg: ASbGncs/OWGduoXrjiE7XUdxQ6b292+02iHyHsboJXoalzKpZP2e435vzoXwLS8pjPi IF8EOEnHj/da7EN3mB8Z0Bu7BgzY10uxPfaU71N8u1KqJz6nQXYb/pu2leNbriYM0297lV4LdZa 5Rg8RL9Mt8 X-Google-Smtp-Source: AGHT+IF4XZ0aDWOfRejIo+0hPBHd+y6oOfdXNLAuWj+YrRpnLs4+4SiqaZrlaIsYPAtwmivsizt34RoCQWx31heZbE4= X-Received: by 2002:a05:6402:2682:b0:5de:dd31:1fad with SMTP id 4fb4d7f45d1cf-5e0b70cd051mr10441219a12.6.1740340142902; Sun, 23 Feb 2025 11:49:02 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 23 Feb 2025 19:49:01 +0000 From: Stefan Kangas In-Reply-To: <86frl3nm7k.fsf@gnu.org> References: <2718942.lGaqSPkdTl@fedora> <86msffuq7q.fsf@gnu.org> <86frl3nm7k.fsf@gnu.org> MIME-Version: 1.0 Date: Sun, 23 Feb 2025 19:49:01 +0000 X-Gm-Features: AWEUYZmEGT7KZfHhJQ6JZ2j3nZf-HdXIawEe4SrKPo4dPNl0SUCY4N7wNoogo78 Message-ID: Subject: Re: bug#75764: 30.0.50; [PATCH] java-ts-mode: Constant highlighting no longer captures Java annotations. To: Eli Zaretskii Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75764-done Cc: Yuan Fu , v.pupillo@gmail.com, theo@thornhill.no, 75764-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Version: 30.2 Eli Zaretskii writes: >> From: Yuan Fu >> Date: Mon, 27 Jan 2025 17:35:30 -0800 >> Cc: Vincenzo Pupillo , >> Theodor Thornhill , >> 75764@debbugs.gnu.org >> >> Seems reasonable to me. Tree-sitter=E2=80=99s query doesn=E2=80=99t supp= ort negation match, so >> we can=E2=80=99t match constants that are not annotations. But I don=E2= =80=99t want these >> fixes to delay emacs 30 (they will keep coming), so perhaps we can apply= this >> to emacs-30 after release, WDYT, Eli? > > Fine by me, thanks. Since Emacs 30.1 is now released, I have pushed this to emacs-30 as commit 563b6f94511. I'm therefore closing this bug report. From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 23 19:04:20 2025 Received: (at 75764-done) by debbugs.gnu.org; 24 Feb 2025 00:04:20 +0000 Received: from localhost ([127.0.0.1]:37422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmLxM-0001dd-5R for submit@debbugs.gnu.org; Sun, 23 Feb 2025 19:04:20 -0500 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:51692) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmLxI-0001d9-4y for 75764-done@debbugs.gnu.org; Sun, 23 Feb 2025 19:04:17 -0500 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-2fa5af6d743so5868860a91.3 for <75764-done@debbugs.gnu.org>; Sun, 23 Feb 2025 16:04:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740355450; x=1740960250; darn=debbugs.gnu.org; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:from:to:cc:subject:date:message-id :reply-to; bh=Ma7yIG4yzGtSauoQ+JFBHFlM+KODag1w9hPeYQXeqoA=; b=Hj2uKeIBcbGMOlPzlkT35MNAtuAeIJK2wb0x00fLA5CED8k6m9rjgLEFjX53iyLvH3 8R7ZekmalaTUZshlsIB1hoU5+dqMt4YeYJFTF/oDEQvQxJ7DD+j80OMGKE6wKzQGW7a9 X6moq9fwRdHjuxZs4mwZkjrAq7UX0Cpdo3k0QxPs7qJHsHkISxDvBZjVQz5/16M2exwn 8pc4OR+BXCTVsZ56scwHQ3VQcYts+tjusddh6c+GrHzHYDClsRfKJ548OUfYtRCDV9ug T9xDFPlD2TXbAz+6t7Op6pXgsSvkCn6KriLwKlUyGEbnPxjrXXP8cWW6Llj6apP4O8Wx vVtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740355450; x=1740960250; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ma7yIG4yzGtSauoQ+JFBHFlM+KODag1w9hPeYQXeqoA=; b=PInwTcebJOczl3ear5yCvvY1g/5oGY1VKb7ujeJDhuxOF1DaUYwze+LjJKnyi2PIRR WlxLHaT82uLHdHhkCLRSshcwrF1eAOElekaUhxw3fEIs4M0b5qFG5uik7CipxK/uvygP jAfeIFmwnE9q6ZnOz3BVxCQ+2Dc1l3VnBaxRT/eJy1V9NgdoCvMLpOcnyuWNoqNV7Oix +PbMu0SnfzpIV8tmF7pRA04OjjOO+NzCPbf40OtLLPhUwscPg5Yzv4FJhdIvko5dUnwi mNn6lNDVl04/mPNpdlOdcRL/COPq0kHEMGoHouVmC9tLgmBevyrAM8S7TLZqwlez/LmU xHkQ== X-Forwarded-Encrypted: i=1; AJvYcCUAi1O827znz4aiVU/4F8Q73/WcoET9bfqb9cWsg9gHZ1uILwdTVY6AWANCoaixThZ2OHLhN4brXUSo@debbugs.gnu.org X-Gm-Message-State: AOJu0YyhdNvaAkxAAGmgqM0pw0Ch6RYmcKgvb1cPzRXSQkE8BvgE2LtN 1uAAApM6qr3shebKO/geko3NzqtCs18lyOCwbp7w6llZ+09MLfP7 X-Gm-Gg: ASbGncshg48qCUsNavzcAasyGlUYUEUPDqgDYN0xCHzA/D2Qpp7aE1TDVYB1h1M6HL8 FZeNeZ75csMMxImadh6IqpZmo6RzyS2u0qpqtReFc8G5ks/0dh56d7TPDj75oysY0Rypbnnz6AL cyzQhh13ihc82BxwAcjvTBxgSGi+n7yR8guvVIlWAd4MQbEUJ4rzisiPMdtgLGfkV0luFSFNAuV NwPCnv6ILwzs4YySgfSlrHzSsjZQX0Sk1v5nNXTVzmItrs741RghuCvlVL00rju+m1Hr1AMToRT 19G2DMGHuNCzGQPLvPRiYPwvcPyhRxSYRmpeoBBhzjgsEahc0Rc= X-Google-Smtp-Source: AGHT+IEfOe2+MHcUJbjzm1TXfxDofkIdrw1zSbfqVT4qzmwB0NSozvP9tt+x3uc3F+Q9TAf4N3JO2w== X-Received: by 2002:a17:90b:53ce:b0:2f6:d266:f45e with SMTP id 98e67ed59e1d1-2fce789de66mr20228552a91.2.1740355449905; Sun, 23 Feb 2025 16:04:09 -0800 (PST) Received: from smtpclient.apple ([2607:fb91:1de5:21ea:6519:bea4:9357:a9b8]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d5367510sm169954235ad.83.2025.02.23.16.04.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 23 Feb 2025 16:04:09 -0800 (PST) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Fu Yuan Mime-Version: 1.0 (1.0) Subject: Re: bug#75764: 30.0.50; [PATCH] java-ts-mode: Constant highlighting no longer captures Java annotations. Date: Sun, 23 Feb 2025 16:03:57 -0800 Message-Id: References: In-Reply-To: To: Stefan Kangas X-Mailer: iPhone Mail (21E236) X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75764-done Cc: Eli Zaretskii , v.pupillo@gmail.com, theo@thornhill.no, 75764-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thanks! > =E5=9C=A8 2025=E5=B9=B42=E6=9C=8823=E6=97=A5=EF=BC=8C=E4=B8=8A=E5=8D=8811:= 49=EF=BC=8CStefan Kangas =E5=86=99=E9=81=93=EF=BC=9A= >=20 > =EF=BB=BFVersion: 30.2 >=20 > Eli Zaretskii writes: >=20 >>> From: Yuan Fu >>> Date: Mon, 27 Jan 2025 17:35:30 -0800 >>> Cc: Vincenzo Pupillo , >>> Theodor Thornhill , >>> 75764@debbugs.gnu.org >>>=20 >>> Seems reasonable to me. Tree-sitter=E2=80=99s query doesn=E2=80=99t supp= ort negation match, so >>> we can=E2=80=99t match constants that are not annotations. But I don=E2=80= =99t want these >>> fixes to delay emacs 30 (they will keep coming), so perhaps we can apply= this >>> to emacs-30 after release, WDYT, Eli? >>=20 >> Fine by me, thanks. >=20 > Since Emacs 30.1 is now released, I have pushed this to emacs-30 as > commit 563b6f94511. >=20 > I'm therefore closing this bug report. From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 24 01:58:46 2025 Received: (at 75764-done) by debbugs.gnu.org; 24 Feb 2025 06:58:46 +0000 Received: from localhost ([127.0.0.1]:38164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmSQP-00048U-KU for submit@debbugs.gnu.org; Mon, 24 Feb 2025 01:58:46 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:45168) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmSQM-00048B-IG for 75764-done@debbugs.gnu.org; Mon, 24 Feb 2025 01:58:43 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43aac0390e8so1082835e9.2 for <75764-done@debbugs.gnu.org>; Sun, 23 Feb 2025 22:58:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740380316; x=1740985116; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:references :in-reply-to:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=6BnDdkFo0306ReQGdFlmb2v1a+QzQ/tmx6/RUe6Jbx4=; b=RiTA2+gweo5N3ufIDdGd1pyrq14GoIg0MqqtmNUY/TxykDMQQKFfJhRDzM4kI4fGHe WYC1WQJ8IkHNvMiHHXF4yItd3iSld9sdzYz3gmVaP4bMUpacFy3xfhBME0Fu4TG/QY7N yGSc46np9VNZ8rxEVwawQuj3+V02rmigXPCs9OOxlA/X4M9wAvxSb8BDRvPo48K3JjFS dLgw437ubR8yfRQ6sO38LPm80JX/pXHEx1/8hG7kDb2uTnxrb6YZMzlrkHNuCd6bvUPq zuoOQk9Zzyxi5z0hDVmoE+S/v62tnnrSL6DLdsZzBOS/ILDKH8grsGCoEenz9GdEOqe2 TVAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740380316; x=1740985116; h=content-transfer-encoding:mime-version:message-id:references :in-reply-to:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6BnDdkFo0306ReQGdFlmb2v1a+QzQ/tmx6/RUe6Jbx4=; b=tkio8GmPN9Nqcn7NHkj4fDJ6jUT5yJhbVWhyATmgA1ZCXQS2JDqLeYhowoZCsviWxn rc2XT2JWIKPckz5Bi6qG/rD99zi2aJgGI2dkGqb2bz2I9Mq3w1B+17jSHmAdrdwaF8sb InwfHWGKkCWx8CGd6KYrXNtryN7Ya2tKUeKSTVKZnB0A5j9GRgXhWQnomjEsJQpmrDFx fvxRv2MszX/S2D2QqPqXERmjBZFG9kwy2a+RHf9MsJTDS39bmJWSjog5Nl4pxsJJBjni 9kYQSWLoUY2l65ftB8aUe6EjwTX0x9VF8Nfkpv5hVTtXnhYdGssEH+LMph5hfhqYRikX Eq6w== X-Forwarded-Encrypted: i=1; AJvYcCVc5VDxPeUNLiwukn0DwId3Xb4gL+srby8kKUAHQsUTep51z2KdMAp2E2tlXLLAXN+vsa+jGbruE4Vh@debbugs.gnu.org X-Gm-Message-State: AOJu0Yx5GFZNuwGd+zr6pborgFECJHAJnwKMYAIkfidOiwq6j5MWJaAS EckmX6o6OUiILUeGMTKOUkeBs5DY/uEknnfuSrFU9p3jJKGHO52F X-Gm-Gg: ASbGncuVRLRCiQkmL1Ndz4vuXHDOVRBU1x0rAn9AEFCok0TYqwz7FT8Njwsfz7hUrYe sDzt00VQ2Hla1BxkCAcIT7+OEWQsjsaK7I8CBoMrsMOHscZ4FK5Vcqes7ZvTa7ICBHtLCT//Sr9 Av9DldpN1mt7NcTYGxF6TNz4tveIhPIxn1IWfqHIMjUB6E6aiUM/Uh09c0FmYfrzvu5nfn0joXJ vFS/ycROhpDVNoT/8U5jHJomhocKFhayU+tZyj5aXxpOI8KJjeu3Byf8Dh80qR0ASH6WcXOEK6m 9EiWsbtrhfHib8yqwvPi5ADNcb29LRruoIdazFOtf46HwD/0uxd2KY16CPY= X-Google-Smtp-Source: AGHT+IFFzyJvcqb/RJFiwHQJeFgNatjBlFiFiK2MlDPfeYMLVoB7WdDjYgInhRlEyxrsciKSWvkTGA== X-Received: by 2002:a05:600c:1396:b0:439:88bb:d02d with SMTP id 5b1f17b1804b1-439ae1d9a2dmr101724285e9.2.1740380315961; Sun, 23 Feb 2025 22:58:35 -0800 (PST) Received: from [127.0.0.1] (2-230-139-124.ip202.fastwebnet.it. [2.230.139.124]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4399bf28c38sm87777965e9.2.2025.02.23.22.58.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 23 Feb 2025 22:58:35 -0800 (PST) Date: Mon, 24 Feb 2025 07:58:35 +0100 From: Vincenzo Pupillo To: Fu Yuan , Stefan Kangas Subject: =?US-ASCII?Q?Re=3A_bug=2375764=3A_30=2E0=2E50=3B_=5BP?= =?US-ASCII?Q?ATCH=5D_java-ts-mode=3A_Consta?= =?US-ASCII?Q?nt_highlighting_no_longer_captures_Java_annotations=2E?= In-Reply-To: References: Message-ID: <62E93B0F-BB35-4159-BC46-D45B5125FC08@gmail.com> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary=----O3LRP9EDGLOLX1ACNTW04BC9BJ8BQQ Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75764-done Cc: Eli Zaretskii , theo@thornhill.no, 75764-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) ------O3LRP9EDGLOLX1ACNTW04BC9BJ8BQQ Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Thank you both! Vincenzo=20 Il 24 febbraio 2025 01:03:57 CET, Fu Yuan ha scritto= : > >Thanks! > >> =E5=9C=A8 2025=E5=B9=B42=E6=9C=8823=E6=97=A5=EF=BC=8C=E4=B8=8A=E5=8D=88= 11:49=EF=BC=8CStefan Kangas =E5=86=99=E9=81=93= =EF=BC=9A >>=20 >> =EF=BB=BFVersion: 30=2E2 >>=20 >> Eli Zaretskii writes: >>=20 >>>> From: Yuan Fu >>>> Date: Mon, 27 Jan 2025 17:35:30 -0800 >>>> Cc: Vincenzo Pupillo , >>>> Theodor Thornhill , >>>> 75764@debbugs=2Egnu=2Eorg >>>>=20 >>>> Seems reasonable to me=2E Tree-sitter=E2=80=99s query doesn=E2=80=99t= support negation match, so >>>> we can=E2=80=99t match constants that are not annotations=2E But I do= n=E2=80=99t want these >>>> fixes to delay emacs 30 (they will keep coming), so perhaps we can ap= ply this >>>> to emacs-30 after release, WDYT, Eli? >>>=20 >>> Fine by me, thanks=2E >>=20 >> Since Emacs 30=2E1 is now released, I have pushed this to emacs-30 as >> commit 563b6f94511=2E >>=20 >> I'm therefore closing this bug report=2E ------O3LRP9EDGLOLX1ACNTW04BC9BJ8BQQ Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
Thank you both!

Vincenzo =


Il 24 febbraio 2= 025 01:03:57 CET, Fu Yuan <casouri@gmail=2Ecom> ha scritto:

Thanks!

=E5=9C=A8 2025=E5=
=B9=B42=E6=9C=8823=E6=97=A5=EF=BC=8C=E4=B8=8A=E5=8D=8811:49=EF=BC=8CStefan =
Kangas <stefankangas@gmail=2Ecom> =E5=86=99=E9=81=93=EF=BC=9A

=
=EF=BB=BFVersion: 30=2E2

Eli Zaretskii <eliz@gnu=2Eorg> writes=
:

From: Yuan Fu <c=
asouri@gmail=2Ecom>
Date: Mon, 27 Jan 2025 17:35:30 -0800
Cc: Vinc=
enzo Pupillo <v=2Epupillo@gmail=2Ecom>,
Theodor Thornhill <theo=
@thornhill=2Eno>,
75764@debbugs=2Egnu=2Eorg

Seems reasonable t=
o me=2E Tree-sitter=E2=80=99s query doesn=E2=80=99t support negation match,=
 so
we can=E2=80=99t match constants that are not annotations=2E But I d=
on=E2=80=99t want these
fixes to delay emacs 30 (they will keep coming),=
 so perhaps we can apply this
to emacs-30 after release, WDYT, Eli?
<=
/div>

Fine by me, thanks=2E

Since Emacs 30=2E1 is now released, I have p=
ushed this to emacs-30 as
commit 563b6f94511=2E

I'm therefore clo=
sing this bug report=2E
------O3LRP9EDGLOLX1ACNTW04BC9BJ8BQQ-- From unknown Wed Jun 18 23:09:58 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 24 Mar 2025 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator