unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Yuan Fu <casouri@gmail.com>
To: Randy Taylor <dev@rjt.dev>
Cc: Juan Palacios <jpalaciosdev@gmail.com>, 66845@debbugs.gnu.org
Subject: bug#66845: 29.1; cmake-ts-mode indentation broken
Date: Tue, 7 Nov 2023 18:52:35 -0800	[thread overview]
Message-ID: <103F31BD-239C-4059-A511-BE29BBAE5DA9@gmail.com> (raw)
In-Reply-To: <KtEjEz2JJBgL_BYUTDSUUENVTfbaPlsmIpdqDPEBihAVEa-my5QOQnys_AKCon1b6ZayHztDJ2lhEt8Da4bu-M-7h1828MX2r8TKzAzq2oo=@rjt.dev>



> On Nov 7, 2023, at 9:21 AM, Randy Taylor <dev@rjt.dev> wrote:
> 
> On Tuesday, November 7th, 2023 at 03:25, Yuan Fu <casouri@gmail.com> wrote:
>> IMO it makes more sense to use prev-sibling:
>> 
>> ,@(ignore-errors
>> (treesit-query-capture 'cmake '((body) @capture))
>> `(((parent-is "body") prev-sibling 0)))
>> 
>> This would allow users to manually adjust the indentation of a line and have the rest of the body follow that.
> 
> This would be much more elegant but unfortunately that and my previous patch failed to account for the following:
> 
> 1 if(TRUE) # Comment.
> 2 endif()
> 
> And place POINT at the end of line 1 and hit RET. It will indent to the start of the comment :(. However, you gave me an idea: use the grand-parent as the anchor (which in this case is the if - exactly what we want). I've attached a new patch which accounts for that.

Ah, I was a bit rusty too. The approach I mentioned should also have a rule for the first sibling which anchors on the parent, while the rest siblings anchor on the previous sibling. But anchoring all on the parent is equally valid.

> 
> Juan, thanks for testing the first patch. Please give this new one a whirl if you're able to.
> 
>> 
>> As for why parent-bol returns the BOL of the comment line, that’s expected: The parent is body, and body starts at the comment, so of course the beginning of the parent line is the beginning of the comment line. In the image below, the highlighted portion marks the body node.
>> 
>> Some tree-sitter grammar would mark the beginning of body at the end of if(TRUE), but what tree-sitter-cmake does here is equally valid.
> 
> Thanks, I understand what's happening now. Whenever line_comment is NOT the first child, the beginning of body is at the end of if(TRUE). If line_comment is the first child, then the beginning of body is at the start of the comment. I was expecting them to behave the same - that's why I was so confused, and I don't really understand why it was done that way.<0001-Fix-cmake-ts-mode-indentation-Bug-66845.patch>

You’re right. That’s a strange behavior. We should probably report to tree-sitter-cmake.

Yuan




  parent reply	other threads:[~2023-11-08  2:52 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-31 11:35 bug#66845: 29.1; cmake-ts-mode indentation broken Juan Palacios
2023-10-31 15:50 ` Randy Taylor
2023-11-01  2:45 ` Randy Taylor
2023-11-05 14:32   ` Juan Palacios
2023-11-05 18:16     ` Fu Yuan
2023-11-07  8:25   ` Yuan Fu
2023-11-07 17:21     ` Randy Taylor
2023-11-07 20:11       ` Juan Palacios
2023-11-08  2:52       ` Yuan Fu [this message]
2023-11-08  3:42         ` Randy Taylor
2023-11-08 12:33           ` Eli Zaretskii

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

  List information: https://www.gnu.org/software/emacs/

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

  git send-email \
    --in-reply-to=103F31BD-239C-4059-A511-BE29BBAE5DA9@gmail.com \
    --to=casouri@gmail.com \
    --cc=66845@debbugs.gnu.org \
    --cc=dev@rjt.dev \
    --cc=jpalaciosdev@gmail.com \
    /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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).