From unknown Fri Aug 15 04:06:44 2025 X-Loop: help-debbugs@gnu.org Subject: bug#58815: 29.0.50; Small treesitter fixes for js/ts-mode Resent-From: Theodor Thornhill Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 27 Oct 2022 09:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58815 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 58815@debbugs.gnu.org Cc: Yuan Fu X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166686470513061 (code B ref -1); Thu, 27 Oct 2022 09:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Oct 2022 09:58:25 +0000 Received: from localhost ([127.0.0.1]:56190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onzeb-0003Ob-3Z for submit@debbugs.gnu.org; Thu, 27 Oct 2022 05:58:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:55234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onzeX-0003OR-D1 for submit@debbugs.gnu.org; Thu, 27 Oct 2022 05:58:24 -0400 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 1onzeO-0002S3-Js for bug-gnu-emacs@gnu.org; Thu, 27 Oct 2022 05:58:21 -0400 Received: from out0.migadu.com ([94.23.1.103]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onzeL-0003LH-GA for bug-gnu-emacs@gnu.org; Thu, 27 Oct 2022 05:58:12 -0400 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=1666864687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=Dft82sfrsC3KCOjbRS6fURly4cKs+NmGIIYDz7kFwsE=; b=NmOMtkKIfGwlJTOWJFB2hUDKe9zrOs44W8Fe3qlm6AmsjWRThZMp9wcgf+Fe77znXn6Js+ 4hO30rkW/ztwnosFScM7wtL3pNk8plEmTn9iQ0w+xjd79xrauYAPmiy1K40LTCpUegSPNz UQ6WoFSFN+j4tr3u91hf3+0REbCCOOEyWj7f7rO8hUyJvhSMWE4yzw6SGH0nkx6AT2Mcdg E8HE1CDoMXWNPdl9mJPo+2+HiANL0JlNNmP6jUuQd7yHKWYNKF7PLrPfhaiRFqHpRj65FI tZk+6Sl6zxZOU6yYkFqcqpF7tFLVs57V0pUHL4D/07K5RrnlCrlC4HZvgt5WjA== From: Theodor Thornhill Date: Thu, 27 Oct 2022 11:58:06 +0200 Message-ID: <87edutsi4x.fsf@thornhill.no> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=94.23.1.103; envelope-from=theo@thornhill.no; helo=out0.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-Spam-Score: -1.4 (-) 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 Hello Yuan! See the attached patch. There's a small fix to ensure the parser, as well as adding in two small, but nice indentation fixes. Thanks, Theo --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Tweak-indentation-and-ensure-parser.patch >From c45f93e3677b3ef66730afd00024933568058755 Mon Sep 17 00:00:00 2001 From: Theodor Thornhill Date: Thu, 27 Oct 2022 11:53:07 +0200 Subject: [PATCH] Tweak indentation and ensure parser * lisp/progmodes/js.el (js--treesit-indent-rules) (js--treesit-cc-indent-rules): Don't use '.' as indent anchor and add in 'program' as root anchor. * lisp/progmodes/ts-mode.el (ts-mode--indent-rules): Don't use '.' as indent anchor and add in 'program' as root anchor. (ts-mode): Create parser so that mode can initialize. --- lisp/progmodes/js.el | 12 +++++++++++- lisp/progmodes/ts-mode.el | 9 +++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 89bd04b231..b940a3a2a4 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3416,12 +3416,16 @@ js--treesit-backward-up-list (defvar js--treesit-indent-rules `((javascript + ((parent-is "program") parent-bol 0) (no-node (js--treesit-backward-up-list) ,js-indent-level) ((node-is "}") parent-bol 0) ((node-is ")") parent-bol 0) ((node-is "]") parent-bol 0) ((node-is ">") parent-bol 0) - ((node-is ".") parent-bol ,js-indent-level) + ((parent-is "ternary_expression") + parent-bol ,js-indent-level) + ((parent-is "member_expression") + parent-bol ,js-indent-level) ((parent-is "named_imports") parent-bol ,js-indent-level) ((parent-is "statement_block") parent-bol ,js-indent-level) ((parent-is "variable_declarator") parent-bol ,js-indent-level) @@ -3452,6 +3456,7 @@ js--treesit-cc-indent-rules "_clause")) (switch-case-re (rx "switch_" (or "case" "default")))) `((javascript + ((parent-is "program") parent-bol 0) ;; Function declaration. ;; "{" ((match "statement_block" ,function-re) parent defun-open) @@ -3529,6 +3534,11 @@ js--treesit-cc-indent-rules ((node-is "formal_parameters") parent statement-cont) ;; Misc. + ((parent-is "ternary_expression") + parent-bol ,js-indent-level) + ((parent-is "member_expression") + parent-bol ,js-indent-level) + ((parent-is "function_declaration") parent func-decl-cont) ((parent-is "string-fragment") grand-parent string) ((parent-is "comment") grand-parent c) diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el index 28800e378a..88c93a6e93 100644 --- a/lisp/progmodes/ts-mode.el +++ b/lisp/progmodes/ts-mode.el @@ -55,14 +55,15 @@ ts-mode--syntax-table (defvar ts-mode--indent-rules `((tsx + ((parent-is "program") parent-bol 0) ((node-is "}") parent-bol 0) ((node-is ")") parent-bol 0) ((node-is "]") parent-bol 0) ((node-is ">") parent-bol 0) - ((node-is ".") - parent-bol ,ts-mode-indent-offset) ((parent-is "ternary_expression") parent-bol ,ts-mode-indent-offset) + ((parent-is "member_expression") + parent-bol ,ts-mode-indent-offset) ((parent-is "named_imports") parent-bol ,ts-mode-indent-offset) ((parent-is "statement_block") @@ -261,8 +262,8 @@ ts-mode :syntax-table ts-mode--syntax-table (cond - ((treesit-ready-p nil 'tsx) - ;; Tree-sitter. + ((treesit-ready-p 'ts-mode 'tsx) + (treesit-parser-create 'tsx) ;; Comments. (setq-local comment-start "// ") (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *") -- 2.34.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 28 04:21:42 2022 Received: (at control) by debbugs.gnu.org; 28 Oct 2022 08:21:42 +0000 Received: from localhost ([127.0.0.1]:60291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooKcY-0007cH-Ep for submit@debbugs.gnu.org; Fri, 28 Oct 2022 04:21:42 -0400 Received: from mail-pl1-f182.google.com ([209.85.214.182]:35599) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooKcK-0007bX-9E for control@debbugs.gnu.org; Fri, 28 Oct 2022 04:21:28 -0400 Received: by mail-pl1-f182.google.com with SMTP id y4so4261880plb.2 for ; Fri, 28 Oct 2022 01:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:from:to:cc:subject:date:message-id:reply-to; bh=aDuzhpCSC9wy8+0JaRiqpaREAbMC5r/uBR1wMPvyzWk=; b=VHtLO3ox4Q1aHCnRz60uS3F66Wvy0ZB1CxoeYtCWAY8b7FO22FKiMG91S+UsVGfGTa 0Jz6+klGHP8xzktEPXii8L4MUQNib6BOYY5ezJnBAaz56dnT/RcXerCj0PshSDvL3JEP 1A4XVc6S8/7ZVbWGuri9lRbFj3zIqfJt6DTL8hvSesdmJ95tKZhtHnLMzlR+HKqUxvjs VldWHYdEwLLrPtNzTUXQBwqgVdthrEprKAXUCc92QDiT21mP51+x3sN6eCvQWr7VLwkP 58FzBNuQgKnzdISE9kYEFE8kYZdw4SRVJg7XrIWaEQ1qVM6mokNKasTzFjH8xf3o/fEn AVlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aDuzhpCSC9wy8+0JaRiqpaREAbMC5r/uBR1wMPvyzWk=; b=utgzbBLamFT04OR3VZqazAQ0im2icgRlZdhAfopAqqlG3LEp8nJzICsAPVrBXfRiwM 7h4PGxv+TiTyIeaGTvQ+ZgRaQN35jVX9M5HEzX7Af0JqVe5Aw5WBIy8CHdN72ZsUP1oR Pro7ZSyck+lukn5Kl8/yILroxWA4vkItgrKEKOJnPrGDId7w/2DSIlZDB5JFuY4CLD5l OEnx+mAB3F+DPwgNg+7RjU1+WD1Q8jISOK57pkphpdDcGqRyrvDCHfczH9X56+pkS9C1 TvtmYDo9aq8/BjLf9eHpMjSBrPdyJS33ahILqme95Wl9oxRHpna1NM/tISPhYxPCIspW 8iAg== X-Gm-Message-State: ACrzQf14IDXIw0P7/lVfly2NjHoogGYp7oWAbtMnB+kCnLD+h87O0Z/d gZjsqdvnfgntqrmaOLpPmsTDit6abfaFJw== X-Google-Smtp-Source: AMsMyM5SKgQxpoOhQPzM0UwGhJnTnn+JQpn6KGExyHrVANtTdvltfnF9yGeygvYl0N+zJx79qgYyTg== X-Received: by 2002:a17:90b:3847:b0:20d:c41f:de7a with SMTP id nl7-20020a17090b384700b0020dc41fde7amr15278613pjb.85.1666945282327; Fri, 28 Oct 2022 01:21:22 -0700 (PDT) Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id v15-20020a63d54f000000b00412a708f38asm2256572pgi.35.2022.10.28.01.21.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Oct 2022 01:21:22 -0700 (PDT) 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: control message for bug #58815 Message-Id: <4C84A056-BEB0-4420-9904-229EF657CF69@gmail.com> Date: Fri, 28 Oct 2022 01:21:21 -0700 To: control@debbugs.gnu.org X-Mailer: Apple Mail (2.3696.120.41.1.1) 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 (-) close 58815 29.1 quit