all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: kobarity <kobarity@gmail.com>
To: Dmitry Gutov <dmitry@gutov.dev>
Cc: Yuan Fu <casouri@gmail.com>, 68445@debbugs.gnu.org
Subject: bug#68445: [PATCH] Problem with python--treesit-syntax-propertize
Date: Tue, 23 Jan 2024 00:44:16 +0900	[thread overview]
Message-ID: <eke7bk9d74q7.wl-kobarity@gmail.com> (raw)
In-Reply-To: <5135ab69-3704-459f-b6c7-b8ea738e8d31@gutov.dev>

Hi,

Dmitry Gutov wrote:
> On 21/01/2024 16:47, kobarity wrote:
> > I am resending my mail, as I made a mistake in X-Debbugs-CC.
> Was it supposed to appear in the bug's thread? I don't see it anywhere.

My first mail was registered as Bug#68445, and my patch is there.

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68445

It says:

Report forwarded to casouri <at> gmail.com, dmitry@.gutov.dev, bug-gnu-emacs <at> gnu.org:

The extra period is my mistake and it may have caused the problem.
I'm sorry for the confusion.

> I think there is also another approach--handle two different types of
> nodes separately, instead of just string_content, so we don't have to
> start from the beginning of the literal. Like this:
> 
> diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
> index e2f614f52c2..4f8b0cb9473 100644
> --- a/lisp/progmodes/python.el
> +++ b/lisp/progmodes/python.el
> @@ -1361,13 +1361,15 @@ python--treesit-syntax-propertize
>      (while (re-search-forward (rx (or "\"\"\"" "'''")) end t)
>        (let ((node (treesit-node-at (point))))
>          ;; The triple quotes surround a non-empty string.
> -        (when (equal (treesit-node-type node) "string_content")
> -          (let ((start (treesit-node-start node))
> -                (end (treesit-node-end node)))
> -            (put-text-property (1- start) start
> -                               'syntax-table (string-to-syntax "|"))
> -            (put-text-property end (min (1+ end) (point-max))
> -                               'syntax-table (string-to-syntax "|"))))))))
> +        (cond
> +         ((equal (treesit-node-type node) "string_content")
> +          (put-text-property (1- (treesit-node-start node))
> +                             (treesit-node-start node)
> +                             'syntax-table (string-to-syntax "|")))
> +         ((and (equal (treesit-node-type node) "string_end")
> +               (= (treesit-node-start node) (- (point) 3)))
> +          (put-text-property (- (point) 3) (- (point) 2)
> +                             'syntax-table (string-to-syntax "|"))))))))
> 
>  \f
>  ;;; Indentation
> 

This approach seems better than my patch, but it does not seem to
address the following special case.

#+begin_src python
"""a""""""b"""
#+end_src





  reply	other threads:[~2024-01-22 15:44 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <eke7il3w6ztw.wl-kobarity@gmail.com>
2024-01-21 14:47 ` bug#68445: [PATCH] Problem with python--treesit-syntax-propertize kobarity
2024-01-21 18:09   ` Dmitry Gutov
2024-01-22 15:44     ` kobarity [this message]
2024-01-22 18:52       ` Dmitry Gutov
2024-01-23 14:14         ` kobarity
2024-01-26  1:15           ` Dmitry Gutov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=eke7bk9d74q7.wl-kobarity@gmail.com \
    --to=kobarity@gmail.com \
    --cc=68445@debbugs.gnu.org \
    --cc=casouri@gmail.com \
    --cc=dmitry@gutov.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.