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#70345: [PATCH] 29.1.50; csharp-ts-mode indentation of if statements with single-statement body Date: Sun, 14 Apr 2024 16:02:50 -0700 Message-ID: <10AB4365-72E5-4864-8E47-21B7C8FF8FCE@gmail.com> References: <87o7afod31.fsf@gmail.com> Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) 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="25735"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 70345@debbugs.gnu.org, theo@thornhill.no, jacobtophatleeming@gmail.com To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Apr 15 01:04:15 2024 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 1rw8tS-0006RE-Kq for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 15 Apr 2024 01:04:14 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rw8t8-0003Ka-FT; Sun, 14 Apr 2024 19:03:54 -0400 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 1rw8t6-0003K7-Ro for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 19:03:52 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rw8t6-0002Au-JX for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 19:03:52 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rw8tH-0001iz-Gx for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 19:04:03 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87o7afod31.fsf@gmail.com> Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 14 Apr 2024 23:04:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70345 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 70345-submit@debbugs.gnu.org id=B70345.17131358066279 (code B ref 70345); Sun, 14 Apr 2024 23:04:03 +0000 Original-Received: (at 70345) by debbugs.gnu.org; 14 Apr 2024 23:03:26 +0000 Original-Received: from localhost ([127.0.0.1]:36365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rw8sd-0001cq-Kl for submit@debbugs.gnu.org; Sun, 14 Apr 2024 19:03:25 -0400 Original-Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:44213) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rw8sb-0001bG-NL for 70345@debbugs.gnu.org; Sun, 14 Apr 2024 19:03:22 -0400 Original-Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-5dbf7b74402so1367143a12.0 for <70345@debbugs.gnu.org>; Sun, 14 Apr 2024 16:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713135784; x=1713740584; darn=debbugs.gnu.org; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=F+znx2VpGKtEvPjg7hd/aMoQvVsdgfmFhsx2fX1ObXE=; b=QKFfc3sj/hwQEgE+1YGtE4r+3inRSwIM32OR1Z9dJinP6Q/tDPs0Uek0Av1Z+yGZXD luFHQvf+Ae+/xcYBlI2lQR8kZowpouOpf2IZJW+5ulhRKOyNMjh4sBljeus/Rjw5T9mJ C71PXT8U9G1u7haitWNCOCYueiRBza3cMX2tqpVdtzA3oFmVTshg/tsEl26oqBs9kNyG YESToPLh8eoMtuozCqK3dY1HD0hLBG4iAq/dcB99KoZgOeEAmSPOGmQPmCH31v5OuLhY 76lndfVsp8fTznnEyFOSFJf0eNIVox+6FRuZ/5j1kptKfk7MjBC+Em0monVksvwFwNzs mT2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713135784; x=1713740584; 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=F+znx2VpGKtEvPjg7hd/aMoQvVsdgfmFhsx2fX1ObXE=; b=UTDqld6Sk9GZgorfXCjUDigM7rYbMfcE88jCqXjnr3TBiBJR4+D/fx3m8vmNB/QFXm mUDw6LhCXA1GBX2NAl/sdelM1yNqVOa2zFfKbWxtOy+xSD++8SOicmfksj9ivAT19Dyg 4kseeTVf3sAsH12uG1K0pyC9nMvzPWJFBjiWuH9AJo9I1LnEO53YHE/ToMwUyESej7nk dBWpdKvLvs2oAiu0PyfGRs2qCMbGa9wu2B82z4UEnraJOPF1VcPVwXq92GyjvwEPoxAU //Kvx6IeDhT9gVQ0Or58AIANibHGMtZH7m5+SAQ7tW8HhFeI9UJAJJCC79SiIPuYwVFx z9dA== X-Forwarded-Encrypted: i=1; AJvYcCUe6RB0zhTeVGLtyXkmKWmuByb1v6zjfuazt5y1gQeTBjMq87UM6yMfGGZ0CMQNJgLeVcoCbbw6PJZIhtP9Up9EQKHaVyA= X-Gm-Message-State: AOJu0YxcAIjrN2y1GXTfkvTRCFVcNC6scGG4l9+XpaaY90Y21l+Hd4wI fHvl9RKOZ0prXk9/Vo0BeT1izSARkYgXdKpODF8sonDR1gZLmDZJ X-Google-Smtp-Source: AGHT+IHcFyNsNKrfd2YTs8v3Ee7ceWEvX+i3uPl5MPQEnWSkRidH2YCNzfRT0rP6qudPJIHqy2Ta4g== X-Received: by 2002:a05:6a20:dea6:b0:1a7:97df:323d with SMTP id la38-20020a056a20dea600b001a797df323dmr6492969pzb.59.1713135784419; Sun, 14 Apr 2024 16:03:04 -0700 (PDT) Original-Received: from smtpclient.apple ([2601:641:300:4910:ddd5:ebc3:f048:bab8]) by smtp.gmail.com with ESMTPSA id p12-20020aa7860c000000b006eae2d9298esm6053412pfn.194.2024.04.14.16.03.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Apr 2024 16:03:02 -0700 (PDT) X-Mailer: Apple Mail (2.3731.700.6) 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:283323 Archived-At: Eli Zaretskii writes: >> From: Jacob Leeming >> Date: Thu, 11 Apr 2024 21:32:02 +0100 >>=20 >> Hi all, >>=20 >> >=46rom emacs -Q: >>=20 >> Evaluate this elisp to set up treesitter for csharp: >>=20 >> (setq treesit-language-source-alist '((c-sharp >> "https://github.com/tree-sitter/tree-sitter-c-sharp" "master" "src")) >> treesit-load-name-override-list '((c-sharp >> "libtree-sitter-csharp" "tree_sitter_c_sharp")) >> major-mode-remap-alist '((csharp-mode . csharp-ts-mode))) >>=20 >> Insert the following text into a csharp-ts-mode buffer: >>=20 >> if (true) >> var x =3D 2; >>=20 >> Try to indent the variable declaration of the function with >> indent-for-tab-command. Nothing will happen. I'd expect to see this: >>=20 >> if (true) >> var x =3D 2; >>=20 >> This issue can be fixed with the following patch: >>=20 >> diff --git a/lisp/progmodes/csharp-mode.el = b/lisp/progmodes/csharp-mode.el >> index 53c52e6..1a7d535 100644 >> --- a/lisp/progmodes/csharp-mode.el >> +++ b/lisp/progmodes/csharp-mode.el >> @@ -678,7 +678,8 @@ csharp-ts-mode--indent-rules >> ((parent-is "binary_expression") parent 0) >> ((parent-is "block") parent-bol csharp-ts-mode-indent-offset) >> ((parent-is "local_function_statement") parent-bol 0) >> - ((parent-is "if_statement") parent-bol 0) >> + ((match "block" "if_statement") parent-bol 0) >> + ((parent-is "if_statement") parent-bol = csharp-ts-mode-indent-offset) >> ((parent-is "for_statement") parent-bol 0) >> ((parent-is "for_each_statement") parent-bol 0) >> ((parent-is "while_statement") parent-bol 0) > > Theo and Yuan, any comments? If Theo is too busy I can take a look, but I don=E2=80=99t really know csharp-ts-mode too well. Yuan