From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: john muhl Newsgroups: gmane.emacs.bugs Subject: bug#70345: [PATCH] 29.1.50; csharp-ts-mode indentation of if statements with single-statement body Date: Sat, 27 Apr 2024 12:13:12 -0500 Message-ID: <87edaq3evk.fsf@pub.pink> References: <87o7afod31.fsf@gmail.com> <87mspusb5k.fsf@thornhill.no> <87wmopaii8.fsf@gmail.com> <867cgl1la9.fsf@gnu.org> <875xw2et3e.fsf@pub.pink> <86h6fmvmm0.fsf@gnu.org> Mime-Version: 1.0 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="23986"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.10.8; emacs 30.0.50 Cc: dmitry@gutov.dev, 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 Sat Apr 27 19:18:10 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 1s0lgf-0005ye-Ch for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 27 Apr 2024 19:18:10 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0lgI-00039M-7c; Sat, 27 Apr 2024 13:17:46 -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 1s0lgG-00039C-Oz for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2024 13:17:44 -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 1s0lgG-0002CE-87 for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2024 13:17:44 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s0lgY-0000uJ-Gm for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2024 13:18:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: john muhl Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Apr 2024 17:18:02 +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.17142382243466 (code B ref 70345); Sat, 27 Apr 2024 17:18:02 +0000 Original-Received: (at 70345) by debbugs.gnu.org; 27 Apr 2024 17:17:04 +0000 Original-Received: from localhost ([127.0.0.1]:49600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0lfb-0000tq-M0 for submit@debbugs.gnu.org; Sat, 27 Apr 2024 13:17:04 -0400 Original-Received: from wfout1-smtp.messagingengine.com ([64.147.123.144]:60829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0lfY-0000tQ-Mu for 70345@debbugs.gnu.org; Sat, 27 Apr 2024 13:17:01 -0400 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.west.internal (Postfix) with ESMTP id D49851C000BB; Sat, 27 Apr 2024 13:16:34 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 27 Apr 2024 13:16:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pub.pink; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1714238194; x=1714324594; bh=4s0aJc4/D7jEbNFFbQRqCtU+RFE78R/jSb/TkbivuCA=; b= qxbX+hL6cY4cJwZ3YDEPb+I7i2HEaj5gcX/dOSGNz4c2sVqfAs9wlOvmsvftZs4Q X2hRq5CId8yKVlVGTOC2NvQmHJBpJia2NgEwkKt7fAK+WKMveOm3TgKyKcVijVlw kv8L8DxYupRcVWx4FqX9IhD1l3SJX4hIpTaVtOPVir9e+ZSGtigaAzHrPqusQGkg MNrvmMXHTvGxT4ojdzyX/ZKt9OKDRVMAi4KLGi+W5rL3kQdk527UB4XQwwf62+NY 83KX7TrrRp7kdQjqVR3nhRdLzPIVQNqa5v6UDcg3PdCWzEomxZXn1ez2nCB4YabN Gf0T9NHlVlaNepyksX4fYQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1714238194; x= 1714324594; bh=4s0aJc4/D7jEbNFFbQRqCtU+RFE78R/jSb/TkbivuCA=; b=O zoL8rqHBIr8Zm8GYMHJ5YqVD53GEnVAxMRA71Lq6soacFbsU6G0mvQITElzLpWOJ he5ehYWnfuNmRvl8A4tz7VRcRT3cgigkmdWS9QSik2yREvEkPwmL922xMBQ/8onx p81pElvY1A+BNyrL4Hkt6BLH9BxqW1j6yMsLBL0WbrB9VTeicIJlwV1k/fhZVp+9 u4rLQLFjEfao5Som5s3xq3C0PKkPolOhpBElYP4h8wuNTzWHrqBeJa3Y2XL71xTP G1TVztMn4vCBaKT5zmN281NsKiD4kG99St1k9ibyr0K3VP1IQb6zRrj7uOHf5eKs g4mjlRd7XlAgCrUz2Lckw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvddtuddguddutdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpehffgfhvfevufffjgfkgggtgfesthhqredttderjeenucfhrhhomhepjhho hhhnuchmuhhhlhcuoehjmhesphhusgdrphhinhhkqeenucggtffrrghtthgvrhhnpeeiue dugedtveehjeehudeuieduudekffekvdekkeefhfevgeetvddugeffueelheenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehjmhesphhusgdrph hinhhk X-ME-Proxy: Feedback-ID: i74194916:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 27 Apr 2024 13:16:32 -0400 (EDT) In-reply-to: <86h6fmvmm0.fsf@gnu.org> 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:284058 Archived-At: Eli Zaretskii writes: >> From: john muhl >> Cc: Jacob Leeming , dmitry@gutov.dev, >> 70345@debbugs.gnu.org, theo@thornhill.no >> Date: Sat, 27 Apr 2024 08:10:47 -0500 >>=20 >> The test should check that the c-sharp grammar is available so >> that it gets marked as skipped instead of failed. >>=20 >> >From 068cad8612c31cea41f0cc21a865efe0785d4e7a Mon Sep 17 00:00:00 2001 >> From: john muhl >> Date: Sat, 27 Apr 2024 09:55:42 -0500 >> Subject: [PATCH] ; Skip 'csharp-ts-mode' test if grammar is missing >>=20 >> * test/lisp/progmodes/csharp-mode-tests.el >> (csharp-ts-mode-test-indentation): Skip test instead of failing. >> --- >> test/lisp/progmodes/csharp-mode-tests.el | 1 + >> 1 file changed, 1 insertion(+) >>=20 >> diff --git a/test/lisp/progmodes/csharp-mode-tests.el b/test/lisp/progmo= des/csharp-mode-tests.el >> index 2878fa601f2..b3c57a7026b 100644 >> --- a/test/lisp/progmodes/csharp-mode-tests.el >> +++ b/test/lisp/progmodes/csharp-mode-tests.el >> @@ -27,6 +27,7 @@ csharp-mode-test-indentation >> (ert-test-erts-file (ert-resource-file "indent.erts"))) >>=20=20 >> (ert-deftest csharp-ts-mode-test-indentation () >> + (skip-unless (treesit-ready-p 'c-sharp)) >> (ert-test-erts-file (ert-resource-file "indent-ts.erts"))) > > Thanks, but shouldn't we invoke treesit-ready-p with second argument > non-nil? Looks like it=E2=80=99s gone either way so far. $ git grep 'treesit-ready-p' test/lisp/ test/lisp/align-tests.el:(autoload 'treesit-ready-p "treesit") test/lisp/align-tests.el: (skip-unless (treesit-ready-p 'lua)) test/lisp/progmodes/c-ts-mode-tests.el: (skip-unless (treesit-ready-p 'c)) test/lisp/progmodes/c-ts-mode-tests.el: (skip-unless (treesit-ready-p 'c)) test/lisp/progmodes/c-ts-mode-tests.el: (skip-unless (treesit-ready-p 'c)) test/lisp/progmodes/c-ts-mode-tests.el: (skip-unless (treesit-ready-p 'c)) test/lisp/progmodes/csharp-mode-tests.el: (skip-unless (treesit-ready-p 'c= -sharp)) test/lisp/progmodes/elixir-ts-mode-tests.el: (skip-unless (and (treesit-re= ady-p 'elixir) (treesit-ready-p 'heex))) test/lisp/progmodes/go-ts-mode-tests.el: (skip-unless (treesit-ready-p 'go= )) test/lisp/progmodes/heex-ts-mode-tests.el: (skip-unless (treesit-ready-p '= heex)) test/lisp/progmodes/java-ts-mode-tests.el: (skip-unless (treesit-ready-p '= java)) test/lisp/progmodes/java-ts-mode-tests.el: (skip-unless (treesit-ready-p '= java)) test/lisp/progmodes/js-tests.el: (skip-unless (treesit-ready-p 'javascript= )) test/lisp/progmodes/lua-ts-mode-tests.el: (skip-unless (treesit-ready-p 'l= ua)) test/lisp/progmodes/lua-ts-mode-tests.el: (skip-unless (treesit-ready-p 'l= ua)) test/lisp/progmodes/lua-ts-mode-tests.el: (skip-unless (treesit-ready-p 'l= ua)) test/lisp/progmodes/lua-ts-mode-tests.el: (skip-unless (treesit-ready-p 'l= ua)) test/lisp/progmodes/python-tests.el: (skip-unless (treesit-ready-p 'pyt= hon)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-p '= ruby t)) test/lisp/progmodes/ruby-ts-mode-tests.el: (skip-unless (treesit-ready-= p 'ruby t)) test/lisp/progmodes/rust-ts-mode-tests.el: (skip-unless (treesit-ready-p '= rust)) test/lisp/progmodes/typescript-ts-mode-tests.el: (skip-unless (and (treesi= t-ready-p 'typescript) test/lisp/progmodes/typescript-ts-mode-tests.el: (treesi= t-ready-p 'tsx)))