From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Theodor Thornhill via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#60398: 29.0.60; c++-ts-mode: Strange indentation of function body when parameter list has newline Date: Thu, 29 Dec 2022 11:45:47 +0100 Message-ID: <87pmc2wkro.fsf@thornhill.no> References: <87y1qqd4zw.fsf@oracle.com> <118C936E-3A09-43E4-8FDA-E1755EE8F48F@gmail.com> Reply-To: Theodor Thornhill Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30039"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 60398@debbugs.gnu.org To: Yuan Fu , Knut Anders Hatlen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Dec 29 11:46:10 2022 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 1pAqQL-0007eq-Rs for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 29 Dec 2022 11:46:10 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAqQG-0002UK-Nf; Thu, 29 Dec 2022 05:46:04 -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 1pAqQF-0002Rw-0n for bug-gnu-emacs@gnu.org; Thu, 29 Dec 2022 05:46:03 -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 1pAqQE-0001DC-OS for bug-gnu-emacs@gnu.org; Thu, 29 Dec 2022 05:46:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAqQE-0007Th-9M for bug-gnu-emacs@gnu.org; Thu, 29 Dec 2022 05:46:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Theodor Thornhill Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 29 Dec 2022 10:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60398 X-GNU-PR-Package: emacs Original-Received: via spool by 60398-submit@debbugs.gnu.org id=B60398.167231075728733 (code B ref 60398); Thu, 29 Dec 2022 10:46:02 +0000 Original-Received: (at 60398) by debbugs.gnu.org; 29 Dec 2022 10:45:57 +0000 Original-Received: from localhost ([127.0.0.1]:59365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAqQ9-0007TM-1k for submit@debbugs.gnu.org; Thu, 29 Dec 2022 05:45:57 -0500 Original-Received: from out-23.mta0.migadu.com ([91.218.175.23]:36547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAqQ6-0007TC-A1 for 60398@debbugs.gnu.org; Thu, 29 Dec 2022 05:45:55 -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=1672310750; 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: in-reply-to:in-reply-to:references:references; bh=vgN6duw1o9oKysDZBcRphK1IPVptaX4Nz28SsUEftJI=; b=kRJjhMQj1k0L2jC/2/bWo33kuLUOJBX//SASlAYoOkAIxCQGQ2SCZg9SZcjP1OJyiTDegO yfTSMoJZFwia+76VW7qBWRgfA89ouIT4SsZpnkfR6mMyG7CDWyY47D0AO8TobauIr8+mZt PIBACFDmMfrZgT1nCEwZvZtA52av3IuXf0YcvtIZmV4fJYhtuVv0Ecro9avUxCeFu/Dz4x 8N+ojhgDPi7k6gSFITviwwZX5ZAw+r3o2K1z2gZ1kBkhcr9mwRuCEprDtvwp1sTzyw3VCV wweCPmRFanuwMbyvQpwIDgHD19AhymlTyqaSifXDSsR64tS6NewtyJkglMMZ6g== In-Reply-To: <118C936E-3A09-43E4-8FDA-E1755EE8F48F@gmail.com> X-Migadu-Flow: FLOW_OUT 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:252026 Archived-At: Yuan Fu writes: >> On Dec 28, 2022, at 11:49 PM, Knut Anders Hatlen wrote: >> >> >> Function bodies are indented strangely in c++-ts-mode if the parameter >> list has a newline between two parameters. For example: >> >> int f1(int x, int y) { >> // Indented as expected. >> return x + y; >> } >> >> int f2(int x, >> int y) { >> // Indented too much. >> return x + y; >> }; > > I implemented a fix in 784e509bded, Theo, WDYT? Could this be used on other C-like modes, too? > LGTM! I believe that should work for most other cases of this, but IIRC there are some cases where the compound statements are considered as siblings, not children, but I forgot what it was exactly... But I think this should work in most cases, at least! Theo