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.devel Subject: Re: master 67ef1d54e7e 1/2: Make c-ts-common--fill-paragraph work for rust line comment Date: Thu, 25 Apr 2024 19:55:36 -0500 Message-ID: <87il04gug4.fsf@pub.pink> References: <171393817752.19291.7218731840020151471@vcs2.savannah.gnu.org> <20240424055618.02D69C1DAEC@vcs2.savannah.gnu.org> 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="12780"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.10.8; emacs 30.0.50 Cc: emacs-devel@gnu.org To: Yuan Fu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Apr 26 17:04:20 2024 Return-path: Envelope-to: ged-emacs-devel@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 1s0N7b-000326-8e for ged-emacs-devel@m.gmane-mx.org; Fri, 26 Apr 2024 17:04:20 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0N7K-0005xq-HX; Fri, 26 Apr 2024 11:04:05 -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 1s0L1J-0005wN-CV for emacs-devel@gnu.org; Fri, 26 Apr 2024 08:49:45 -0400 Original-Received: from wfhigh1-smtp.messagingengine.com ([64.147.123.152]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s0L1H-00038b-BP for emacs-devel@gnu.org; Fri, 26 Apr 2024 08:49:41 -0400 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.west.internal (Postfix) with ESMTP id 1DC77180013F; Fri, 26 Apr 2024 08:49:34 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 26 Apr 2024 08:49:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pub.pink; h=cc :cc: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=1714135773; x=1714222173; bh=V3szCmLoj1 mrmEY0vSPcJNzQbD0GhHGwfQXsB8Rjphc=; b=a0v30n4dF9vlIi56qU+/V+jFx4 PZZ2djKYD/Bv5790U7bFuYu9RkwIrFOpQEPSqwdImAC/BUlsBs9ea9nkNEfH1CxK Jje94QEGquRQH/5lf47dflT+iHMoN0JoGSbE54QjshGlqsTNCxyJly76oTE+c0qQ LgLNjAG924Hsq1jt2KP1H92cUd4Jfy51xhmv92DzCbFSqcN7sQ0L9qrt3a/ONyD0 V2FCNzGcihBfcZTnaP7GwtRNJJl/1ufslgFh/3EY3HwjiNcsOKfqHhBxh4vs8bhj Hg+yJ28Ajaj8VxdQH1bMa+H7jpeG9LLOPH6oMGxJw5yry/cd472iaCl5Hu+g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc: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=1714135773; x=1714222173; bh=V3szCmLoj1mrmEY0vSPcJNzQbD0G hHGwfQXsB8Rjphc=; b=bqoNqc0CgqX0a9/r4XXJgfWpaWsE98PjEQJmNf4w21GY oMVOHaz0Sj0NF0dej305JeHhL0L4fptXkdQ0L+jeslk/GiJ8+nhDT+nL/mv3Cyk/ wNfuni2/BB+wI/lsaRQZj4YZMosw+aw5ycy00GwXvsM4VNsQq0xZ2Y7o7MHZz5kt U6FumcSvzmnjbv4qq6pWeue2KOqy/18u5UugUFwMJu5JVtOjconPYuS0qyjAVRHp 3gtBqwW7a7pN0txRCZqTOpoZj4vC4PDnYV7Ppm5mpOE6rHIwret1AKyg51/sFp1o vNtWxKsU9cIokRBgw07p49bbZZseZmMhI8O1hgiJ0Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudelledgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpehffgfhvfevufffjgfkgggtsehmtd erredtredtnecuhfhrohhmpehjohhhnhcumhhuhhhluceojhhmsehpuhgsrdhpihhnkheq necuggftrfgrthhtvghrnhepudeftdetledugeelvdefhffhieelteeklefhhfehkeeugf fgffdtjefghefglefhnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepjhhmsehpuhgsrdhpihhnkh X-ME-Proxy: Feedback-ID: i74194916:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 26 Apr 2024 08:49:32 -0400 (EDT) In-reply-to: <20240424055618.02D69C1DAEC@vcs2.savannah.gnu.org> Received-SPF: pass client-ip=64.147.123.152; envelope-from=jm@pub.pink; helo=wfhigh1-smtp.messagingengine.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 26 Apr 2024 11:03:50 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:318140 Archived-At: --=-=-= Content-Type: text/plain This caused a c-ts-mode test to start failing. make test/lisp/progmodes/c-ts-mode-tests.log --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=c-ts-mode-tests.log Running 4 tests (2024-04-24 02:52:40-0500, selector `(not (or (tag :expensive-test) (tag :unstable) (tag :nativecomp)))') Test c-ts-mode-test-filling backtrace: signal(ert-test-failed (("Mismatch in test \"Not Over Fill 3\", file ert-fail(("Mismatch in test \"Not Over Fill 3\", file /home/build/em ert-test--erts-test(((code lambda nil (c-ts-mode) (setq-local indent ert-test-erts-file("/home/build/emacs/src-motif/test/lisp/progmodes/ #[0 "\304C\3051\f\0\306C0\202\27\0\1\307\240\210\211@\1AD\262\1\310C #[0 "\303\300!\11>\204\17\0\304\305\306\300D\"\210\300\307H\303\1!\n handler-bind-1(#[0 "\303\300!\11>\204\17\0\304\305\306\300D\"\210\30 ert--run-test-internal(#s(ert--test-execution-info :test ... :result ert-run-test(#s(ert-test :name c-ts-mode-test-filling :documentation ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m ert-run-tests((not (or (tag :expensive-test) (tag :unstable) (tag :n ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable) ( ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) ( command-line-1(("-L" ":." "-l" "ert" "--eval" "(setq treesit-extra-l command-line() normal-top-level() Test c-ts-mode-test-filling condition: (ert-test-failed ("Mismatch in test \"Not Over Fill 3\", file /home/build/emacs/src-motif/test/lisp/progmodes/c-ts-mode-resources/filling.erts" "// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy\nreturn; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n// woooomy woooomy woooomy woooomy woooomy woooomy woooomy\nreturn; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n" "// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy\nreturn; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n // woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n // woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n // woooomy woooomy\nreturn; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy\n")) FAILED 1/4 c-ts-mode-test-filling (0.057602 sec) at lisp/progmodes/c-ts-mode-tests.el:38 Mark set passed 2/4 c-ts-mode-test-indentation (1.366066 sec) passed 3/4 c-ts-mode-test-indentation-bsd (0.106362 sec) passed 4/4 c-ts-mode-test-indentation-preproc (0.066358 sec) Ran 4 tests, 3 results as expected, 1 unexpected (2024-04-24 02:52:42-0500, 1.795714 sec) 1 unexpected results: FAILED c-ts-mode-test-filling --=-=-= Content-Type: text/plain Yuan Fu writes: > branch: master > commit 67ef1d54e7e3983bb03840cf8f2990d579942710 > Author: Yuan Fu > Commit: Yuan Fu > > Make c-ts-common--fill-paragraph work for rust line comment > > * lisp/progmodes/c-ts-common.el (c-ts-common--fill-paragraph): Back to > BOL before checking for //. > --- > lisp/progmodes/c-ts-common.el | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el > index 457aa55c195..c06295b8a87 100644 > --- a/lisp/progmodes/c-ts-common.el > +++ b/lisp/progmodes/c-ts-common.el > @@ -125,6 +125,9 @@ ARG is passed to `fill-paragraph'." > (treesit-node-type node)) > (if (save-excursion > (goto-char (treesit-node-start node)) > + ;; In rust, NODE will be the body of a comment excluding > + ;; the //, so we need to go to BOL to check for //. > + (back-to-indentation) > (looking-at "//")) > (fill-comment-paragraph arg) > (c-ts-common--fill-block-comment arg))) --=-=-=--