From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Graham Marlow Newsgroups: gmane.emacs.bugs Subject: bug#68781: [PATCH] Don't fill yaml except comments and block scalars. Date: Mon, 29 Jan 2024 17:20:04 -0800 Message-ID: <216ddb7b-e02d-4e68-9dbb-68fa1202d198@mgmarlow.com> References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------lpRgLdO6zOND21bvRgBA6nZS" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5187"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird Cc: 68781@debbugs.gnu.org To: Randy Taylor , Rudolf Schlatte Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jan 30 02:21:13 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 1rUcoJ-00015a-Ue for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 30 Jan 2024 02:21:12 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUco4-0000pg-Al; Mon, 29 Jan 2024 20:20:56 -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 1rUco1-0000p7-Vu for bug-gnu-emacs@gnu.org; Mon, 29 Jan 2024 20:20:54 -0500 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 1rUco1-0000Zm-NW for bug-gnu-emacs@gnu.org; Mon, 29 Jan 2024 20:20:53 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rUco9-00046m-SW for bug-gnu-emacs@gnu.org; Mon, 29 Jan 2024 20:21:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Graham Marlow Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 30 Jan 2024 01:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68781 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 68781-submit@debbugs.gnu.org id=B68781.170657762215739 (code B ref 68781); Tue, 30 Jan 2024 01:21:01 +0000 Original-Received: (at 68781) by debbugs.gnu.org; 30 Jan 2024 01:20:22 +0000 Original-Received: from localhost ([127.0.0.1]:34057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUcnW-00045n-1k for submit@debbugs.gnu.org; Mon, 29 Jan 2024 20:20:22 -0500 Original-Received: from out1-smtp.messagingengine.com ([66.111.4.25]:35529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUcnT-00045W-3M for 68781@debbugs.gnu.org; Mon, 29 Jan 2024 20:20:20 -0500 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 26FFA5C0160; Mon, 29 Jan 2024 20:20:05 -0500 (EST) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 29 Jan 2024 20:20:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgmarlow.com; 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=fm1; t=1706577605; x=1706664005; bh=En65nAcREf YsxXa0zy0bZD9vM9dYm5fpbaguIX228nk=; b=n6899qmzUAfrQ/Ny76JX3/tOGM yUvlhsfbUlgBB6IbFzlgC9oxiB6sFuaHOY6wzl1wlzFqTsRWArhc32ADC59kaFBo 8Pav3xleCGCFpV2qNb0SSMtW4hyTpfWYM8SD91R14VqW1AM2MC2ASBaznwloF19C ICLZmhqCMuABG48+2z3kfkfMZMNQN09kP424/xUv/R52bU2KqwP8TTAHx8gh8bRM AMNmUU0+gS+oW2038Z+1YSRmkGsC3UHK4BQjubgqAlgAi3A0gzxds2Uur1waFR5F /z3BK4fiFLC7pZ1+/80p8ufz5LwGXh5PweXJUEi5GC3voVGxoqDY9eNYQPQg== 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=1706577605; x=1706664005; bh=En65nAcREfYsxXa0zy0bZD9vM9dY m5fpbaguIX228nk=; b=bo0dXcDmBQxkhIdUrwO+hhf3slL308lZp7TfukleEOmk 6OwESdXwUFJwSUf2DV8WitWaA7AffOQp9klnG9a99XkifRVRCrFrJn6SmA3uEyw0 8U+vYerCH1aYQciWQmYAhiQynizE/ULu0K3Nx9G/hjdGH/wf4Xz2fQOKcNxA2+FY MR6bjw+3LO4/jMRonGRG1cJABSqOFZkbw5xF7EuWRD+SDoGjTw5NzMaA6iM+YNum OaAjnkxh6QjURbIxEl8tswx7ypdsgOiKOK+HCGj7FagVeXhHyTzCXm+wd5DNKSFV uk7gzRN2BQuT+mxDEq+dcVeIgKAPW4eDPnnbZz4UdA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrfedthedgfeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpegtkfffgggfuffvvehfhfgjsehmtd erredtvdejnecuhfhrohhmpefirhgrhhgrmhcuofgrrhhlohifuceoghhrrghhrghmsehm ghhmrghrlhhofidrtghomheqnecuggftrfgrthhtvghrnhepgeekieffjeekgeeikeetge egudehudfhgfejvdejieeiveefhfeiledthfetteefnecuffhomhgrihhnpehgihhthhhu sgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehgrhgrhhgrmhesmhhgmhgrrhhlohifrdgtohhm X-ME-Proxy: Feedback-ID: i9bd1467a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Jan 2024 20:20:04 -0500 (EST) Content-Language: en-US In-Reply-To: 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:279153 Archived-At: This is a multi-part message in MIME format. --------------lpRgLdO6zOND21bvRgBA6nZS Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit > Hello Randy, thanks for having a look! Could you tell me which > tree-sitter grammar you are using? I'm asking because with the grammar > from https://github.com/ikatyang/tree-sitter-yaml I don't see what you > describe. For the record I'm also using this grammar. Looking at the patch, what do you think about retaining the existing behavior (so block_scalars still fill correctly) while inhibiting fill_paragraph for everything else as suggested? Originally I retained the existing behavior of fill-paragraph just to limit the number of things changed by the patch, not because it was working properly. I think blocking the call to fill-paragraph for non-block/comment nodes makes sense. I attached a patch w/ my edits, but it just swaps the when to and if, accepts the comment node type for filling, and returns t to avoid calling fill-paragraph for other nodes. --------------lpRgLdO6zOND21bvRgBA6nZS Content-Type: text/plain; charset=UTF-8; name="0001-Inhibit-fill-paragraph-outside-of-blocks-comments.patch" Content-Disposition: attachment; filename*0="0001-Inhibit-fill-paragraph-outside-of-blocks-comments.patch" Content-Transfer-Encoding: base64 RnJvbSA1Y2M1NjhmNmNjN2IyMzczMzdiOTczYWE5ZjY0ZjZjOTdhYjdiY2E4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBHcmFoYW0gTWFybG93IDxncmFoYW1AbWdtYXJsb3cu Y29tPgpEYXRlOiBNb24sIDI5IEphbiAyMDI0IDE3OjE2OjA0IC0wODAwClN1YmplY3Q6IFtQ QVRDSF0gSW5oaWJpdCBmaWxsLXBhcmFncmFwaCBvdXRzaWRlIG9mIGJsb2Nrcy9jb21tZW50 cwoKKiBsaXNwL3RleHRtb2Rlcy95YW1sLXRzLW1vZGUuZWwgKHlhbWwtdHMtbW9kZS0tZmls bC1wYXJhZ3JhcGgpOiBBdm9pZAogIGZpbGwtcGFyYWdyYXBoIHdoZW4gb3V0c2lkZSBvZiBi bG9ja19zY2FsYXIgb3IgY29tbWVudCBub2Rlcy4KLS0tCiBsaXNwL3RleHRtb2Rlcy95YW1s LXRzLW1vZGUuZWwgfCA1ICsrKy0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCsp LCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvdGV4dG1vZGVzL3lhbWwtdHMt bW9kZS5lbCBiL2xpc3AvdGV4dG1vZGVzL3lhbWwtdHMtbW9kZS5lbAppbmRleCBjMDE4NTQ1 N2JjMi4uYThjYjUwNGVmMDMgMTAwNjQ0Ci0tLSBhL2xpc3AvdGV4dG1vZGVzL3lhbWwtdHMt bW9kZS5lbAorKysgYi9saXNwL3RleHRtb2Rlcy95YW1sLXRzLW1vZGUuZWwKQEAgLTEyOCw3 ICsxMjgsNyBAQCBib3VuZGFyaWVzLiAgSlVTVElGWSBpcyBwYXNzZWQgdG8gYGZpbGwtcGFy YWdyYXBoJy4iCiAgIChzYXZlLXJlc3RyaWN0aW9uCiAgICAgKHdpZGVuKQogICAgIChsZXQg KChub2RlICh0cmVlc2l0LW5vZGUtYXQgKHBvaW50KSkpKQotICAgICAgKHdoZW4gKHN0cmlu Zz0gImJsb2NrX3NjYWxhciIgKHRyZWVzaXQtbm9kZS10eXBlIG5vZGUpKQorICAgICAgKGlm IChtZW1iZXIgKHRyZWVzaXQtbm9kZS10eXBlIG5vZGUpICcoImJsb2NrX3NjYWxhciIgImNv bW1lbnQiKSkKICAgICAgICAgKGxldCogKChzdGFydCAodHJlZXNpdC1ub2RlLXN0YXJ0IG5v ZGUpKQogICAgICAgICAgICAgICAgKGVuZCAodHJlZXNpdC1ub2RlLWVuZCBub2RlKSkKICAg ICAgICAgICAgICAgIChzdGFydC1tYXJrZXIgKHBvaW50LW1hcmtlcikpCkBAIC0xMzgsNyAr MTM4LDggQEAgYm91bmRhcmllcy4gIEpVU1RJRlkgaXMgcGFzc2VkIHRvIGBmaWxsLXBhcmFn cmFwaCcuIgogICAgICAgICAgICAgKGZvcndhcmQtbGluZSkKICAgICAgICAgICAgIChtb3Zl LW1hcmtlciBzdGFydC1tYXJrZXIgKHBvaW50KSkKICAgICAgICAgICAgIChuYXJyb3ctdG8t cmVnaW9uIChwb2ludCkgZW5kKSkKLSAgICAgICAgICAoZmlsbC1yZWdpb24gc3RhcnQtbWFy a2VyIGVuZCBqdXN0aWZ5KSkpKSkpCisgICAgICAgICAgKGZpbGwtcmVnaW9uIHN0YXJ0LW1h cmtlciBlbmQganVzdGlmeSkpCisgICAgICAgIHQpKSkpCiAKIDs7OyMjI2F1dG9sb2FkCiAo ZGVmaW5lLWRlcml2ZWQtbW9kZSB5YW1sLXRzLW1vZGUgdGV4dC1tb2RlICJZQU1MIgotLSAK Mi40Mi4wLndpbmRvd3MuMQoK --------------lpRgLdO6zOND21bvRgBA6nZS--