From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: kobarity Newsgroups: gmane.emacs.bugs Subject: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks Date: Sun, 31 Jul 2022 19:18:26 +0900 Message-ID: References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="00000000000002393b05e51735de" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31723"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Lars Ingebrigtsen , 56635@debbugs.gnu.org To: Dima Kogan Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jul 31 12:20:37 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 1oI63p-000891-8z for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 31 Jul 2022 12:20:37 +0200 Original-Received: from localhost ([::1]:44754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oI63o-0003hH-7J for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 31 Jul 2022 06:20:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oI62I-0003Fi-P1 for bug-gnu-emacs@gnu.org; Sun, 31 Jul 2022 06:19:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oI62I-0005Bc-GL for bug-gnu-emacs@gnu.org; Sun, 31 Jul 2022 06:19:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oI62I-0000gr-8x for bug-gnu-emacs@gnu.org; Sun, 31 Jul 2022 06:19:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: kobarity Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 31 Jul 2022 10:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56635 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 56635-submit@debbugs.gnu.org id=B56635.16592627282628 (code B ref 56635); Sun, 31 Jul 2022 10:19:02 +0000 Original-Received: (at 56635) by debbugs.gnu.org; 31 Jul 2022 10:18:48 +0000 Original-Received: from localhost ([127.0.0.1]:36441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oI623-0000gJ-MZ for submit@debbugs.gnu.org; Sun, 31 Jul 2022 06:18:47 -0400 Original-Received: from mail-ed1-f53.google.com ([209.85.208.53]:36411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oI621-0000g2-Ou for 56635@debbugs.gnu.org; Sun, 31 Jul 2022 06:18:46 -0400 Original-Received: by mail-ed1-f53.google.com with SMTP id c12so10436530ede.3 for <56635@debbugs.gnu.org>; Sun, 31 Jul 2022 03:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=j3BWb6uj4GW7cIrGhhKcuUheMd4mDCfpIN3+w8abEDU=; b=W/dteJySud5Xm9NzCQ1hK7twZeYfDTw3u8lkTy+boQIWQc7kaucXY1EDgE6JWE+xWk +6mZIbdeJQno3M8aAUKLWuCQ3cC4e7fEVNdb/yc3jkstSr4IdAwik5YemUTz8hHFfJdW lrWgPYw3nUz5n7GZWRIAHRCAl4/JrqRINGVR6eqL/f8DuoYjeABNKHqFjLV3i4cWATNE baIzbrInWvNdBroPzEmv+6qfZNpfMcK6VOG0Nwm8QkdTpaDKJq1yJIL9vTRztA05RXbC Ljnbr3NsPPxQp+Qyzr0gJck4wJAfQEcQPkG6EykxdHDn4ePV+kplQ0ukfTJam6uXjpbl G3Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=j3BWb6uj4GW7cIrGhhKcuUheMd4mDCfpIN3+w8abEDU=; b=eg95mkmudZMqiKMfV+ItT+tYJd3tnSbeZw9nhAhptrC3lv6kX18+O800GPFXYGeLD0 yZbrC9GBWlniOVaZrQA4m1PYqvb0tSIipJGhFmtxo8NQhFmO9e4pMP0S8AwfQeZfrOLt ssEv2eIbgY/0QzFhPVGfRThEo2EDKS+FtHpWFl3cZhHLK82ESyXVgNWGJ2u1evgcR/pP 0SVDk+MVqWbsOSfxhFvI+Kv+49KLHGQ5MFxYau6jt3nIQsKQagEo4fsbMbO8bPAjIAbA 01woe7qTgM0P7OkcpLl6me1Prvi2y4FTt8QWWXehFSpNj6GgN4qRyqyvj2jOrEncRkWi ycSQ== X-Gm-Message-State: AJIora9513sI8uvsOWGWUoqB5z4UToYzANtFb3rshhQHN0XYWS8lLjNY Bg031MPJTwAgfHMUMzaSJovdFcY3JSPwPoT9PiM= X-Google-Smtp-Source: AGRyM1u9wWnizVbhRF0muYONirzFhudf6mPY5yLsBbIDe9SWfBkWYGz2sW+hUGOJylqL1YmpR14aNU2ntNkcPua+msY= X-Received: by 2002:aa7:da93:0:b0:43d:1d9d:1e5 with SMTP id q19-20020aa7da93000000b0043d1d9d01e5mr10471997eds.55.1659262719871; Sun, 31 Jul 2022 03:18:39 -0700 (PDT) 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" Xref: news.gmane.io gmane.emacs.bugs:238333 Archived-At: --00000000000002393b05e51735de Content-Type: text/plain; charset="UTF-8" I wrote: > This code solves many problems of `hs-hide-block' mentioned in the > first mail, but it breaks `hs-hide-level'. It seems that current > MDATA-SELECTOR support is limited and needs some fixes if we want to > do something like above. I will look into this a little bit more. There are some problems in this approach. The biggest one is the way of processing in `hs-hide-level-recursive'. It basically repeats: 1. hs-hide-block-at-point 2. forward-comment 3. re-search-forward hs-block-start-regexp Let me explain with the following code: #+begin_src python class C: def a(): pass def b(): pass #+end_src Let's assume that point is at the beginning of the line "def a():". The first step hides the method "a" and moves the point to the end of the block. The second step moves the point to the position "d" of "def b():", not the beginning of the line. Therefore, if hs-block-start-regexp contains rx line-start, it fails to match "def b():". Although this can be solved by adding a flag or a mode specific forward-comment function to hs-special-modes-alist, I'm not sure if it is the right approach. So I think the following setting is best at this moment. #+begin_src elisp (add-to-list 'hs-special-modes-alist `(python-mode ,(python-rx (seq (* (syntax ?-)) block-start)) ;; Use the empty string as end regexp so it doesn't default to ;; "\\s)". This way parens at end of defun are properly hidden. "" "#" python-hideshow-forward-sexp-function nil)) #+end_src (* (syntax ?-)) corresponds to "\\s-*" of the current regexp. It allows the point to be located before the block start symbols. Another idea to improve the behavior of hiding a block is to provide a wrapper function of `hs-hide-block' as follows and remap the key bindings to this function like `python-mark-defun'. With this approach, C-c @ C-d and C-c @ C-h work as expected with the example shown in the first mail. #+begin_src elisp (defun python-hideshow-hide-block (&optional end) "Python specific `hs-hide-block' function for `hs-minor-mode'. Argument END is passed to `hs-hide-block'." (interactive "P") (python-nav-beginning-of-block) (hs-hide-block end)) #+end_src Attached is a PoC level patch of this approach. What do you think of this approach? Regards, --00000000000002393b05e51735de Content-Type: application/octet-stream; name="56635-poc.patch" Content-Disposition: attachment; filename="56635-poc.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l6962plz0 ZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbCBiL2xpc3AvcHJvZ21vZGVzL3B5 dGhvbi5lbAppbmRleCBiOGZjN2Q0YzU0Li5jYThiZmY5YTZlIDEwMDY0NAotLS0gYS9saXNwL3By b2dtb2Rlcy9weXRob24uZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLmVsCkBAIC0zMDMs NiArMzAzLDggQEAgcHl0aG9uLW1vZGUtbWFwCiAgICAgKGRlZmluZS1rZXkgbWFwICJcQy1jXEMt diIgIydweXRob24tY2hlY2spCiAgICAgKGRlZmluZS1rZXkgbWFwICJcQy1jXEMtZiIgIydweXRo b24tZWxkb2MtYXQtcG9pbnQpCiAgICAgKGRlZmluZS1rZXkgbWFwICJcQy1jXEMtZCIgIydweXRo b24tZGVzY3JpYmUtYXQtcG9pbnQpCisgICAgOzsgSGlkZXNob3cKKyAgICAoZGVmaW5lLWtleSBt YXAgW3JlbWFwIGhzLWhpZGUtYmxvY2tdICMncHl0aG9uLWhpZGVzaG93LWhpZGUtYmxvY2spCiAg ICAgOzsgVXRpbGl0aWVzCiAgICAgKHN1YnN0aXR1dGUta2V5LWRlZmluaXRpb24gIydjb21wbGV0 ZS1zeW1ib2wgIydjb21wbGV0aW9uLWF0LXBvaW50CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbWFwIGdsb2JhbC1tYXApCkBAIC00ODI1LDkgKzQ4MjcsMTYgQEAgcHl0aG9uLWRlc2Ny aWJlLWF0LXBvaW50CiAoZGVmdW4gcHl0aG9uLWhpZGVzaG93LWZvcndhcmQtc2V4cC1mdW5jdGlv biAoX2FyZykKICAgIlB5dGhvbiBzcGVjaWZpYyBgZm9yd2FyZC1zZXhwJyBmdW5jdGlvbiBmb3Ig YGhzLW1pbm9yLW1vZGUnLgogQXJndW1lbnQgQVJHIGlzIGlnbm9yZWQuIgotICAocHl0aG9uLW5h di1lbmQtb2YtZGVmdW4pCi0gICh1bmxlc3MgKHB5dGhvbi1pbmZvLWN1cnJlbnQtbGluZS1lbXB0 eS1wKQotICAgIChiYWNrd2FyZC1jaGFyKSkpCisgIChweXRob24tbmF2LWVuZC1vZi1ibG9jaykp CisKKyhkZWNsYXJlLWZ1bmN0aW9uIGhzLWhpZGUtYmxvY2sgImhpZGVzaG93IikKKworKGRlZnVu IHB5dGhvbi1oaWRlc2hvdy1oaWRlLWJsb2NrICgmb3B0aW9uYWwgZW5kKQorICAiUHl0aG9uIHNw ZWNpZmljIGBocy1oaWRlLWJsb2NrJyBmdW5jdGlvbiBmb3IgYGhzLW1pbm9yLW1vZGUnLgorQXJn dW1lbnQgRU5EIGlzIHBhc3NlZCB0byBgaHMtaGlkZS1ibG9jaycuIgorICAoaW50ZXJhY3RpdmUg IlAiKQorICAocHl0aG9uLW5hdi1iZWdpbm5pbmctb2YtYmxvY2spCisgIChocy1oaWRlLWJsb2Nr IGVuZCkpCiAKIAwKIDs7OyBJbWVudQpAQCAtNTc3Myw4ICs1NzgyLDggQEAgcHl0aG9uLW1vZGUK IAogICAoYWRkLXRvLWxpc3QKICAgICdocy1zcGVjaWFsLW1vZGVzLWFsaXN0Ci0gICAnKHB5dGhv bi1tb2RlCi0gICAgICJcXHMtKlxcXzxcXCg/OmRlZlxcfGNsYXNzXFwpXFxfPiIKKyAgIGAocHl0 aG9uLW1vZGUKKyAgICAgLChweXRob24tcnggKHNlcSAoKiAoc3ludGF4ID8tKSkgYmxvY2stc3Rh cnQpKQogICAgICA7OyBVc2UgdGhlIGVtcHR5IHN0cmluZyBhcyBlbmQgcmVnZXhwIHNvIGl0IGRv ZXNuJ3QgZGVmYXVsdCB0bwogICAgICA7OyAiXFxzKSIuICBUaGlzIHdheSBwYXJlbnMgYXQgZW5k IG9mIGRlZnVuIGFyZSBwcm9wZXJseSBoaWRkZW4uCiAgICAgICIiCmRpZmYgLS1naXQgYS90ZXN0 L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcHl0 aG9uLXRlc3RzLmVsCmluZGV4IDZmMmFkODdmODEuLmJjNTZhYmFhMmEgMTAwNjQ0Ci0tLSBhL3Rl c3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9wcm9nbW9k ZXMvcHl0aG9uLXRlc3RzLmVsCkBAIC01ODU3LDggKzU4NTcsMTEgQEAgcHl0aG9uLWhpZGVzaG93 LWhpZGUtbGV2ZWxzLTEKIGNsYXNzIFNvbWVDbGFzczoKIAogICAgIGRlZiBfX2luaXRfXyhzZWxm LCBhcmcsIGt3YXJnPTEpOgorCiAgICAgZGVmIGZpbHRlcihzZWxmLCBudW1zKToKLSAgICBkZWYg X19zdHJfXyhzZWxmKToiKSkpKQorCisgICAgZGVmIF9fc3RyX18oc2VsZik6CisiKSkpKQogICAg ICAgKG9yIGVuYWJsZWQgKGhzLW1pbm9yLW1vZGUgLTEpKSkpKQogCiAoZXJ0LWRlZnRlc3QgcHl0 aG9uLWhpZGVzaG93LWhpZGUtbGV2ZWxzLTIgKCkK --00000000000002393b05e51735de--