From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 09 16:38:44 2022 Received: (at submit) by debbugs.gnu.org; 9 Dec 2022 21:38:44 +0000 Received: from localhost ([127.0.0.1]:38670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3l4u-000646-C7 for submit@debbugs.gnu.org; Fri, 09 Dec 2022 16:38:44 -0500 Received: from lists.gnu.org ([209.51.188.17]:58412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3l4t-000640-8E for submit@debbugs.gnu.org; Fri, 09 Dec 2022 16:38:43 -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 1p3l4s-0001K1-EN for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 16:38:43 -0500 Received: from out-67.mta0.migadu.com ([91.218.175.67]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3l4p-0007pw-Su for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 16:38:41 -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=1670621917; 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=m1r/FSJdnua5JRaIGJ8jbN9kHax+WK8pvwnN0KgCFW0=; b=woNz5BEwPAMC3X6NesHJoxwHdSLz1B69VROhST+/d3O4iXoorVUtzA5589H0sRv/rMPsib N8r8EMbNEdcr6iJgUtonbOHjts2sdBlmNrQwmpYL7QnM79+dtOvwoCO+IjpVdTDcz2TfTj MKRqDMS6UNwY6whuwE+3QIprnW3kWTUF8VTFtM3UIxS4Uvrf7Ck7u3cFaApcSBPHJ8HJyn scJdSIdoMf0QpP4zF+OcEgyes+Odq5XSwiKLiheYt1yPM3HcySKh5Ehf3Bf5+1Dj/nLjjY mf3X8yn+AXuhZfEmJPMGikrdTdDozX4QL0E7ZpmA+D6pZAMSIGLlc52aSbdvqg== From: Theodor Thornhill To: bug-gnu-emacs@gnu.org Subject: 30.0.50; [PATCH] Tweak various ts-modes indent and font-lock X-Debbugs-Cc: casouri@gmail.com Date: Fri, 09 Dec 2022 22:38:36 +0100 Message-ID: <87edt8i7fn.fsf@thornhill.no> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=91.218.175.67; envelope-from=theo@thornhill.no; helo=out-67.mta0.migadu.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) 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: -2.4 (--) --=-=-= Content-Type: text/plain Hi! Yet some more tweaks - please apply when you find some time :-) Theo --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Tweak-various-ts-modes-indent-and-font-lock.patch >From 88a9cc7d4e8407251976b07c9f03f32eabd3bfb7 Mon Sep 17 00:00:00 2001 From: Theodor Thornhill Date: Fri, 9 Dec 2022 22:36:03 +0100 Subject: [PATCH] Tweak various ts-modes indent and font-lock * lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Add raw string literal font-locking. * lisp/progmodes/java-ts-mode.el (java-ts-mode--indent-rules): Add text_block indent rule. (java-ts-mode--font-lock-settings): Add text_block font-locking. * lisp/progmodes/js.el (js-ts-mode): Prefer top-level navigation. * lisp/progmodes/json-ts-mode.el (json-ts-mode--font-lock-settings): Add comment feature. (json-ts-mode): Use comment feature. * lisp/progmodes/typescript-ts-mode.el (typescript-ts-base-mode): Prefer top-level navigation. --- lisp/progmodes/c-ts-mode.el | 4 +++- lisp/progmodes/java-ts-mode.el | 4 +++- lisp/progmodes/js.el | 1 + lisp/progmodes/json-ts-mode.el | 5 ++++- lisp/progmodes/typescript-ts-mode.el | 2 ++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index 7b41718a74..5976e94512 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -251,7 +251,9 @@ c-ts-mode--font-lock-settings :language mode :feature 'string `((string_literal) @font-lock-string-face - (system_lib_string) @font-lock-string-face) + (system_lib_string) @font-lock-string-face + ,@(when (eq mode 'cpp) + '((raw_string_literal) @font-lock-string-face))) :language mode :feature 'literal diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el index 23e166ee4c..d3d658c8b8 100644 --- a/lisp/progmodes/java-ts-mode.el +++ b/lisp/progmodes/java-ts-mode.el @@ -73,6 +73,7 @@ java-ts-mode--indent-rules ((node-is "]") parent-bol 0) ((and (parent-is "comment") comment-end) comment-start -1) ((parent-is "comment") comment-start-skip 0) + ((parent-is "text_block") no-indent) ((parent-is "class_body") parent-bol java-ts-mode-indent-offset) ((parent-is "interface_body") parent-bol java-ts-mode-indent-offset) ((parent-is "constructor_body") parent-bol java-ts-mode-indent-offset) @@ -162,7 +163,8 @@ java-ts-mode--font-lock-settings :language 'java :override t :feature 'string - `((string_literal) @font-lock-string-face) + `((string_literal) @font-lock-string-face + (text_block) @font-lock-string-face) :language 'java :override t :feature 'literal diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 45dfef372c..571938c8f0 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3868,6 +3868,7 @@ js-ts-mode ;; Indent. (setq-local treesit-simple-indent-rules js--treesit-indent-rules) ;; Navigation. + (setq-local treesit-defun-prefer-top-level t) (setq-local treesit-defun-type-regexp (rx (or "class_declaration" "method_definition" diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el index a118908a00..6fb982e37b 100644 --- a/lisp/progmodes/json-ts-mode.el +++ b/lisp/progmodes/json-ts-mode.el @@ -74,6 +74,9 @@ json-ts--indent-rules (defvar json-ts-mode--font-lock-settings (treesit-font-lock-rules + :language 'json + :feature 'comment + '((comment) @font-lock-comment-face) :language 'json :feature 'bracket '((["[" "]" "{" "}"]) @font-lock-bracket-face) @@ -161,7 +164,7 @@ json-ts-mode ;; Font-lock. (setq-local treesit-font-lock-settings json-ts-mode--font-lock-settings) (setq-local treesit-font-lock-feature-list - '((constant number pair string) + '((comment constant number pair string) (escape-sequence) (bracket delimiter error))) diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el index 243f6146ae..1dec357e4e 100644 --- a/lisp/progmodes/typescript-ts-mode.el +++ b/lisp/progmodes/typescript-ts-mode.el @@ -328,6 +328,8 @@ typescript-ts-base-mode (group (or (syntax comment-end) (seq (+ "*") "/"))))) + (setq-local treesit-defun-prefer-top-level t) + ;; Electric (setq-local electric-indent-chars (append "{}():;," electric-indent-chars)) -- 2.34.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 12 17:22:11 2022 Received: (at 59931-done) by debbugs.gnu.org; 12 Dec 2022 22:22:12 +0000 Received: from localhost ([127.0.0.1]:55775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4rBb-0004xK-Lw for submit@debbugs.gnu.org; Mon, 12 Dec 2022 17:22:11 -0500 Received: from mail-pj1-f53.google.com ([209.85.216.53]:52927) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4rBa-0004xC-43 for 59931-done@debbugs.gnu.org; Mon, 12 Dec 2022 17:22:10 -0500 Received: by mail-pj1-f53.google.com with SMTP id js9so1347052pjb.2 for <59931-done@debbugs.gnu.org>; Mon, 12 Dec 2022 14:22:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=TpCrha3k0+UsleOnTFSauKNDN66PGrP73A5I6+J6gMg=; b=Jh9J+80hDTkFxaRYlMA0z7Ne3BgIBdMQlYcr5rCVD5S94Q1n6hiK+UBDa7BBz5pD56 hKQcRED9zFaBgziGjgPatiQjKjxqZknJrggbrn2Jxn89s8BMYWlqDXd6nq8y2KYrtsac Mllfow8NdHu5wfLBuvuVruprIruR7xijvFVvP0bSINsIk1K/tAgzLYLRddtv1Hq/u1I8 nk2P9HU6nnQEWPK53s5tfVAHHP+1CVpCLwI7Sqz4JL21VPzW0y3F6DbuAPVBieV2vF1E UdDDODBQMGf/8oRA0NNblHBt0CXV5YASK+MyojAYgdYnEymvkGqGByzjn5Uv4BWsGTS8 +vmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TpCrha3k0+UsleOnTFSauKNDN66PGrP73A5I6+J6gMg=; b=apiDIlujpihgZqx8hBoxvXYPo8G4DYN4TsPBZ+h0X+hgH10ap984pJyJ05YvpkMggO K1qW3iAAkbwLZbvaddSXIWhfEhg4EjZeaCFvOX3K2XdQmyeMVtz3M5XbNxtM8UDPcY0H lydGAsFVLnUe/R8kCxFYdULjablgIcYVBk3d6ACqmZ49oVQDtJ6hKsKENFiHETxGxy3Q JT85FrozTNIDRY7YlTkrAaNxaKfeIGySl7Ojw1Y8I1mi1ITrnodDlV+YwVjni9jrJDMp IUWbIXNVAPvTZA3xkG1Z+KgkmKi2t4pGXeMP6v0DI8rP/JnAyHz7MDaXNYAfPLaeA44A bJlw== X-Gm-Message-State: ANoB5pn7qHrhvZoS+RCglv4cex18OuWX0xq5shbOIeguQ8ZqfDJMxYRa cpPDAOEzZ+ppNJuyw5H3Dnw= X-Google-Smtp-Source: AA0mqf429QY23xkyqrTX7vOZJNE6FYt7cXzY+ONa/Y+49EuG/R7oD9qgjOgNWIt9483ldcV57OaFXQ== X-Received: by 2002:a17:902:ce8c:b0:189:97e9:c92 with SMTP id f12-20020a170902ce8c00b0018997e90c92mr30851870plg.35.1670883724489; Mon, 12 Dec 2022 14:22:04 -0800 (PST) Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id ja14-20020a170902efce00b001897d30143asm6822215plb.289.2022.12.12.14.22.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Dec 2022 14:22:04 -0800 (PST) From: Yuan Fu Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: bug#59931: 30.0.50; [PATCH] Tweak various ts-modes indent and font-lock Message-Id: Date: Mon, 12 Dec 2022 14:22:02 -0800 To: Theodor Thornhill X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59931-done Cc: 59931-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 (-) Theodor Thornhill writes: > Hi! > > Yet some more tweaks - please apply when you find some time :-) > > Theo > Brilliant, thank you! I applied the patch. Yuan From unknown Tue Aug 19 02:51:41 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 10 Jan 2023 12:24:07 +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