From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Yuan Fu Newsgroups: gmane.emacs.bugs Subject: bug#61026: 29.0.60; c-ts-mode: Broken indentation for loops and conditions without brace Date: Sun, 29 Jan 2023 00:22:26 -0800 Message-ID: <68C0658F-BA18-4DEE-84AC-035A85AFCE36@gmail.com> References: Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.300.101.1.3\)) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27428"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Mohammed Sadiq , 61026@debbugs.gnu.org To: Theodor Thornhill Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jan 29 09:23:25 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 1pM2yD-0006xD-Ia for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 29 Jan 2023 09:23:25 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pM2xy-0001VT-0z; Sun, 29 Jan 2023 03:23: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 1pM2xr-0001VE-7L for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2023 03:23:04 -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 1pM2xq-0006vV-Db for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2023 03:23:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pM2xp-0001bC-V3 for bug-gnu-emacs@gnu.org; Sun, 29 Jan 2023 03:23:01 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Jan 2023 08:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61026 X-GNU-PR-Package: emacs Original-Received: via spool by 61026-submit@debbugs.gnu.org id=B61026.16749805706113 (code B ref 61026); Sun, 29 Jan 2023 08:23:01 +0000 Original-Received: (at 61026) by debbugs.gnu.org; 29 Jan 2023 08:22:50 +0000 Original-Received: from localhost ([127.0.0.1]:42235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pM2xe-0001aX-D4 for submit@debbugs.gnu.org; Sun, 29 Jan 2023 03:22:50 -0500 Original-Received: from mail-pf1-f174.google.com ([209.85.210.174]:36845) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pM2xa-0001aD-4P for 61026@debbugs.gnu.org; Sun, 29 Jan 2023 03:22:48 -0500 Original-Received: by mail-pf1-f174.google.com with SMTP id n2so5823197pfo.3 for <61026@debbugs.gnu.org>; Sun, 29 Jan 2023 00:22:46 -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=7el4vOMa0N/FCfrWoYL4LXaPdjo91+fVJdU4JphD8vw=; b=oNQ/udfBw9lw8XDnQYpeUFcy/PnachL+VMgcEbuoDiitXHKCyRxfx96ZLpSC7guKyY ++xWFjZnN1Sv0GxUbqvdpmDdyyPHLjQoWKzDz3JnIri4cTVbZoPLAXSy/K53sc+xf4yu naVy0VORrX5nTp2+lQ2ctNft9ug5OARFUsVpNd94PL2EX37QRc1OP7lGjdXlXtENrRPO fecVm5gPBKckk9z96v+lZ2H0FSCyK/oJQPtKN6zSghAdk4FMfmx46Q2YXBx9K31Bo6iH Fu1GjpGB4H6dwJtQVc+54NaTWbybMsTqhSYOTm3DlJFUyubASJmrihORbAv/W2nfoSID Slaw== 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=7el4vOMa0N/FCfrWoYL4LXaPdjo91+fVJdU4JphD8vw=; b=4vtZ5GYVYbwWjvY0NtBfF75MJlfQx/3v8W+JZq4dj7IiAi61Vgtl7QgoIKJPKqn4lm en5hC+LVSuRVh2hc98Z1NZ4MiWkalH1FNKNtLB5nWrFzt86pT4xWMryQyX9i5ntMIfRC ADSYefvId8tYWA8inizzK72g9MujvOgkf4TpZw0Ea537r2aOeWd4O1VfvooATjksdmEB eqrYoS2wsvhnGgsO4n6UW+IqvC+3nTQret9oi3953D0KzLuWByuvpNyVU7ZrSeKtEvjo +dgZCPTLIeHLIFc7FXDTQMgS8AJMde+d7hQoLMt8Z6gYj16toAVzcvyc2euPpcrUGfO4 7DDQ== X-Gm-Message-State: AFqh2kp9NjVdem7V9WUwFBzVhePWhgfREbZt12iA17RFF6hIB/F3NZHb WPYcdFHpVgutdVwWE8rCRKs= X-Google-Smtp-Source: AMrXdXuEMTGeFeGfuhtRZ6uIV4Vj3jnZsZ92nLWTb7OeJ83mL+otsn9NYGG3rtCNSGIDpQd0H5PHGw== X-Received: by 2002:a05:6a00:1da0:b0:58d:f607:52f7 with SMTP id z32-20020a056a001da000b0058df60752f7mr37794746pfw.12.1674980560201; Sun, 29 Jan 2023 00:22:40 -0800 (PST) Original-Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id x3-20020aa79403000000b00593b9a626dcsm275945pfo.6.2023.01.29.00.22.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Jan 2023 00:22:39 -0800 (PST) X-Mailer: Apple Mail (2.3731.300.101.1.3) 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:254339 Archived-At: Theodor Thornhill writes: > Yuan Fu writes: > >> Theodor Thornhill writes: >> >>> Mohammed Sadiq writes: >>> >>>> The following code has broken indentation with c-ts-mode: >>>> >>>> while (true) >>>> if (true) { >>>> puts ("Hello"); >>>> } >>>> >>>> if (true) >>>> if (true) >>>> { >>>> puts ("World"); >>>> } >>>> >>>> For which, I expect to get the following indentation (with default = config): >>>> >>>> while (true) >>>> if (true) { >>>> puts ("Hello"); >>>> } >>>> >>>> if (true) >>>> if (true) >>>> { >>>> puts ("World"); >>>> } >>>> >>>> >>> >>> Thanks, Mohammed! >>> >>> Yuan, I'm not sure the new brace counting method is a good enough >>> improvement just yet considering its complexity and the number of = issues >>> we are seeing. Do you see any simple fixes for these issues? >> >> I fixed it. >> >>> I can try to debug this this weekend, but not sure I really have = time to >>> fix it. All of these issues work fine in js-ts-mode or = java-ts-mode, if >>> I'm not mistaken. >> >> Yes, because js and java doesn=E2=80=99t allow omitting brackets. So = we only >> need to add a special-case for C/C++, so it isn=E2=80=99t too bad. >> >> Yuan > > They allow that just fine, don't they?=20 You are right. I made the fix general and moved everything to c-ts-common.el. The next step is to make other modes use it. Yuan