From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Daniel =?UTF-8?Q?Mart=C3=ADn?= via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#61635: 30.0.50; c++-ts-mode: "}" indented wrong when a class in namespace Date: Sun, 19 Feb 2023 23:13:06 +0100 Message-ID: References: Reply-To: Daniel =?UTF-8?Q?Mart=C3=ADn?= 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="9128"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (darwin) Cc: 61635@debbugs.gnu.org To: xhcoding Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Feb 19 23:14:23 2023 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 1pTrwt-0002BU-Q3 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 19 Feb 2023 23:14:23 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTrwf-0002ip-0T; Sun, 19 Feb 2023 17:14:10 -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 1pTrwY-0002em-Bl for bug-gnu-emacs@gnu.org; Sun, 19 Feb 2023 17:14:02 -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 1pTrwY-0001O4-3V for bug-gnu-emacs@gnu.org; Sun, 19 Feb 2023 17:14:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pTrwX-0001ks-S6 for bug-gnu-emacs@gnu.org; Sun, 19 Feb 2023 17:14:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Daniel =?UTF-8?Q?Mart=C3=ADn?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 19 Feb 2023 22:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61635 X-GNU-PR-Package: emacs Original-Received: via spool by 61635-submit@debbugs.gnu.org id=B61635.16768448006670 (code B ref 61635); Sun, 19 Feb 2023 22:14:01 +0000 Original-Received: (at 61635) by debbugs.gnu.org; 19 Feb 2023 22:13:20 +0000 Original-Received: from localhost ([127.0.0.1]:49844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTrvr-0001jU-Qb for submit@debbugs.gnu.org; Sun, 19 Feb 2023 17:13:20 -0500 Original-Received: from sonic309-25.consmr.mail.ir2.yahoo.com ([77.238.179.83]:34059) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTrvp-0001j4-0b for 61635@debbugs.gnu.org; Sun, 19 Feb 2023 17:13:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1676844789; bh=jSr5Knh+NTyl3haGPdOEDyN3BUL3UsMe73NUq513gYA=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=W23z5g8k6f8Z3VPT3/9yIByBFvXBmpEOGg0YbBbOz1Ffzw+ZCZqmV4BW3RagPPsNt5Koh8q7vYpbzf2Y/Iyloebe49xZzCdPLxGacBL6GUNO3uAjPb5ZVNHsbiwXGuu0frhhz5+Gyg5+fb1mWfRnQTrTCcUxmraza77rlztgNBSpcu0RMIgLSDafKTGhDfnzjYZg2T8/HMNG4LmdLFa3EeAJYCjdq7AQuktxSg5EW1BeKpGilaJZimG7EluamR+jnGQdgQHqUa/eFZVGK+RymlTfZ2cShT1/368qEPV9FOyH6gjoWvZZSKZbtrLFGdJm2KPBenMNq1ClwGM918DNcQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1676844789; bh=l9Avq+R2DcB1xcCxNLhHBXdZE8eAV5jHZFLIyBWjcB2=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=iigTBbMyR/67S1jBF3buj9qtjvHJLvvjlZv0eqQ8P2+jQx1HeJMK+LPZJdbAvO+q35/xgLnx81yQSzqr3vuONNQM/Dx1NJFDg5c+o8gZrWQuj1Mu41CnK0kWdwP5gfyLWMZkyK02vuhm0cHPq1jtTWsUutEGfyoUhd1Pr8Fn5qkfB0Hbbg0j3Hk7hUQBZoO8iaaALefv0RLvRgUQcZjuq5ueK6bvVjysY3vCnSOvI6b6Lyc7GwNxfPOYYTQk7pchbK07APYcOZdm+05KOhD+4DkObHZyChr5jtbD+mygTo+NJGCNd+/cO0DyisTU0keluJx1OIlOm8fPiKLpwl0wQw== X-YMail-OSG: gNYv.NYVM1mvYvE2lDVSoQDAmqyKJGcCYUxG1S1KVW01yJoUvhkGgLGycxgxNmf ..S19eWq6JVAk0UiRiWxAuNodafS7GSm46dXVpMdXx_zcReJbM8aIYhRJIVe7yYjasTVPUA2WaIE 0d1ZWVR6GljU2_SAiCPNZeJdwozUnOn0_hCQbqziVejX5v.FwP6JzCxLFZ8.rOto74UguM4lMURu W6DI40FjkjSUKePIbmkxnygXakGgu_MaHgQNFJPXQ2XpWnscr6E1g9p.wEe8WL6OfTDhDMOQ4vCg 4Lpc9c9GZ7aHT9Krb8O63Q3XMhD3OV66SJLQR1aR9RfmEQhP0chBpeQC_aH0JmvEGb_DsBOUv23t vr2ipVVVPZdpL7isgsY1C07YdcJ.KktaqUB4A0OKm1hsPhX_XAVHYACB7RvyWjNQMmPq3zFQEUb3 m6vTxRyuSZsgt..7g6hqAF1nglKFZRJH5JC5f_4jBe_F3Sfxz_id_VR_BWKrR.DcWDykSyU8wRzz EXb6QCfxs2SaWLUkD35EkIkKm_5EOMHZoqv2w7dZobpp5Zj0edoXEk6iMhxrClOjrKutL7C_bbzo wlEAUXwGgsOxZgUNSlnaUpg58RMd9iDOVnA0Mb1lZyEWxTvvz83u1FRPaI52_Sfqf.AleDiGzIhW tbl_5BXFD.Q7xrJTsNaeCw_2rtlAXHcUyphFoqNNWY1PlgJWsOyQ6Ih50WHL2WPBrbrreUzVhaG1 K.7Ec0DWoDnlOI4olWtehqYnXIPkLUa16ArwJ0ifkSUM5ISkkUWN9vWoxbC2ELyJRLQkwFfsH1y2 XIDo7ICXkJ779E1kYg9MknawJNxkDAIwjRiY7BlPBy X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.ir2.yahoo.com with HTTP; Sun, 19 Feb 2023 22:13:09 +0000 Original-Received: by hermes--production-ir2-65c64dfd66-8r58z (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 838e9c07247aa80e8dace7f89c35bfd1; Sun, 19 Feb 2023 22:13:07 +0000 (UTC) In-Reply-To: (xhcoding@foxmail.com's message of "Sun, 19 Feb 2023 21:01:35 +0800") X-Mailer: WebService/1.1.21183 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo 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:256110 Archived-At: --=-=-= Content-Type: text/plain tags 61635 + patch quit xhcoding writes: > The closing '};' is indented wrong in the following class/struct definition: > > namespace test { > class Name { > }; <-- error indent > > } <-- when press tab, minibuffer output "Wrong type argument: wholenump, -2" > > The attached patch fixes the problem by considering "declaration_list" nodes as "blocks". --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-declaration_list-to-c-ts-common-indent-type-rege.patch >From 1435efef0e3c6af871f97be9553a92cd125f4ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Sun, 19 Feb 2023 22:57:54 +0100 Subject: [PATCH] Add declaration_list to c-ts-common-indent-type-regexp-alist * lisp/progmodes/c-ts-mode.el (c-ts-base-mode): Consider a "declaration_list" a block. (Bug#61635) * test/lisp/progmodes/c-ts-mode-resources/indent.erts (Code): Add a test case. --- lisp/progmodes/c-ts-mode.el | 3 ++- .../progmodes/c-ts-mode-resources/indent.erts | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index a60c464093e..43b88cd57b1 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -774,7 +774,8 @@ c-ts-base-mode `((block . ,(rx (or "compound_statement" "field_declaration_list" "enumerator_list" - "initializer_list"))) + "initializer_list" + "declaration_list"))) (if . "if_statement") (else . ("if_statement" . "alternative")) (do . "do_statement") diff --git a/test/lisp/progmodes/c-ts-mode-resources/indent.erts b/test/lisp/progmodes/c-ts-mode-resources/indent.erts index 05d59c10a42..a4f700e7c79 100644 --- a/test/lisp/progmodes/c-ts-mode-resources/indent.erts +++ b/test/lisp/progmodes/c-ts-mode-resources/indent.erts @@ -354,3 +354,19 @@ int main() }; } =-=-= + +Code: + (lambda () + (c++-ts-mode) + (setq-local indent-tabs-mode nil) + (setq-local c-ts-mode-indent-offset 2) + (indent-region (point-min) (point-max))) + +Name: Declaration List (Namespace) (Bug#61635) + +=-= +namespace test { + class Name { + }; +} +=-=-= -- 2.34.1 --=-=-=--