From unknown Tue Aug 19 12:51:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71760: 31.0.50; Filling jsdoc text doesn't work in js-ts-mode Resent-From: Damien Cassou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 24 Jun 2024 20:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71760 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 71760@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171926060019169 (code B ref -1); Mon, 24 Jun 2024 20:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Jun 2024 20:23:20 +0000 Received: from localhost ([127.0.0.1]:35696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLqDg-0004z7-7E for submit@debbugs.gnu.org; Mon, 24 Jun 2024 16:23:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLqDf-0004yz-2D for submit@debbugs.gnu.org; Mon, 24 Jun 2024 16:23:19 -0400 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 1sLqDd-000672-Fn for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2024 16:23:17 -0400 Received: from mail.reprendre.net ([193.23.30.35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sLqDb-0004N3-7K for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2024 16:23:17 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 5C2222C911B for ; Mon, 24 Jun 2024 22:23:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cassou.me; s=dkim; t=1719260592; h=from:subject:date:message-id:to:mime-version:content-type; bh=IHWCgx655vhd+UPvLeeqrIx870+D+oRT+rOW8fenkQ0=; b=TiLLbyg8nMfYMSTIWalfuSN6CKYZkIkZbR9Vqdik/p2CQnbaXVeM14wbKJi5Gz2xQ9y8p9 DIxSJ8EDycuxlwOcmTo2MNHoADF/7xFdX0NdwTUHoyO4dOu7FyNE0Er5Vm1aMyyfuU0xdW tMFnAgX47mqJw7ubSw/n1ehwi9Um3wjfDIUswdlgoyJqCq9mZKrMlSLt2MtRrvQYJ9zuw4 Fd6XB6LFopU0ox+p+nH6wS0Up1dkJgHlWCT27pqD7rxKlnX6+RnaojzZBY3095mu+ow6tx z/7wgU5rZheCpkOSWPIHFGOQtvWAxw7w1UTiTzRyIZNx31QGNoowUe90qf/3SA== From: Damien Cassou Date: Mon, 24 Jun 2024 22:23:06 +0200 Message-ID: <871q4mxf85.fsf@cassou.me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Last-TLS-Session-Version: TLSv1.3 Received-SPF: pass client-ip=193.23.30.35; envelope-from=damien@cassou.me; helo=mail.reprendre.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain Hi, in a commit recently merged in master (0edacf2aa7e53), js-ts-mode has been improved to use the jsdoc treesitter grammar on documentation. Font lock works great but M-q doesn't fill long lines. To reproduce, make sure your Emacs contains the above-mentioned commit and make sure you have the jsdoc treesitter grammar available. Then, save the attached JavaScript file to your disk and execute: $ emacs -Q --eval "(progn (find-file \"/home/cassou/tmp/test.js\") (js-ts-mode))" Move point to the middle of line 2 (or line 4) and press M-q. Expected: The paragraph is filled. Actual: Nothing changes. I tried changing the value of `c-ts-common--comment-regexp' to include "description" (as this is what the jsdoc parser uses for text) but the result is worse. I also tried reusing `js-fill-paragraph' but that fails as well. I would be happy to implement something and send a patch but I have no idea were to start. -- Damien Cassou "Success is the ability to go from one failure to another without losing enthusiasm." --Winston Churchill --=-=-= Content-Type: text/javascript Content-Disposition: attachment; filename=test.js /** * Test. rat art srs tr tr st rst artsar t arstienartsioenaroti eanrtsoi aerntso iaerst * * @param {string} bla - Some documentation of this parameter. ar tar star tsa rst arstar st arst art rs */ function f(bla) { } --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 25 09:05:20 2024 Received: (at control) by debbugs.gnu.org; 25 Jun 2024 13:05:20 +0000 Received: from localhost ([127.0.0.1]:36465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sM5rM-0000Ew-6l for submit@debbugs.gnu.org; Tue, 25 Jun 2024 09:05:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sM5rG-0000EQ-LG; Tue, 25 Jun 2024 09:05:15 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sM5r9-0006fb-J5; Tue, 25 Jun 2024 09:05:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=dNuhdnKi6H/ZvkHt1bCjwH8SKO+7mOhyfqRu184YtH8=; b=cHyZCaL6R0h2 rNhM7vilOptZ+hguIjof1Jv34j3fD5HyepgMViJeFm7mkV0gF90T6UwTmdPGMzmQk2i0yGNmEaYzA hxSlaBIsEPUmUrHPCCno3YUKB2otxU3R6/403zGsHIF32khxmP5GYn9kbPe7wMicIjQb0tvKKIgsk JhsYLvO3fYhY5ThjUJIzU/msKz97HYaoyvoOD4CUwqn2kn/Um0NyWvuIlOrPKZ4JQUg6kk4zrYJza iqFIzRv0KZESDLsxXRgcSzAQMBb+Tfc1i0TPfjVY2k5O0AbvmP+ARx3R4FcJc+3qsCgFOwnDJlync FVeAbKK+ahfc1uoqcsM/tQ==; Date: Tue, 25 Jun 2024 16:05:04 +0300 Message-Id: <86r0cl9nr3.fsf@gnu.org> From: Eli Zaretskii To: Damien Cassou In-Reply-To: <875xtyxhr7.fsf@cassou.me> (message from Damien Cassou on Mon, 24 Jun 2024 21:28:28 +0200) Subject: Re: bug#71768: 31.0.50; Filling jsdoc text doesn't work in js-ts-mode References: <875xtyxhr7.fsf@cassou.me> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control Cc: 71768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) merge 71768 71760 thanks > From: Damien Cassou > Date: Mon, 24 Jun 2024 21:28:28 +0200 > > Hi, > > in a commit recently merged in master (0edacf2aa7e53), js-ts-mode has > been improved to use the jsdoc treesitter grammar on documentation. Font > lock works great but M-q doesn't fill long lines. > > To reproduce, make sure your Emacs contains the above-mentioned commit > and make sure you have the jsdoc treesitter grammar available. Then, > save the attached JavaScript file to your disk and execute: > > $ emacs -Q --eval "(progn (find-file \"/home/cassou/tmp/test.js\") (js-ts-mode))" > > Move point to the middle of line 2 (or line 4) and press M-q. > > Expected: The paragraph is filled. > > Actual: Nothing changes. > > I tried changing the value of `c-ts-common--comment-regexp' to include > "description" (as this is what the jsdoc parser uses for text) but the > result is worse. I also tried reusing `js-fill-paragraph' but that fails > as well. > > I would be happy to implement something and send a patch but I have no > idea were to start. This is an exact duplicate of bug#71760 which you submitted an hour later, from a different email address. I'm merging them. From unknown Tue Aug 19 12:51:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks References: <871q4mxf85.fsf@cassou.me> In-Reply-To: <871q4mxf85.fsf@cassou.me> Resent-From: Damien Cassou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 29 Jul 2024 19:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71760 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 71760@debbugs.gnu.org Cc: Yuan Fu Received: via spool by 71760-submit@debbugs.gnu.org id=B71760.172228181418944 (code B ref 71760); Mon, 29 Jul 2024 19:37:01 +0000 Received: (at 71760) by debbugs.gnu.org; 29 Jul 2024 19:36:54 +0000 Received: from localhost ([127.0.0.1]:46389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYWAv-0004vU-Hd for submit@debbugs.gnu.org; Mon, 29 Jul 2024 15:36:53 -0400 Received: from mail.reprendre.net ([193.23.30.35]:54302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYWAr-0004vJ-IX for 71760@debbugs.gnu.org; Mon, 29 Jul 2024 15:36:52 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id DACBF2C0AFD; Mon, 29 Jul 2024 21:36:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cassou.me; s=dkim; t=1722281764; h=from:subject:date:message-id:to:cc:mime-version:content-type; bh=WbqEcNvt1nzZ16pweOYdXOyPZT0f0XAykAJIylG3Y9c=; b=loj1qI0YDFgWFHpULyU4+RcLUE4ZWF6L8y3IhlMKYmqK1pzR/zx0WJdy/hN7KtjRAUgMgT /cTpNfvfeSSMmt7jFS5gs0xjB47q3n6ccgeDqePVugf6fNkCO/bD7U9giyHpn//HOauiwd A4IPNOzvLJuKB2bzuQO+Z8Yfy18Pj9MS+k8m1khdJ42ajbJCPYk+DezwOQvU9151yHnxYM 5SbD8I+2EyJaRKV74IhQC29i/4OY5X8TbOudhJy1fyoSAuzz71I9ITAm/PXzt/gCDHl8h2 UrZUs5hVbrMPhO0HdfdcQeVBlVM0GrehcO36X7zvgmY2oVLGWUqiWsH/D4ETiQ== From: Damien Cassou Date: Mon, 29 Jul 2024 21:36:02 +0200 Message-ID: <875xsoousd.fsf@cassou.me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Last-TLS-Session-Version: TLSv1.3 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Tags: patch Hi, the attached patches 1. add "description" (the kind of treesit node used for texts by the jsdoc parser) to `c-ts-common--comment-regexp' in js-ts-mode; 2. make `c-ts-common--fill-block-comment' only remove a mask if it has added it in the first place. Best -- Damien Cassou "Success is the ability to go from one failure to another without losing enthusiasm." --Winston Churchill --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-js-ts-mode-Make-jsdoc-s-description-block-a-comment.patch >From e444692026cae97dfaecebf5972507ae95f5e488 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 21 Jul 2024 21:32:34 +0200 Subject: [PATCH 1/2] js-ts-mode: Make jsdoc's "description" block a comment * lisp/progmodes/js.el (js-ts-mode): Add "description" to `c-ts-common--comment-regexp'. --- lisp/progmodes/js.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index f8140c14a49..75c8111035c 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3946,7 +3946,9 @@ js-ts-mode :embed 'jsdoc :host 'javascript :local t - `(((comment) @capture (:match ,js--treesit-jsdoc-beginning-regexp @capture)))))) + `(((comment) @capture (:match ,js--treesit-jsdoc-beginning-regexp @capture))))) + + (setq c-ts-common--comment-regexp (rx (or "comment" "line_comment" "block_comment" "description")))) ;; Imenu (setq-local treesit-simple-imenu-settings -- 2.45.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-c-ts-common-Don-t-insert-wrong-characters-during-fil.patch >From cf14e3b25245dac98adcf90723e4a0c601f65528 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 21 Jul 2024 21:33:59 +0200 Subject: [PATCH 2/2] c-ts-common: Don't insert wrong characters during filling * lisp/progmodes/c-ts-common.el (c-ts-common--fill-block-comment): If masking hasn't been done, don't unmask. --- lisp/progmodes/c-ts-common.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el index 3882a697c48..14dd29e07e2 100644 --- a/lisp/progmodes/c-ts-common.el +++ b/lisp/progmodes/c-ts-common.el @@ -151,7 +151,9 @@ c-ts-common--fill-block-comment (orig-point (point-marker)) (start-marker (point-marker)) (end-marker nil) - (end-len 0)) + (end-len 0) + (start-mask-done nil) + (end-mask-done nil)) (move-marker start-marker start) ;; We mask "/*" and the space before "*/" like ;; `c-fill-paragraph' does. @@ -162,6 +164,7 @@ c-ts-common--fill-block-comment (group "/") "*")) (goto-char (match-beginning 1)) (move-marker start-marker (point)) + (setq start-mask-done t) (replace-match " " nil nil nil 1)) ;; Include whitespaces before /*. @@ -179,6 +182,7 @@ c-ts-common--fill-block-comment (goto-char (match-beginning 1)) (setq end-marker (point-marker)) (setq end-len (- (match-end 1) (match-beginning 1))) + (setq end-mask-done t) (replace-match (make-string end-len ?x) nil nil nil 1)) @@ -206,11 +210,11 @@ c-ts-common--fill-block-comment (fill-region (max start-marker para-start) (min end para-end) arg)) ;; Unmask. - (when start-marker + (when (and start-mask-done start-marker) (goto-char start-marker) (delete-char 1) (insert "/")) - (when end-marker + (when (and end-mask-done start-marker) (goto-char end-marker) (delete-region (point) (+ end-len (point))) (insert (make-string end-len ?\s))) -- 2.45.2 --=-=-=-- From unknown Tue Aug 19 12:51:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks Resent-From: Damien Cassou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 31 Jul 2024 08:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71760 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 71760@debbugs.gnu.org Cc: Yuan Fu Received: via spool by 71760-submit@debbugs.gnu.org id=B71760.17224143763147 (code B ref 71760); Wed, 31 Jul 2024 08:27:01 +0000 Received: (at 71760) by debbugs.gnu.org; 31 Jul 2024 08:26:16 +0000 Received: from localhost ([127.0.0.1]:49072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4f1-0000og-KQ for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:26:16 -0400 Received: from mail.reprendre.net ([193.23.30.35]:36196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4ey-0000oU-1v for 71760@debbugs.gnu.org; Wed, 31 Jul 2024 04:26:14 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 7D3EE2C0B4D; Wed, 31 Jul 2024 10:25:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cassou.me; s=dkim; t=1722414355; h=from:subject:date:message-id:to:cc:mime-version:content-type: in-reply-to:references; bh=SIw/XQ5k+CpLJTBQE7g1c4Xe3AePloLOSExT0iZPLf4=; b=hOwLjk+79fN5SiNp14jXhKm/AZj9BIeHgT9oSvU0oPpUXXOl5SKbbtVHfHnWIfEpVGg+Ym hl3eYg122wUT99Ti3pWJaayb+RxbinTe7TIJpvn48XPa9V3Cctni2UHdRYA97MVH2IfaMi 4NnIbZQhkCF4GPRBjPW6N3AAlGHlxNaUK6CZOUKQ19dA0SZR7j0Wy0TRhdTsSXdYgSpkU2 qw7QiZYY9pcVjeOPeTbnzoN/siwjEUwLG3CBmBNyNihh0gF1upmbgWSdh/Ns1FcEIsTZ+A 8FomREnISMZUV7ScjpV7xGmYGTNuJa1s9n6s2ALL//d89djkGHHYSg9xAfTWAw== From: Damien Cassou In-Reply-To: <875xsoousd.fsf@cassou.me> References: <875xsoousd.fsf@cassou.me> Date: Wed, 31 Jul 2024 10:25:51 +0200 Message-ID: <87sevqx90w.fsf@cassou.me> MIME-Version: 1.0 Content-Type: text/plain X-Last-TLS-Session-Version: TLSv1.3 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, after today's fix on c-ts-mode by Yuan Fu, the only patch still necessary to apply for js-ts-mode to properly fill jsdoc descriptions is 0001-js-ts-mode-Make-jsdoc-s-description-block-a-comment.patch. Damien Cassou writes: > Tags: patch > > Hi, > > the attached patches > > 1. add "description" (the kind of treesit node used for texts by the > jsdoc parser) to `c-ts-common--comment-regexp' in js-ts-mode; > > 2. make `c-ts-common--fill-block-comment' only remove a mask if it has > added it in the first place. > > Best > > -- > Damien Cassou > > "Success is the ability to go from one failure to another without > losing enthusiasm." --Winston Churchill > From e444692026cae97dfaecebf5972507ae95f5e488 Mon Sep 17 00:00:00 2001 > From: Damien Cassou > Date: Sun, 21 Jul 2024 21:32:34 +0200 > Subject: [PATCH 1/2] js-ts-mode: Make jsdoc's "description" block a comment > > * lisp/progmodes/js.el (js-ts-mode): Add "description" to > `c-ts-common--comment-regexp'. > --- > lisp/progmodes/js.el | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el > index f8140c14a49..75c8111035c 100644 > --- a/lisp/progmodes/js.el > +++ b/lisp/progmodes/js.el > @@ -3946,7 +3946,9 @@ js-ts-mode > :embed 'jsdoc > :host 'javascript > :local t > - `(((comment) @capture (:match ,js--treesit-jsdoc-beginning-regexp @capture)))))) > + `(((comment) @capture (:match ,js--treesit-jsdoc-beginning-regexp @capture))))) > + > + (setq c-ts-common--comment-regexp (rx (or "comment" "line_comment" "block_comment" "description")))) > > ;; Imenu > (setq-local treesit-simple-imenu-settings > -- > 2.45.2 > > From cf14e3b25245dac98adcf90723e4a0c601f65528 Mon Sep 17 00:00:00 2001 > From: Damien Cassou > Date: Sun, 21 Jul 2024 21:33:59 +0200 > Subject: [PATCH 2/2] c-ts-common: Don't insert wrong characters during filling > > * lisp/progmodes/c-ts-common.el (c-ts-common--fill-block-comment): If > masking hasn't been done, don't unmask. > --- > lisp/progmodes/c-ts-common.el | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el > index 3882a697c48..14dd29e07e2 100644 > --- a/lisp/progmodes/c-ts-common.el > +++ b/lisp/progmodes/c-ts-common.el > @@ -151,7 +151,9 @@ c-ts-common--fill-block-comment > (orig-point (point-marker)) > (start-marker (point-marker)) > (end-marker nil) > - (end-len 0)) > + (end-len 0) > + (start-mask-done nil) > + (end-mask-done nil)) > (move-marker start-marker start) > ;; We mask "/*" and the space before "*/" like > ;; `c-fill-paragraph' does. > @@ -162,6 +164,7 @@ c-ts-common--fill-block-comment > (group "/") "*")) > (goto-char (match-beginning 1)) > (move-marker start-marker (point)) > + (setq start-mask-done t) > (replace-match " " nil nil nil 1)) > > ;; Include whitespaces before /*. > @@ -179,6 +182,7 @@ c-ts-common--fill-block-comment > (goto-char (match-beginning 1)) > (setq end-marker (point-marker)) > (setq end-len (- (match-end 1) (match-beginning 1))) > + (setq end-mask-done t) > (replace-match (make-string end-len ?x) > nil nil nil 1)) > > @@ -206,11 +210,11 @@ c-ts-common--fill-block-comment > (fill-region (max start-marker para-start) (min end para-end) arg)) > > ;; Unmask. > - (when start-marker > + (when (and start-mask-done start-marker) > (goto-char start-marker) > (delete-char 1) > (insert "/")) > - (when end-marker > + (when (and end-mask-done start-marker) > (goto-char end-marker) > (delete-region (point) (+ end-len (point))) > (insert (make-string end-len ?\s))) > -- > 2.45.2 > -- Damien Cassou "Success is the ability to go from one failure to another without losing enthusiasm." --Winston Churchill From unknown Tue Aug 19 12:51:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 01 Aug 2024 01:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71760 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Damien Cassou , 71760@debbugs.gnu.org Cc: Yuan Fu Received: via spool by 71760-submit@debbugs.gnu.org id=B71760.17224740874148 (code B ref 71760); Thu, 01 Aug 2024 01:02:01 +0000 Received: (at 71760) by debbugs.gnu.org; 1 Aug 2024 01:01:27 +0000 Received: from localhost ([127.0.0.1]:50459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZKC6-00014q-Ps for submit@debbugs.gnu.org; Wed, 31 Jul 2024 21:01:27 -0400 Received: from fout7-smtp.messagingengine.com ([103.168.172.150]:33887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZKC1-00014X-IZ for 71760@debbugs.gnu.org; Wed, 31 Jul 2024 21:01:25 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailfout.nyi.internal (Postfix) with ESMTP id ED2CA1382B0D; Wed, 31 Jul 2024 21:00:59 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Wed, 31 Jul 2024 21:00:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; 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=fm2; t=1722474059; x=1722560459; bh=Zn2esF9yQgv6A7A8pDx9WGuztW4Ls4Iii/rp7uE77ek=; b= x9MU8zLbNITj5oRuvzPdb4+wbn1C0bfw02lPdh+xVY0Yclz5gdIcEgqUXJxFr6rk 8rmS5a9yPk/ntAXjePMfc/5Vc0OHXaPk+CILbVDv3YU40b2+r1Btbuzft6EBQh1e hzqPL7Mbe2fcLh3itZCBuW275V/o8iP3a/tKL5RI+HQNNpfutb4ABdUjfbOreXtQ eXxThxJ8Xo2YpkfpNgeJ4B0tkNq6UXdDaXRoNnXmrKDVULvL7qzZiJ/mw4aok316 RPNo8MlbPBv5yvCAHrSNkHWZ9OWXxMr1tKBgfK5LOITghRzq8k2Eg/mTpZsPXtDd HM0YsJRnzbMTBOgqirm/Rw== 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=1722474059; x= 1722560459; bh=Zn2esF9yQgv6A7A8pDx9WGuztW4Ls4Iii/rp7uE77ek=; b=R gKHrVLHN/aLXdHcz/cXy5vykSDATierGln5UJy4ZPnqzxETd846pmuGS4kvHrTbI 6NP7xFaQycsoCpKBR5Q0geB+xNyd15nXMUxXDaOtWHIj7YWmy8hcVYYyujhw3A6w 1CIH4DrSCF6L0rnHHskGPVQbFZsI51OgXCoaHgcYo/dXjXrJt8mesqy9moy52Mil EVAKcOlTm2b/hE6bJtO46lxvvd1uT37GWUSdkJjFAaNg6RRyO9T+jBEcFDmsq1nu OjcFOqvVStp5hVaMJNg2cgXfCFRaFCG0UWUb75Ngkk+AKdaxpBA0q3jIjM2A7WEr kLIHUzR7gJFEdoyS40N9Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrjeejgdegvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomhepffhmihht rhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrghtth gvrhhnpeetudeljeegheetgfehgeejkeeuhedvveeikeeufedtvddtveefhfdvveegudej heenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegumh hithhrhiesghhuthhovhdruggvvhdpnhgspghrtghpthhtoheptd X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 31 Jul 2024 21:00:58 -0400 (EDT) Message-ID: <94fbe0b9-004b-49ea-9a22-de1e4f1d6f68@gutov.dev> Date: Thu, 1 Aug 2024 04:00:55 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <875xsoousd.fsf@cassou.me> <87sevqx90w.fsf@cassou.me> Content-Language: en-US From: Dmitry Gutov In-Reply-To: <87sevqx90w.fsf@cassou.me> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi! On 31/07/2024 11:25, Damien Cassou wrote: > after today's fix on c-ts-mode by Yuan Fu, the only patch still > necessary to apply for js-ts-mode to properly fill jsdoc descriptions > is 0001-js-ts-mode-Make-jsdoc-s-description-block-a-comment.patch. Since bug#72116 is only fixed on master, does this mean that the aforementioned patch is also best for Emacs 31, or would we want it in the upcoming release as well? From unknown Tue Aug 19 12:51:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 01 Aug 2024 01:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71760 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: Damien Cassou , 71760@debbugs.gnu.org Received: via spool by 71760-submit@debbugs.gnu.org id=B71760.17224745744865 (code B ref 71760); Thu, 01 Aug 2024 01:10:02 +0000 Received: (at 71760) by debbugs.gnu.org; 1 Aug 2024 01:09:34 +0000 Received: from localhost ([127.0.0.1]:50463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZKJx-0001GO-RH for submit@debbugs.gnu.org; Wed, 31 Jul 2024 21:09:34 -0400 Received: from mail-ot1-f43.google.com ([209.85.210.43]:53521) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZKJw-0001GB-4o for 71760@debbugs.gnu.org; Wed, 31 Jul 2024 21:09:32 -0400 Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-7094641d4e6so2158286a34.3 for <71760@debbugs.gnu.org>; Wed, 31 Jul 2024 18:09:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722474490; x=1723079290; darn=debbugs.gnu.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=t3Ffew4SuzIrXQeOYPfrV90XbcgMCp6nxKSfXjVOrWA=; b=NYqfqFjsWf1qv7J7iycE3rzqGCr6oEcDxzLAsf/Uqcy1L0tdP16vhgahFSPdOahMER CF23ktgbH14JEePSvu1x8YGOquTFy1f5DMF4nvUzH+S061FIj5erapipbdtsjVlMrFNq l+GbEQg6ccjoQJ3T8mczPgpetowRso516f6HLboDG/EINQMSPZZuzLzUD9/fA9zFk073 lJBdx2igOdhKBkGSIa00LdXwbo6pD/DtShVW7Rd+yTYOxmcDRw4UwKeSqpsztJTpJGBP oRhufCir87HUZslqgVg5dnOcUeEEaaIcxAX5gPp9nrWAl+iAeGQXh7P9/WTBR2fKuO/X rbTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722474490; x=1723079290; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t3Ffew4SuzIrXQeOYPfrV90XbcgMCp6nxKSfXjVOrWA=; b=AYPMBYKoCJGJXBRhrr6gdRgxegMxkilXV9THtG+Aaw3FMJH/Zz9YIyTtAksV8ZNQUx MA7ekJ7z20DQLBUdGJfcDrRK3LA3m3x7ILyaFMz4f8XTo1mXhvFimQDRkYOV4PysS1+4 03BKBvH1Sc4DgtcvaQQrGPZH1+oyrMUIslB94iW35/57L75le6OtvZiKSandc1hu8JUD qw0r7fX/AQ+Gjyouf3WNsS9G8CWNK/SzMxnDr5QAg7UISvlzCyQ/ZjVNHsyiFGM27NlE bHpm3jCrBYbc8IUwT9kNZk3BKPUmJH+cbFcuc3yBFxqPc8wUjw0EC8b+DjTPya9PYOdQ 45tw== X-Forwarded-Encrypted: i=1; AJvYcCUGbzSNoUmFemfab7OrJl3QStrS5uX9CsfLiNyx5Bf/9+1tgquuM63wXjqJmf00ETQ2zll1N1yTQf835qj1+CURdJppBMw= X-Gm-Message-State: AOJu0YwznM/IbZ2Aleo9LqweWxGfcMkzzy8g2o6RM+GjMMEMmdH6gBRt 8OU4r/1SgYpzAqaqdcGISNUbEUa/koyNWUJkHeyjNBrIAJle+fRu X-Google-Smtp-Source: AGHT+IGH+MmuNZJWMVUuJl+O0A7MRpKTijgN+emkjrVL5ncuU4Jk9jDnm+REx+y3jhzHV/BPkF071A== X-Received: by 2002:a05:6830:648a:b0:703:fdda:fe2b with SMTP id 46e09a7af769-7096b81e9b3mr918285a34.11.1722474490185; Wed, 31 Jul 2024 18:08:10 -0700 (PDT) Received: from smtpclient.apple (wsip-184-185-65-21.ok.ok.cox.net. [184.185.65.21]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7095ad68c8bsm1172101a34.17.2024.07.31.18.08.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jul 2024 18:08:09 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.600.62\)) From: Yuan Fu In-Reply-To: <94fbe0b9-004b-49ea-9a22-de1e4f1d6f68@gutov.dev> Date: Wed, 31 Jul 2024 18:07:57 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <965418E3-4D87-4F83-8CFD-4BDDDE749BBF@gmail.com> References: <875xsoousd.fsf@cassou.me> <87sevqx90w.fsf@cassou.me> <94fbe0b9-004b-49ea-9a22-de1e4f1d6f68@gutov.dev> X-Mailer: Apple Mail (2.3774.600.62) X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > On Jul 31, 2024, at 6:00=E2=80=AFPM, Dmitry Gutov = wrote: >=20 > Hi! >=20 > On 31/07/2024 11:25, Damien Cassou wrote: >> after today's fix on c-ts-mode by Yuan Fu, the only patch still >> necessary to apply for js-ts-mode to properly fill jsdoc descriptions >> is 0001-js-ts-mode-Make-jsdoc-s-description-block-a-comment.patch. >=20 > Since bug#72116 is only fixed on master, does this mean that the = aforementioned patch is also best for Emacs 31, or would we want it in = the upcoming release as well? >=20 We should apply the masking patch to emacs-30. Thought I think it can be = simplified. I=E2=80=99ll try make one for you guys to review tonight. Yuan= From unknown Tue Aug 19 12:51:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 01 Aug 2024 07:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71760 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: Damien Cassou , 71760@debbugs.gnu.org Received: via spool by 71760-submit@debbugs.gnu.org id=B71760.172249788912687 (code B ref 71760); Thu, 01 Aug 2024 07:39:02 +0000 Received: (at 71760) by debbugs.gnu.org; 1 Aug 2024 07:38:09 +0000 Received: from localhost ([127.0.0.1]:50745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZQO0-0003IX-SN for submit@debbugs.gnu.org; Thu, 01 Aug 2024 03:38:09 -0400 Received: from mail-pj1-f52.google.com ([209.85.216.52]:45533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZQNx-0003Hz-OZ for 71760@debbugs.gnu.org; Thu, 01 Aug 2024 03:38:06 -0400 Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2cb4c584029so4511286a91.3 for <71760@debbugs.gnu.org>; Thu, 01 Aug 2024 00:37:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722497803; x=1723102603; darn=debbugs.gnu.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=J0WRYHCRZX4affgGkTKY6/96IkaRhvki/e4XKyWhqs8=; b=S3dGLZP+p99oXteTR3xHKQdlNt5FOZSk275CuOaCQY3X99pBz+npKg/gA9OPILVq0x WLGQgnTYJtZo+7SEF0ejCY62m/PYqvGaUY2ZlOPwGbCvS7enoGMeGhEZyrg6qBZ+//g1 Va92//WrFQNqz3DmoAWVzTIl8KJ0hKWXxwr3duT2Z1PLLsMk/EnXujb+3ofJrzS2CxWs 6BDqwhqHq8VZGTjIO8nnV1TzfFpQ9ZFk1R866enfGIfT5pDc3PmhdkuQt2GHZ1LHltVP zJHXbCPKqeySojjpldN0lYfsO4ZF/75UY2F5kdD00UpnIQbSPgoWF+T4jtiV022Q5vW5 5+LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722497803; x=1723102603; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J0WRYHCRZX4affgGkTKY6/96IkaRhvki/e4XKyWhqs8=; b=KyJofXvYSYYU/dhng+xsiHonUTbwNunIShDdenLjdODE74Ej+Fkz+I3AbYw5kbw/Zw 2gTlYccY91vo/sK+x1QkIlgSErQFO8jCEhU5uVpNK7dJSrcTEPUpp3jdxOGnr2XRM0/j G/iWFgLEea6ZCm0E+g24KIhID++EJonpJHZWNihWL7c/QgidAExh9kPRXAf+UiTQPqZV H7F3KK0H9wCzV+1WswBBH3uHVZs8cLEt+R1S8XSJW0JupnqIJzmFDch6fsmcY73W7pbg 9N/7CJXDCV/4iZq6jrCIjDxJ2S7oyrTj7sf9rTdIpi+wGdnoGNhe9N5eZyEKu9PEQCBs BDzw== X-Forwarded-Encrypted: i=1; AJvYcCXFsN0RgO1ksGIZX1/VGCgohAPr2Tk/d01+jMlCx8HW4LeJo5o9MUL9nc4AIGC3mj6c9M75NiQZdPbwbpCDrILpoIG0RjQ= X-Gm-Message-State: AOJu0Yx2/FEdQ0x9IDIPWU6YxPdGnOqChR03FRDonAAIom4p9BzWV0TZ 1HNrxPFMQuwij44pcPFdYH4SYXJI10jnDjB9i17NOcjbG0cnWBX2 X-Google-Smtp-Source: AGHT+IHWLkO1021V4LRf3IkFLwMdbj9d4dGT3LFDFUqxfm3T2JjA54r2rYBvLNOenpTg2DcTaikrwA== X-Received: by 2002:a17:90a:bc97:b0:2c9:5a87:f17c with SMTP id 98e67ed59e1d1-2cfe7876dd8mr1851327a91.15.1722497803026; Thu, 01 Aug 2024 00:36:43 -0700 (PDT) Received: from smtpclient.apple ([2601:646:8f81:6120:f1d7:27a6:614b:a994]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cfdc4320b4sm2546273a91.20.2024.08.01.00.36.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Aug 2024 00:36:42 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.600.62\)) From: Yuan Fu In-Reply-To: <965418E3-4D87-4F83-8CFD-4BDDDE749BBF@gmail.com> Date: Thu, 1 Aug 2024 00:36:30 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: References: <875xsoousd.fsf@cassou.me> <87sevqx90w.fsf@cassou.me> <94fbe0b9-004b-49ea-9a22-de1e4f1d6f68@gutov.dev> <965418E3-4D87-4F83-8CFD-4BDDDE749BBF@gmail.com> X-Mailer: Apple Mail (2.3774.600.62) X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > On Jul 31, 2024, at 6:07=E2=80=AFPM, Yuan Fu = wrote: >=20 >=20 >=20 >> On Jul 31, 2024, at 6:00=E2=80=AFPM, Dmitry Gutov = wrote: >>=20 >> Hi! >>=20 >> On 31/07/2024 11:25, Damien Cassou wrote: >>> after today's fix on c-ts-mode by Yuan Fu, the only patch still >>> necessary to apply for js-ts-mode to properly fill jsdoc = descriptions >>> is 0001-js-ts-mode-Make-jsdoc-s-description-block-a-comment.patch. >>=20 >> Since bug#72116 is only fixed on master, does this mean that the = aforementioned patch is also best for Emacs 31, or would we want it in = the upcoming release as well? >>=20 >=20 > We should apply the masking patch to emacs-30. Thought I think it can = be simplified. I=E2=80=99ll try make one for you guys to review tonight. >=20 > Yuan Actually, the original patch is perfectly good. The =E2=80=9Csimplificatio= n=E2=80=9D I have in mind is more or less unnecessary. Yuan From unknown Tue Aug 19 12:51:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks Resent-From: Damien Cassou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 01 Aug 2024 10:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71760 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Yuan Fu , Dmitry Gutov Cc: 71760@debbugs.gnu.org Received: via spool by 71760-submit@debbugs.gnu.org id=B71760.172250802830144 (code B ref 71760); Thu, 01 Aug 2024 10:28:02 +0000 Received: (at 71760) by debbugs.gnu.org; 1 Aug 2024 10:27:08 +0000 Received: from localhost ([127.0.0.1]:50920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZT1Y-0007q8-4a for submit@debbugs.gnu.org; Thu, 01 Aug 2024 06:27:08 -0400 Received: from mail.reprendre.net ([193.23.30.35]:45400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZT1U-0007py-Ua for 71760@debbugs.gnu.org; Thu, 01 Aug 2024 06:27:06 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 63F352C0B54; Thu, 1 Aug 2024 12:26:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cassou.me; s=dkim; t=1722507976; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=7xNjM0mYdl6tJt3DI0L1QkWNmzd11JbFvKbTYQg/Gas=; b=RHDUlj7dTTblgJL1DQqwKBBfr4LooyuqQ5J78/ABf9WDspSun2H1zhKh86TjThtCJhmsPF /W80InxQZRT5rRtnLQWwNS6hNgd5APucLXOd3ecZT20uuFYhTt/8nZ1WZmV/05UZBGCZZP PYZE7Dxen8wSxojNVJF1M7CgBdKQZPknPgxfce+7G7hYg5lWQuCLtYeix+ulyZ37bK4O4s bYYZquhHwxDwR/bGUyvT1uN9GZp4rgMxCsrmNlSmCiRWEtX3ga6TpPyzsYUm0l68Z0y3RA 3DoUyWHvtlyoZwlMcRLlRH42naApII61xpNNWcj1R6kwB23WFem8b70c9ZtVdw== From: Damien Cassou In-Reply-To: References: <875xsoousd.fsf@cassou.me> <87sevqx90w.fsf@cassou.me> <94fbe0b9-004b-49ea-9a22-de1e4f1d6f68@gutov.dev> <965418E3-4D87-4F83-8CFD-4BDDDE749BBF@gmail.com> Date: Thu, 01 Aug 2024 12:26:14 +0200 Message-ID: <87ed78y1x5.fsf@cassou.me> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Yuan Fu writes: > Actually, the original patch is perfectly good. The =E2=80=9Csimplificati= on=E2=80=9D I have in mind is more or less unnecessary. if possible, I would appreciate Yuan's patches and 0001-js-ts-mode-Make-jsdoc-s-description-block-a-comment.patch to be merged into emacs-30. --=20 Damien Cassou "Success is the ability to go from one failure to another without losing enthusiasm." --Winston Churchill From unknown Tue Aug 19 12:51:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 01 Aug 2024 21:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71760 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Yuan Fu Cc: Damien Cassou , 71760@debbugs.gnu.org Received: via spool by 71760-submit@debbugs.gnu.org id=B71760.17225476262334 (code B ref 71760); Thu, 01 Aug 2024 21:28:01 +0000 Received: (at 71760) by debbugs.gnu.org; 1 Aug 2024 21:27:06 +0000 Received: from localhost ([127.0.0.1]:52008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZdKE-0000bZ-3N for submit@debbugs.gnu.org; Thu, 01 Aug 2024 17:27:06 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:60105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZdKB-0000b2-Bv for 71760@debbugs.gnu.org; Thu, 01 Aug 2024 17:27:05 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 77F6011504FA; Thu, 1 Aug 2024 17:26:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 01 Aug 2024 17:26:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; 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=fm2; t=1722547600; x=1722634000; bh=/st3xCQx7PsnMlIL6iF5JnYQrtiP4KNoxcFup2uahS8=; b= VcWmmfmuy8VfY96QOvYfTXZhNTPpaWL1wty9pFMTNbxYohCY0gvnz1avcAKsmk/e qzo8Fg8IFyECZYzOE+n++FZwg09quOzD4aLUi8Ilks7RRHUY05VUWOik1ZTqAFYU GAOVI5IwF01JdyEMeA6HVGrdfFW/F9B+c5XKfmoDIjlTe9+wacHw8c2yr9xCY7Ue 3lmUJRpBnLDCWaWtM+KMqnnU8mEaN02D3qlNiFDJF8xoX3qMJc+KcPZfyr5T73yj hT+dgy3bWcjRD94PvrbvuznN3duBwxHQV/KRB979t3+ZxK5uaPwxXww5P2x74fgv YBVYsctcxgDH9Sd8ZLj4mw== 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=1722547600; x= 1722634000; bh=/st3xCQx7PsnMlIL6iF5JnYQrtiP4KNoxcFup2uahS8=; b=V vV5R3pRCV5bnZBX8jKgSZo5Kj1f+qKxUOiSWhl2hzkOpiWDUM9cZkjhLJCcctEoH u30lgcZbiAevH6x7QGJQLW5VgKS3rjauNbPjMAYkOmrGnhV0AaW1K0kAttrvGuHR p8HRurD1SYFkqm+RRBa7G7YiI9QJUyfeaosi+mFlFpzl9S0z8Ftp7enAmnzQMEkp Rml2ZmqIufrnNe4BJZ/i9IhY8bMNTgxE6eaklUUEL/DS9Npq7zAGBGcWi2Jk+BMP /Cmu0qYCtL7kOQVt1ZJ6zNICdxdIu8EBTcj/1m/OP6bBqqmjKnVwTsa1p77h2S3p yE8mtn+yuYeCKsFFNeEeA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrjeekgdduiedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtkeertddtvdejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepgeelfeetkefghfdvhfdtgeevveevteetgeetveegtedthefhudekteehffeu keeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug hmihhtrhihsehguhhtohhvrdguvghvpdhnsggprhgtphhtthhopedt X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 1 Aug 2024 17:26:38 -0400 (EDT) Message-ID: <9a1f6d7c-b7e6-4da4-845c-c9dee5baa8c1@gutov.dev> Date: Fri, 2 Aug 2024 00:26:37 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <875xsoousd.fsf@cassou.me> <87sevqx90w.fsf@cassou.me> <94fbe0b9-004b-49ea-9a22-de1e4f1d6f68@gutov.dev> <965418E3-4D87-4F83-8CFD-4BDDDE749BBF@gmail.com> Content-Language: en-US From: Dmitry Gutov In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Yuan, On 01/08/2024 10:36, Yuan Fu wrote: > Actually, the original patch is perfectly good. The “simplification” I have in mind is more or less unnecessary. I think Damien is saying that patch#2 from his submission is not necessary with your fix (commit 74bb1e5897f, IIUC). So do you think it's a good idea to backport it to emacs-30? From unknown Tue Aug 19 12:51:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 03 Aug 2024 07:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71760 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: Damien Cassou , 71760@debbugs.gnu.org Received: via spool by 71760-submit@debbugs.gnu.org id=B71760.172267056516478 (code B ref 71760); Sat, 03 Aug 2024 07:37:02 +0000 Received: (at 71760) by debbugs.gnu.org; 3 Aug 2024 07:36:05 +0000 Received: from localhost ([127.0.0.1]:54023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sa9J6-0004Hh-8n for submit@debbugs.gnu.org; Sat, 03 Aug 2024 03:36:05 -0400 Received: from mail-oa1-f53.google.com ([209.85.160.53]:57506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sa9J3-0004HC-Fx for 71760@debbugs.gnu.org; Sat, 03 Aug 2024 03:36:03 -0400 Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-2642cfb2f6aso5704875fac.2 for <71760@debbugs.gnu.org>; Sat, 03 Aug 2024 00:35:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722670476; x=1723275276; darn=debbugs.gnu.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=RO8X5EAUs2/c9WkhWsewYyVlMwL07yIO0/Zm4FK4HSE=; b=A5b+lZljXIU98ayfsZZ52Nq69F5786EJyknXnJzHy47VsRJGA75qXRBvkJ/mlIS5GB /dsCJ1iYa2XYZmN1M2th8vOUPysdL0bSe1vtksO2YdPsLWx0duxQPLHFpRr/yGOkZD+3 TtUypUks7EhZGFaxL+roFr+g7SQC/knk9IqPEVU+PuI4agJHm9SS+GBhoSPTniUM20E5 fUkhNdE5ok2hH/0SMvdNR48rsdlgQh2f01UV0dk5aF6nuaMliI0VIvJ1SkVKwNf1E58y xXP9UTSab2JKcQS6jjgfL+aOpF3gjAI/1XwFF1GACVFr3Rwb6bCFL8Mi5jdVTpH+bZOR rp0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722670476; x=1723275276; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RO8X5EAUs2/c9WkhWsewYyVlMwL07yIO0/Zm4FK4HSE=; b=UJ7NV/F8jZC55PgZ5bHVVKHUzxIGpOgEAaGGeGdSDRfIezJPH5zg6LeWtYzhxQLHEe JR1fL4mGPPicZOqeJfPn++MMozQ7Oy1kKPQ9yM0IGzLq8IqpZW9dlj2zGT3GtXN28rCV qLji9myF03vj6C2Id7Fjn6HlCH1khkZtCcfkvZ03YDi5fWM/FUuyHhCHYhVScju9xhMV oLCo2mGM12aAfEiuASgHU5GI9jbikAD00AzNo5Uyix6Hdk6+/r2YbmIAW/YiIFLlqI6X aYndCUpzPpDXfNWEwS6pBpDmaJXQ+0Rdl78qEPzmyQbDWPP0GjNvYdNQeScb4ENTfkVE sGdA== X-Forwarded-Encrypted: i=1; AJvYcCVJjC+7nmQI5dNYPPhIVxQicemFUpUkDhh/bpkqjCn2zxmWnDZuPAE801s943SG7CIBcwksyxqlvKH7gjrwoOsdGx+Kjg4= X-Gm-Message-State: AOJu0YwbsCvDc4rHBcquaeQP9aaaieCA/3LXCWaQaXFuz4DmdGLZaaZ1 VsY6EuSORcBH9V1kx28im8STyOC8aAlKAHuIGMXbPIg97SUaIE2q X-Google-Smtp-Source: AGHT+IGrEy30HAusXW3rpqYMi49nCLofMfQ8S0wJpuMpEqZiWtTkj0y51nruj7rOruQtB56i/cjtow== X-Received: by 2002:a05:6870:65a0:b0:261:211:9d0d with SMTP id 586e51a60fabf-26891e89dffmr6501224fac.40.1722670476092; Sat, 03 Aug 2024 00:34:36 -0700 (PDT) Received: from smtpclient.apple ([2601:646:8f81:6120:fc55:48f9:5161:d744]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7106ec5c929sm2304419b3a.88.2024.08.03.00.34.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Aug 2024 00:34:35 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.600.62\)) From: Yuan Fu In-Reply-To: <9a1f6d7c-b7e6-4da4-845c-c9dee5baa8c1@gutov.dev> Date: Sat, 3 Aug 2024 00:34:24 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <4E0726C0-DF68-46FE-943E-2D242959BD32@gmail.com> References: <875xsoousd.fsf@cassou.me> <87sevqx90w.fsf@cassou.me> <94fbe0b9-004b-49ea-9a22-de1e4f1d6f68@gutov.dev> <965418E3-4D87-4F83-8CFD-4BDDDE749BBF@gmail.com> <9a1f6d7c-b7e6-4da4-845c-c9dee5baa8c1@gutov.dev> X-Mailer: Apple Mail (2.3774.600.62) X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > On Aug 1, 2024, at 2:26=E2=80=AFPM, Dmitry Gutov = wrote: >=20 > Hi Yuan, >=20 > On 01/08/2024 10:36, Yuan Fu wrote: >> Actually, the original patch is perfectly good. The = =E2=80=9Csimplification=E2=80=9D I have in mind is more or less = unnecessary. >=20 > I think Damien is saying that patch#2 from his submission is not = necessary with your fix (commit 74bb1e5897f, IIUC). >=20 > So do you think it's a good idea to backport it to emacs-30? I=E2=80=99d rather apply Damien=E2=80=99s patch to emacs-30, that=E2=80=99= s a simple fix and doesn=E2=80=99t change the filling behavior. The = change I applied to master is more substantial, and apparently = introduced another regression that I now need to fix :-( Yuan= From unknown Tue Aug 19 12:51:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 03 Aug 2024 15:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71760 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Yuan Fu Cc: Damien Cassou , 71760@debbugs.gnu.org Received: via spool by 71760-submit@debbugs.gnu.org id=B71760.172269809330152 (code B ref 71760); Sat, 03 Aug 2024 15:15:01 +0000 Received: (at 71760) by debbugs.gnu.org; 3 Aug 2024 15:14:53 +0000 Received: from localhost ([127.0.0.1]:54690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saGT7-0007qF-42 for submit@debbugs.gnu.org; Sat, 03 Aug 2024 11:14:53 -0400 Received: from fout6-smtp.messagingengine.com ([103.168.172.149]:58577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saGT4-0007q1-8L for 71760@debbugs.gnu.org; Sat, 03 Aug 2024 11:14:51 -0400 Received: from compute8.internal (compute8.nyi.internal [10.202.2.227]) by mailfout.nyi.internal (Postfix) with ESMTP id D77A81387F25; Sat, 3 Aug 2024 11:14:24 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute8.internal (MEProxy); Sat, 03 Aug 2024 11:14:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; 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=fm2; t=1722698064; x=1722784464; bh=ovDVJWKPlEDU2w8jjOdtLjZyGcza1hgRHetxrYehPhU=; b= pJhAoICwesq6FiGFnfWKBPbe9ywOdXAR+/jrZh4sWn/2U7rgLorSbw43s649V3R/ GZOCrg6RWGezOBa//K0Df4DEWdvKdyHA1xoqd/mQnn1WA/nnf1Lxm8K8qo0adyQE tFKcVimp9GOwtecPcevE0td/jDpZ1ElRnYSIDkhQpeO9yLGzVSEKvR8N5T9+Amka fJZzO2gZxCNDyQSeR74amEIk4syhlFxC9z+lFazh2z7TdWyaiB9aZLsuMLqSQWbF i1/bHBtuNOSYwvf//lLeK7Q3SmPRYzTpB/BoFEQ/dXI05RLuhoFCn9HDKeksxOq2 n8EYx8Q+JWZG+s0QpTObjA== 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=1722698064; x= 1722784464; bh=ovDVJWKPlEDU2w8jjOdtLjZyGcza1hgRHetxrYehPhU=; b=u nEweaPNU2QXtp96Kw0p6Xw76YmlZvCETiA5memBlzWc6lZDehUvdyO1WTLNV8keB uUpYt4uv1ZZGQbzRziy1gqOZPyiFkcNfm6TE6wBU6/Twj6U98JkjtwxJMLi7Av64 PKhQFoDVAEaYRZOvjiDHcEFWFgWcu1WC12XyNU9ZuQMDNlIagkLTxdelDmY7IjEq U/e0j1RkQa7zVCyx4wsCKjZZ/65ikQsk57B75kAyHFL81AYp7FpvW6xFupWYfMGB ct7Ykjd0e8kYFGKtkkIpFlZKsfsmBrJV3sr5TYtm3d9pGnp3Z3q2yljQA+YH2aZp xL5rxXrHuxln0OzUHS9uA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrkedvgdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefkffggfgfuvfevfhfhjggtgfesthekredttddvjeenucfhrhhomhepffhmihht rhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrghtth gvrhhnpeegleefteekgffhvdfhtdegveevveetteegteevgeettdehhfdukeetheffueek keenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegumh hithhrhiesghhuthhovhdruggvvhdpnhgspghrtghpthhtoheptd X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 3 Aug 2024 11:14:23 -0400 (EDT) Message-ID: <8ae599c2-e5b1-4db8-9862-08bd0940edc9@gutov.dev> Date: Sat, 3 Aug 2024 18:14:21 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <875xsoousd.fsf@cassou.me> <87sevqx90w.fsf@cassou.me> <94fbe0b9-004b-49ea-9a22-de1e4f1d6f68@gutov.dev> <965418E3-4D87-4F83-8CFD-4BDDDE749BBF@gmail.com> <9a1f6d7c-b7e6-4da4-845c-c9dee5baa8c1@gutov.dev> <4E0726C0-DF68-46FE-943E-2D242959BD32@gmail.com> Content-Language: en-US From: Dmitry Gutov In-Reply-To: <4E0726C0-DF68-46FE-943E-2D242959BD32@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On 03/08/2024 10:34, Yuan Fu wrote: >> I think Damien is saying that patch#2 from his submission is not necessary with your fix (commit 74bb1e5897f, IIUC). >> >> So do you think it's a good idea to backport it to emacs-30? > I’d rather apply Damien’s patch to emacs-30, that’s a simple fix and doesn’t change the filling behavior. The change I applied to master is more substantial, and apparently introduced another regression that I now need to fix 🙁 Makes sense. It would be great if you could do the applying - while I understand the tree-sitter part, I'm not quite familiar with the filling code, so not equipped to give it a "stamp of approval" myself. Also, I would probably have to ask whether this patch if a replacement for that's been added to master, an addition, or a suitable alternative. From unknown Tue Aug 19 12:51:07 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Damien Cassou Subject: bug#71760: closed (Re: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks) Message-ID: References: <65638F2B-0895-4560-B41F-C22C0A7ADA4E@gmail.com> <871q4mxf85.fsf@cassou.me> X-Gnu-PR-Message: they-closed 71760 X-Gnu-PR-Package: emacs Reply-To: 71760@debbugs.gnu.org Date: Sun, 04 Aug 2024 03:08:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1722740882-28068-1" This is a multi-part message in MIME format... ------------=_1722740882-28068-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #71760: 31.0.50; Filling jsdoc text doesn't work in js-ts-mode which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 71760@debbugs.gnu.org. --=20 71760: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D71760 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1722740882-28068-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 71760-done) by debbugs.gnu.org; 4 Aug 2024 03:07:11 +0000 Received: from localhost ([127.0.0.1]:54963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saRaR-0007GT-4m for submit@debbugs.gnu.org; Sat, 03 Aug 2024 23:07:11 -0400 Received: from mail-pg1-f172.google.com ([209.85.215.172]:54696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saRaP-0007G4-1I for 71760-done@debbugs.gnu.org; Sat, 03 Aug 2024 23:07:09 -0400 Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-7163489149eso6733437a12.1 for <71760-done@debbugs.gnu.org>; Sat, 03 Aug 2024 20:06:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722740742; x=1723345542; darn=debbugs.gnu.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=N14PFnOIKr3pF0BCm26VbeEYn6G+/FGZqf3c2w56UM0=; b=LpNHUH8UXKFA45b6sX27GdC+TwC7xolxF7/yUOgUIoFeTivDyuU67t/8GPRTT7utcQ T+lHZdtxAveOZSC6dqYPFg+HMSWW4oLnxOiwHIlDy+qPdgvItb4nFY5X5hFPm3+7quRd TfX/x53Y/kwR2j/ury4uYuEeG+q+FCIlP4yXeqZwsiu8ee+5nn59KutWkiKujFMDasrR wiadgCCoNvyHrIPZXgQIadb1oRgDFe+AwfRkqAYvHXX6vrLsq1mWYRVvbbJbzJqohxRG 1kwsjJmFrXFD98VtYOTnrzYUH1ICu4iRL8ajDHdoAdytb2jqH6eR/zisSSlrEvHMgsyS kjQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722740742; x=1723345542; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N14PFnOIKr3pF0BCm26VbeEYn6G+/FGZqf3c2w56UM0=; b=qxbLRmx5XVlPaLnYK+3OLW82xwFfWzXMgo3zCux7O8wT1iHindzESCdeBSmEoEXj2/ nEzUY1yavdwM2L+O/MRYdMXe3BUW5pxe0czpKqGQV/vYVid0H2slyXHz4I20iGSI+fGg qCTRNQnPlfAep24K/2Uor9HU44QUfLJ99uwdxVkKAqpG7yFSVcGi07DJHhRkH6/Y9PLF qvDBl8gWmOMX7JYw57ceB51+ckeyWonquVz8JGlElh4Am2LRIa0GxWAtR0gFA5OB77ze wAu0i6T/lVnSo7Tpt/fYsNzPTmSj53x8HDE+S5h8BEBM4T9I2+RF8eUp8QawjpelK1x4 AfnQ== X-Forwarded-Encrypted: i=1; AJvYcCWZlSNzqyh3Hk1LVlb+01nr90wEe6I1021sNtmsRfZzq6JXBhu1pp3FqGN6ItTG/eeiICFoFv+HiXgSRepPl2HO+9sglwGRXIZatw== X-Gm-Message-State: AOJu0Yz3JBu90Ub6WJrVkSYYgzfUWjDN8UGr8sB3niFzv5hPq7b6BeAQ j1XoNczdwXpbfqGDrfTTFLHkEsDqXt37YmDriclkeuYPHCG7L4Ju X-Google-Smtp-Source: AGHT+IFl+Bo8gBjIeNUMkdYC91IOw3p/U5ahIokV9s4gXs8tr1usxNfChfYxYq8Iufqu8qq3rGMKrg== X-Received: by 2002:a05:6a21:1813:b0:1c0:f1ea:adf with SMTP id adf61e73a8af0-1c699582281mr10544389637.16.1722740742430; Sat, 03 Aug 2024 20:05:42 -0700 (PDT) Received: from smtpclient.apple ([2601:646:8f81:6120:90c7:b430:aa7b:7b1f]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7106ec400f3sm3363758b3a.54.2024.08.03.20.05.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Aug 2024 20:05:41 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.600.62\)) Subject: Re: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks From: Yuan Fu In-Reply-To: <8ae599c2-e5b1-4db8-9862-08bd0940edc9@gutov.dev> Date: Sat, 3 Aug 2024 20:05:30 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <65638F2B-0895-4560-B41F-C22C0A7ADA4E@gmail.com> References: <875xsoousd.fsf@cassou.me> <87sevqx90w.fsf@cassou.me> <94fbe0b9-004b-49ea-9a22-de1e4f1d6f68@gutov.dev> <965418E3-4D87-4F83-8CFD-4BDDDE749BBF@gmail.com> <9a1f6d7c-b7e6-4da4-845c-c9dee5baa8c1@gutov.dev> <4E0726C0-DF68-46FE-943E-2D242959BD32@gmail.com> <8ae599c2-e5b1-4db8-9862-08bd0940edc9@gutov.dev> To: Dmitry Gutov X-Mailer: Apple Mail (2.3774.600.62) X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71760-done Cc: Damien Cassou , 71760-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > On Aug 3, 2024, at 8:14=E2=80=AFAM, Dmitry Gutov = wrote: >=20 > On 03/08/2024 10:34, Yuan Fu wrote: >>> I think Damien is saying that patch#2 from his submission is not = necessary with your fix (commit 74bb1e5897f, IIUC). >>>=20 >>> So do you think it's a good idea to backport it to emacs-30? >> I=E2=80=99d rather apply Damien=E2=80=99s patch to emacs-30, that=E2=80= =99s a simple fix and doesn=E2=80=99t change the filling behavior. The = change I applied to master is more substantial, and apparently = introduced another regression that I now need to fix =F0=9F=99=81 >=20 > Makes sense. >=20 > It would be great if you could do the applying - while I understand = the tree-sitter part, I'm not quite familiar with the filling code, so = not equipped to give it a "stamp of approval" myself. >=20 > Also, I would probably have to ask whether this patch if a replacement = for that's been added to master, an addition, or a suitable alternative. Of course. I applied the patch. And I think this report can be closed, = so closing :-) Yuan= ------------=_1722740882-28068-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 24 Jun 2024 20:23:20 +0000 Received: from localhost ([127.0.0.1]:35696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLqDg-0004z7-7E for submit@debbugs.gnu.org; Mon, 24 Jun 2024 16:23:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLqDf-0004yz-2D for submit@debbugs.gnu.org; Mon, 24 Jun 2024 16:23:19 -0400 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 1sLqDd-000672-Fn for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2024 16:23:17 -0400 Received: from mail.reprendre.net ([193.23.30.35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sLqDb-0004N3-7K for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2024 16:23:17 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 5C2222C911B for ; Mon, 24 Jun 2024 22:23:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cassou.me; s=dkim; t=1719260592; h=from:subject:date:message-id:to:mime-version:content-type; bh=IHWCgx655vhd+UPvLeeqrIx870+D+oRT+rOW8fenkQ0=; b=TiLLbyg8nMfYMSTIWalfuSN6CKYZkIkZbR9Vqdik/p2CQnbaXVeM14wbKJi5Gz2xQ9y8p9 DIxSJ8EDycuxlwOcmTo2MNHoADF/7xFdX0NdwTUHoyO4dOu7FyNE0Er5Vm1aMyyfuU0xdW tMFnAgX47mqJw7ubSw/n1ehwi9Um3wjfDIUswdlgoyJqCq9mZKrMlSLt2MtRrvQYJ9zuw4 Fd6XB6LFopU0ox+p+nH6wS0Up1dkJgHlWCT27pqD7rxKlnX6+RnaojzZBY3095mu+ow6tx z/7wgU5rZheCpkOSWPIHFGOQtvWAxw7w1UTiTzRyIZNx31QGNoowUe90qf/3SA== From: Damien Cassou To: bug-gnu-emacs@gnu.org Subject: 31.0.50; Filling jsdoc text doesn't work in js-ts-mode X-Debbugs-Cc: Date: Mon, 24 Jun 2024 22:23:06 +0200 Message-ID: <871q4mxf85.fsf@cassou.me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Last-TLS-Session-Version: TLSv1.3 Received-SPF: pass client-ip=193.23.30.35; envelope-from=damien@cassou.me; helo=mail.reprendre.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain Hi, in a commit recently merged in master (0edacf2aa7e53), js-ts-mode has been improved to use the jsdoc treesitter grammar on documentation. Font lock works great but M-q doesn't fill long lines. To reproduce, make sure your Emacs contains the above-mentioned commit and make sure you have the jsdoc treesitter grammar available. Then, save the attached JavaScript file to your disk and execute: $ emacs -Q --eval "(progn (find-file \"/home/cassou/tmp/test.js\") (js-ts-mode))" Move point to the middle of line 2 (or line 4) and press M-q. Expected: The paragraph is filled. Actual: Nothing changes. I tried changing the value of `c-ts-common--comment-regexp' to include "description" (as this is what the jsdoc parser uses for text) but the result is worse. I also tried reusing `js-fill-paragraph' but that fails as well. I would be happy to implement something and send a patch but I have no idea were to start. -- Damien Cassou "Success is the ability to go from one failure to another without losing enthusiasm." --Winston Churchill --=-=-= Content-Type: text/javascript Content-Disposition: attachment; filename=test.js /** * Test. rat art srs tr tr st rst artsar t arstienartsioenaroti eanrtsoi aerntso iaerst * * @param {string} bla - Some documentation of this parameter. ar tar star tsa rst arstar st arst art rs */ function f(bla) { } --=-=-=-- ------------=_1722740882-28068-1-- From unknown Tue Aug 19 12:51:07 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Damien Cassou Subject: bug#71768: closed (Re: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks) Message-ID: References: <65638F2B-0895-4560-B41F-C22C0A7ADA4E@gmail.com> <875xtyxhr7.fsf@cassou.me> X-Gnu-PR-Message: they-closed 71768 X-Gnu-PR-Package: emacs Reply-To: 71768@debbugs.gnu.org Date: Sun, 04 Aug 2024 03:08:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1722740883-28068-3" This is a multi-part message in MIME format... ------------=_1722740883-28068-3 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #71760: 31.0.50; Filling jsdoc text doesn't work in js-ts-mode which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 71768@debbugs.gnu.org. --=20 71760: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D71760 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1722740883-28068-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 71760-done) by debbugs.gnu.org; 4 Aug 2024 03:07:11 +0000 Received: from localhost ([127.0.0.1]:54963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saRaR-0007GT-4m for submit@debbugs.gnu.org; Sat, 03 Aug 2024 23:07:11 -0400 Received: from mail-pg1-f172.google.com ([209.85.215.172]:54696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saRaP-0007G4-1I for 71760-done@debbugs.gnu.org; Sat, 03 Aug 2024 23:07:09 -0400 Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-7163489149eso6733437a12.1 for <71760-done@debbugs.gnu.org>; Sat, 03 Aug 2024 20:06:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722740742; x=1723345542; darn=debbugs.gnu.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=N14PFnOIKr3pF0BCm26VbeEYn6G+/FGZqf3c2w56UM0=; b=LpNHUH8UXKFA45b6sX27GdC+TwC7xolxF7/yUOgUIoFeTivDyuU67t/8GPRTT7utcQ T+lHZdtxAveOZSC6dqYPFg+HMSWW4oLnxOiwHIlDy+qPdgvItb4nFY5X5hFPm3+7quRd TfX/x53Y/kwR2j/ury4uYuEeG+q+FCIlP4yXeqZwsiu8ee+5nn59KutWkiKujFMDasrR wiadgCCoNvyHrIPZXgQIadb1oRgDFe+AwfRkqAYvHXX6vrLsq1mWYRVvbbJbzJqohxRG 1kwsjJmFrXFD98VtYOTnrzYUH1ICu4iRL8ajDHdoAdytb2jqH6eR/zisSSlrEvHMgsyS kjQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722740742; x=1723345542; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N14PFnOIKr3pF0BCm26VbeEYn6G+/FGZqf3c2w56UM0=; b=qxbLRmx5XVlPaLnYK+3OLW82xwFfWzXMgo3zCux7O8wT1iHindzESCdeBSmEoEXj2/ nEzUY1yavdwM2L+O/MRYdMXe3BUW5pxe0czpKqGQV/vYVid0H2slyXHz4I20iGSI+fGg qCTRNQnPlfAep24K/2Uor9HU44QUfLJ99uwdxVkKAqpG7yFSVcGi07DJHhRkH6/Y9PLF qvDBl8gWmOMX7JYw57ceB51+ckeyWonquVz8JGlElh4Am2LRIa0GxWAtR0gFA5OB77ze wAu0i6T/lVnSo7Tpt/fYsNzPTmSj53x8HDE+S5h8BEBM4T9I2+RF8eUp8QawjpelK1x4 AfnQ== X-Forwarded-Encrypted: i=1; AJvYcCWZlSNzqyh3Hk1LVlb+01nr90wEe6I1021sNtmsRfZzq6JXBhu1pp3FqGN6ItTG/eeiICFoFv+HiXgSRepPl2HO+9sglwGRXIZatw== X-Gm-Message-State: AOJu0Yz3JBu90Ub6WJrVkSYYgzfUWjDN8UGr8sB3niFzv5hPq7b6BeAQ j1XoNczdwXpbfqGDrfTTFLHkEsDqXt37YmDriclkeuYPHCG7L4Ju X-Google-Smtp-Source: AGHT+IFl+Bo8gBjIeNUMkdYC91IOw3p/U5ahIokV9s4gXs8tr1usxNfChfYxYq8Iufqu8qq3rGMKrg== X-Received: by 2002:a05:6a21:1813:b0:1c0:f1ea:adf with SMTP id adf61e73a8af0-1c699582281mr10544389637.16.1722740742430; Sat, 03 Aug 2024 20:05:42 -0700 (PDT) Received: from smtpclient.apple ([2601:646:8f81:6120:90c7:b430:aa7b:7b1f]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7106ec400f3sm3363758b3a.54.2024.08.03.20.05.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Aug 2024 20:05:41 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.600.62\)) Subject: Re: bug#71760: [PATCH] js-ts-mode: Fix filling of jsdoc blocks From: Yuan Fu In-Reply-To: <8ae599c2-e5b1-4db8-9862-08bd0940edc9@gutov.dev> Date: Sat, 3 Aug 2024 20:05:30 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <65638F2B-0895-4560-B41F-C22C0A7ADA4E@gmail.com> References: <875xsoousd.fsf@cassou.me> <87sevqx90w.fsf@cassou.me> <94fbe0b9-004b-49ea-9a22-de1e4f1d6f68@gutov.dev> <965418E3-4D87-4F83-8CFD-4BDDDE749BBF@gmail.com> <9a1f6d7c-b7e6-4da4-845c-c9dee5baa8c1@gutov.dev> <4E0726C0-DF68-46FE-943E-2D242959BD32@gmail.com> <8ae599c2-e5b1-4db8-9862-08bd0940edc9@gutov.dev> To: Dmitry Gutov X-Mailer: Apple Mail (2.3774.600.62) X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71760-done Cc: Damien Cassou , 71760-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > On Aug 3, 2024, at 8:14=E2=80=AFAM, Dmitry Gutov = wrote: >=20 > On 03/08/2024 10:34, Yuan Fu wrote: >>> I think Damien is saying that patch#2 from his submission is not = necessary with your fix (commit 74bb1e5897f, IIUC). >>>=20 >>> So do you think it's a good idea to backport it to emacs-30? >> I=E2=80=99d rather apply Damien=E2=80=99s patch to emacs-30, that=E2=80= =99s a simple fix and doesn=E2=80=99t change the filling behavior. The = change I applied to master is more substantial, and apparently = introduced another regression that I now need to fix =F0=9F=99=81 >=20 > Makes sense. >=20 > It would be great if you could do the applying - while I understand = the tree-sitter part, I'm not quite familiar with the filling code, so = not equipped to give it a "stamp of approval" myself. >=20 > Also, I would probably have to ask whether this patch if a replacement = for that's been added to master, an addition, or a suitable alternative. Of course. I applied the patch. And I think this report can be closed, = so closing :-) Yuan= ------------=_1722740883-28068-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 25 Jun 2024 05:58:21 +0000 Received: from localhost ([127.0.0.1]:36128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLzC8-00068U-FZ for submit@debbugs.gnu.org; Tue, 25 Jun 2024 01:58:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:43278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLpMo-0003NG-Qv for submit@debbugs.gnu.org; Mon, 24 Jun 2024 15:28:44 -0400 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 1sLpMm-0003dT-Ui for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2024 15:28:41 -0400 Received: from mail.reprendre.net ([2001:910:1410:501::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sLpMk-0003Tv-OL for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2024 15:28:40 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id CE6C92C9048 for ; Mon, 24 Jun 2024 21:28:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cassou.me; s=dkim; t=1719257310; h=from:subject:date:message-id:to:mime-version:content-type; bh=IHWCgx655vhd+UPvLeeqrIx870+D+oRT+rOW8fenkQ0=; b=F4Ho5L3IXBDG9HdY5CoQv+ywuwnjsCni0eFP4w0xJwzIuW7kSXOu+1/Ky65okwRALojbz0 iItRGZK0yo5NpUzYfAsfV8I009BbGxhrThgKEHpDRisCDz10NLq9xOTrdLjRqxDThXQLrY dk/nit3rnn/IkGRRzJYsK3KOL9eRKH1QcaslRXd7Kwcv9lIDJG707dxQYp1Zn49fiOyl78 sE0Tci4RD1JqcgmP4wKAXnungfISejTIxZeKfRJL3X3C98PYEcey+zLyzmS3VUsQWDKp8z bHrzInTFfxiav2g3tgegmdTOnpck5DjZTpcYdoM14AczpufZgMXsQYkK1vUCtg== From: Damien Cassou To: bug-gnu-emacs@gnu.org Subject: 31.0.50; Filling jsdoc text doesn't work in js-ts-mode X-Debbugs-Cc: Date: Mon, 24 Jun 2024 21:28:28 +0200 Message-ID: <875xtyxhr7.fsf@cassou.me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Last-TLS-Session-Version: TLSv1.3 Received-SPF: pass client-ip=2001:910:1410:501::1; envelope-from=damien@cassou.me; helo=mail.reprendre.net X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_NXDOMAIN=0.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Tue, 25 Jun 2024 01:58:19 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) --=-=-= Content-Type: text/plain Hi, in a commit recently merged in master (0edacf2aa7e53), js-ts-mode has been improved to use the jsdoc treesitter grammar on documentation. Font lock works great but M-q doesn't fill long lines. To reproduce, make sure your Emacs contains the above-mentioned commit and make sure you have the jsdoc treesitter grammar available. Then, save the attached JavaScript file to your disk and execute: $ emacs -Q --eval "(progn (find-file \"/home/cassou/tmp/test.js\") (js-ts-mode))" Move point to the middle of line 2 (or line 4) and press M-q. Expected: The paragraph is filled. Actual: Nothing changes. I tried changing the value of `c-ts-common--comment-regexp' to include "description" (as this is what the jsdoc parser uses for text) but the result is worse. I also tried reusing `js-fill-paragraph' but that fails as well. I would be happy to implement something and send a patch but I have no idea were to start. -- Damien Cassou "Success is the ability to go from one failure to another without losing enthusiasm." --Winston Churchill --=-=-= Content-Type: text/javascript Content-Disposition: attachment; filename=test.js /** * Test. rat art srs tr tr st rst artsar t arstienartsioenaroti eanrtsoi aerntso iaerst * * @param {string} bla - Some documentation of this parameter. ar tar star tsa rst arstar st arst art rs */ function f(bla) { } --=-=-=-- ------------=_1722740883-28068-3--