unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Theodor Thornhill <theo@thornhill.no>
To: Eli Zaretskii <eliz@gnu.org>
Cc: casouri@gmail.com, emacs-devel@gnu.org
Subject: Re: Missing features in c-ts-mode
Date: Wed, 15 Feb 2023 20:59:13 +0100	[thread overview]
Message-ID: <871qmq7l9q.fsf@thornhill.no> (raw)
In-Reply-To: <83bkluaevv.fsf@gnu.org>

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Theodor Thornhill <theo@thornhill.no>
>> Cc: casouri@gmail.com, emacs-devel@gnu.org
>> Date: Wed, 15 Feb 2023 20:31:33 +0100
>> 
>> This patch adds some support for this- but I'm not really satisfied yet.
>> It will electrically indent if you've typed "#i", or if you insert "#"
>> before say, "if".  The reason it behaves this way right now is that the
>> parser returns an (ERROR (ERROR)) node when only # is inserted.  I'll
>> see if I can find some workaround for it.
>
> Thank you for working on this.


Ok so I found a way which will probably work well.  I just need to
figure out if there are any other cases where we get the (ERROR (ERROR))
pattern.  If not I'll add some tests and also this:

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 020f2642ac2..a60c464093e 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -219,6 +219,7 @@ c-ts-mode--indent-styles
 MODE is either `c' or `cpp'."
   (let ((common
          `(((parent-is "translation_unit") point-min 0)
+           ((query "(ERROR (ERROR)) @indent") point-min 0)
            ((node-is ")") parent 1)
            ((node-is "]") parent-bol 0)
            ((node-is "else") parent-bol 0)
@@ -785,7 +786,7 @@ c-ts-base-mode
 
   ;; Electric
   (setq-local electric-indent-chars
-              (append "{}():;," electric-indent-chars))
+              (append "{}():;,#" electric-indent-chars))
 
   ;; Imenu.
   (setq-local treesit-simple-imenu-settings



  reply	other threads:[~2023-02-15 19:59 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-15 17:59 Missing features in c-ts-mode Eli Zaretskii
2023-02-15 18:29 ` Theodor Thornhill
2023-02-15 19:05   ` Eli Zaretskii
2023-02-15 19:18     ` Theodor Thornhill
2023-02-15 19:31       ` Theodor Thornhill
2023-02-15 19:48         ` Eli Zaretskii
2023-02-15 19:59           ` Theodor Thornhill [this message]
2023-02-16 19:14             ` Theodor Thornhill
2023-02-16 20:38               ` Eli Zaretskii
2023-02-16 21:05                 ` Theodor Thornhill
2023-02-17  8:29               ` Ergus
2023-02-17  8:42                 ` Eli Zaretskii
2023-02-17  9:56                 ` Theodor Thornhill
2023-02-17 12:20                   ` Eli Zaretskii
2023-02-17 16:37                     ` Ergus
2023-02-17 17:34                       ` Theodor Thornhill
2023-02-17 18:02                         ` Ergus
2023-02-17 18:10                           ` Theodor Thornhill
2023-02-17 18:27                             ` Ergus
2023-02-17 18:43                               ` Theodor Thornhill
2023-02-15 20:31           ` Felix
2023-02-16  7:35             ` Eli Zaretskii
2023-02-16  8:08               ` Theodor Thornhill
2023-02-16 12:10               ` Felix
2023-02-15 20:03       ` Eli Zaretskii
2023-02-15 20:21         ` Theodor Thornhill
2023-02-16  7:04           ` 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=871qmq7l9q.fsf@thornhill.no \
    --to=theo@thornhill.no \
    --cc=casouri@gmail.com \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    /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).