bug#59966: [PATCH] [Tree-sitter] Align C++ access specifiers to their enclosing class/struct/union

bug#59966: [PATCH] [Tree-sitter] Align C++ access specifiers to their enclosing class/struct/union

[Daniel Martín via Bug reports for GNU Emacs, the Swiss army knife of text editors]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

Tags: patch


The following C++ class is indented differently in c++-mode and
c++-ts-mode:

class Sample {
public:
void sample();
private:
int a;
};

c++-mode indents it like

class Sample {
public:
  void sample();
private:
  int a;
};

c++-ts-mode indents it like

class Sample {
public:
void sample();
private:
int a;
};

I've attached a patch so that C++ classes are indented the same in
c++-mode and c++-ts-mode when the default style is used.

Thanks.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Align-C-access-specifiers-to-their-enclosing-class-s.patch --]
[-- Type: text/patch, Size: 1494 bytes --]

From b1fb292835772ed6f4da4f91fa58e84ce7582a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= <mardani29@yahoo.es>
Date: Sun, 11 Dec 2022 15:57:43 +0100
Subject: [PATCH] Align C++ access specifiers to their enclosing
 class/struct/union

The default style in c++-mode aligns access specifiers like "private",
"public" or "protected" to their enclosing class, struct, or union.
The "ellemtel" style indents access specifiers, but this C++ style is
not supported by c++-ts-mode yet.

* lisp/progmodes/c-ts-mode.el (c-ts-mode--indent-styles): Align access
specifiers to their enclosing class/struct/union.
---
 lisp/progmodes/c-ts-mode.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 824325d83e..5dab9879dc 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -120,6 +120,8 @@ c-ts-mode--indent-styles
            ((query "(call_expression arguments: (_) @indent)") parent c-ts-mode-indent-offset)
            ((parent-is "call_expression") parent 0)
            ((parent-is "enumerator_list") parent-bol c-ts-mode-indent-offset)
+           ,@(when (eq mode 'cpp)
+               '(((node-is "access_specifier") parent-bol 0)))
            ((parent-is "field_declaration_list") parent-bol c-ts-mode-indent-offset)
            ((parent-is "initializer_list") parent-bol c-ts-mode-indent-offset)
            ((parent-is "if_statement") parent-bol c-ts-mode-indent-offset)
-- 
2.34.1

bug#59966: [PATCH] [Tree-sitter] Align C++ access specifiers to their enclosing class/struct/union

[Yuan Fu]

Daniel Martín <mardani29@yahoo.es> writes:

> Tags: patch
>
>
> The following C++ class is indented differently in c++-mode and
> c++-ts-mode:
>
> class Sample {
> public:
> void sample();
> private:
> int a;
> };
>
> c++-mode indents it like
>
> class Sample {
> public:
>   void sample();
> private:
>   int a;
> };
>
> c++-ts-mode indents it like
>
> class Sample {
> public:
> void sample();
> private:
> int a;
> };
>
> I've attached a patch so that C++ classes are indented the same in
> c++-mode and c++-ts-mode when the default style is used.
>
> Thanks.
>

Thanks! I applied the patch.

Yuan