From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Yuan Fu Newsgroups: gmane.emacs.bugs Subject: bug#59689: bug#59690: 29.0.60; typescript-ts-mode: unable to uncomment region commented using comment-region Date: Thu, 1 Dec 2022 19:56:28 -0800 Message-ID: <9E07E286-B6B7-4626-A41A-A87ADE402D09@gmail.com> References: <97CFA258-2B25-4735-99D6-B0976FC62CFE@gmail.com> <87o7solo9v.fsf@thornhill.no> Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_66763624-7250-440B-9918-D0CB1E1B719B" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8274"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 59690@debbugs.gnu.org, 59689@debbugs.gnu.org, jostein@kjonigsen.net, eliz@gnu.org To: Theodor Thornhill Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Dec 02 04:57:13 2022 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 1p0xAn-00021q-6i for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 02 Dec 2022 04:57:13 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0xAd-0006Es-N4; Thu, 01 Dec 2022 22:57:03 -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 1p0xAc-0006Eb-R3 for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2022 22:57:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p0xAc-0000np-JI for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2022 22:57:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p0xAc-0005ff-Ee for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2022 22:57:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 02 Dec 2022 03:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59689 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 59689-submit@debbugs.gnu.org id=B59689.166995340421792 (code B ref 59689); Fri, 02 Dec 2022 03:57:02 +0000 Original-Received: (at 59689) by debbugs.gnu.org; 2 Dec 2022 03:56:44 +0000 Original-Received: from localhost ([127.0.0.1]:43789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0xAJ-0005fK-ET for submit@debbugs.gnu.org; Thu, 01 Dec 2022 22:56:43 -0500 Original-Received: from mail-pj1-f48.google.com ([209.85.216.48]:43827) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0xAC-0005f8-OK; Thu, 01 Dec 2022 22:56:41 -0500 Original-Received: by mail-pj1-f48.google.com with SMTP id u15-20020a17090a3fcf00b002191825cf02so4042801pjm.2; Thu, 01 Dec 2022 19:56:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=5oU4A3bCuJ0Zm+qKqBHV6S5wkf/eyGGkIXs0v2cVWjY=; b=Kule9PREeySWMo/oj0L4xA7Z12MjannKskpnfYJQjFcVsdDVVg9ZqZOnmKH5vx42Uo bSa/4hxrZRbSUePa/Pj0GoVUd0+RDph0FiJQ0P1sRj4YMOrla6P2O+2+n2YovbPcbusC baS1SImgAGT0Pz/dApobm8K88NXPy92i2B4sJy7oJqR062AnyLwIDekfUF8hYek0JJL1 kfzldkl1VbTXkRNqJcvYooxtlIuz9ruX4tPXrNnjcGVRk3TBnHnvvaxacS9Pac6KIg3P j4LbNRY6Vg6iplvps8Zr+uSAjIl+tQWvqDMMROvLQhxjr1fPes4csqB+9dm91UH6YsOn L+Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5oU4A3bCuJ0Zm+qKqBHV6S5wkf/eyGGkIXs0v2cVWjY=; b=CoYnfXcE07QPzN0/TN/zn+PxeuHqtgvxfIEFyudlLEJvNMf761USfQbQNa8teE8q96 PfaQAFbtVHQ1MCr4LDw5gkMX/v9rSJ5qOv/+nCzNvSooAMvqneV1xCYhWj3wGVogqLjH 3gC4Oo4gUstuyIR9XLOAiAfmGwB7d9bvzHeWUxey+NSAVa46sXjAQXlr5lTW+mSKYjWI A3tphDtlxebPoXQbvUB6+R41kpHuuP8A+mDM53UpPXU3vW3K/csJ/GNM1HArCxwpMWN6 eU9palItGFQk/OcUlstC4phjz+gqrIpMiAnIBpe2YcaiNapKX9mvWvxHXyBLE+3SRIHP 0ySA== X-Gm-Message-State: ANoB5pkJ3z6WvwAp9DN9rTGE0wq+CvVDE4SyzJ2/AKiBMh+HZ2kgM0Tb wI9XvKh9OUi6jST2tlnsRlM= X-Google-Smtp-Source: AA0mqf6G/BhUgygDWCOGFslBHtrwAaS/hNI312tWy8ad+YaTGQgzGSZ8b6xykEvzQKxDfTyYjVM+Pg== X-Received: by 2002:a17:90a:fe05:b0:219:29eb:bc4b with SMTP id ck5-20020a17090afe0500b0021929ebbc4bmr27512961pjb.199.1669953389916; Thu, 01 Dec 2022 19:56:29 -0800 (PST) Original-Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id p3-20020a170902e74300b00189988a1a9esm4449172plf.135.2022.12.01.19.56.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Dec 2022 19:56:29 -0800 (PST) In-Reply-To: <87o7solo9v.fsf@thornhill.no> X-Mailer: Apple Mail (2.3696.120.41.1.1) 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:249696 Archived-At: --Apple-Mail=_66763624-7250-440B-9918-D0CB1E1B719B Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Nov 30, 2022, at 2:39 AM, Theodor Thornhill via Bug reports for GNU = Emacs, the Swiss army knife of text editors = wrote: >=20 > Yuan Fu writes: >=20 >> Theodor Thornhill writes: >>=20 >>> Resending with correct address for Yuan... >>>=20 >>>=20 >>=20 >> Oops, sorry. But why it didn=E2=80=99t work? :-( I did a (almost) = direct >> conversion from the old regexp to rx. Let me see if I can fix it with >> rx. >=20 > If you use the xr package from ELPA you get an rx equivalent, but to = me > that was more unreadable than the plain regex :) That=E2=80=99s what I used, but perhaps I should change the result of it = :-) Could you try this patch? This should be one-to-one conversion from the = plain one. Yuan --Apple-Mail=_66763624-7250-440B-9918-D0CB1E1B719B Content-Disposition: attachment; filename=comment-start.diff Content-Type: application/octet-stream; x-unix-mode=0644; name="comment-start.diff" Content-Transfer-Encoding: 7bit diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index ad64df6143c..d63a77cb50f 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -566,7 +566,8 @@ c-ts-mode ;; Comments. (setq-local comment-start "/* ") (setq-local comment-end " */") - (setq-local comment-start-skip (rx (group "/" (or (+ "/") (+ "*"))) + (setq-local comment-start-skip (rx (or (seq "/" (+ "/")) + (seq "/" (+ "*"))) (* (syntax whitespace)))) (setq-local comment-end-skip (rx (* (syntax whitespace)) diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el index 3da3079f089..054dabfed07 100644 --- a/lisp/progmodes/csharp-mode.el +++ b/lisp/progmodes/csharp-mode.el @@ -900,7 +900,8 @@ csharp-ts-mode ;; Comments. (setq-local comment-start "// ") (setq-local comment-end "") - (setq-local comment-start-skip (rx (group "/" (or (+ "/") (+ "*"))) + (setq-local comment-start-skip (rx (or (seq "/" (+ "/")) + (seq "/" (+ "*"))) (* (syntax whitespace)))) (setq-local comment-end-skip (rx (* (syntax whitespace)) diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el index cf2482bb6ee..2c42505ac94 100644 --- a/lisp/progmodes/java-ts-mode.el +++ b/lisp/progmodes/java-ts-mode.el @@ -301,7 +301,8 @@ java-ts-mode ;; Comments. (setq-local comment-start "// ") (setq-local comment-end "") - (setq-local comment-start-skip (rx (group "/" (or (+ "/") (+ "*"))) + (setq-local comment-start-skip (rx (or (seq "/" (+ "/")) + (seq "/" (+ "*"))) (* (syntax whitespace)))) (setq-local comment-end-skip (rx (* (syntax whitespace)) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index ad1fe62d429..389096147ac 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3849,7 +3849,8 @@ js-ts-mode ;; Comment. (setq-local comment-start "// ") (setq-local comment-end "") - (setq-local comment-start-skip (rx (group "/" (or (+ "/") (+ "*"))) + (setq-local comment-start-skip (rx (or (seq "/" (+ "/")) + (seq "/" (+ "*"))) (* (syntax whitespace)))) (setq-local comment-end-skip (rx (* (syntax whitespace)) diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el index 6c926a4e3e0..ddc478f7320 100644 --- a/lisp/progmodes/typescript-ts-mode.el +++ b/lisp/progmodes/typescript-ts-mode.el @@ -301,7 +301,8 @@ typescript-ts-mode ;; Comments. (setq-local comment-start "// ") (setq-local comment-end "") - (setq-local comment-start-skip (rx (group "/" (or (+ "/") (+ "*"))) + (setq-local comment-start-skip (rx (or (seq "/" (+ "/")) + (seq "/" (+ "*"))) (* (syntax whitespace)))) (setq-local comment-end-skip (rx (* (syntax whitespace)) --Apple-Mail=_66763624-7250-440B-9918-D0CB1E1B719B Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii --Apple-Mail=_66763624-7250-440B-9918-D0CB1E1B719B--