bug#60572: 29.0.60; c-ts-mode: String spanning multiple lines are not indented

bug#60572: 29.0.60; c-ts-mode: String spanning multiple lines are not indented

[Mohammed Sadiq]

The following code doesn't indent with TAB on c-ts-mode:

#include <stdio.h>

int
main (void)
{
   char *test = "some "
   "test";

   puts ("more "
   "test");
}


expected indentation:

#include <stdio.h>

int
main (void)
{
   char *test = "some "
     "test";

   puts ("more "
	"test");
}



In GNU Emacs 29.0.60 (build 5, x86_64-pc-linux-gnu, GTK+ Version
  3.24.35, cairo version 1.16.0) of 2023-01-02 built on purism
Repository revision: 2569ede9c496bb060e0b88428cb541088aaba1f9
Repository branch: emacs-29
Windowing system distributor 'The X.Org Foundation', version 
11.0.12101005
System Description: Debian GNU/Linux bookworm/sid

bug#60572: 29.0.60; c-ts-mode: String spanning multiple lines are not indented

[Yuan Fu]

Mohammed Sadiq <sadiq@sadiqpk.org> writes:

> The following code doesn't indent with TAB on c-ts-mode:
>
> #include <stdio.h>
>
> int
> main (void)
> {
>   char *test = "some "
>   "test";
>
>   puts ("more "
>   "test");
> }
>
>
> expected indentation:
>
> #include <stdio.h>
>
> int
> main (void)
> {
>   char *test = "some "
>     "test";
>
>   puts ("more "
> 	"test");
> }
>

Thanks for the report. I’m on the road right now, but I’ll soon get back
and work on this and your other reports, just FYI :-)

Yuan

bug#60572: 29.0.60; c-ts-mode: String spanning multiple lines are not indented

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

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

Yuan Fu <casouri@gmail.com> writes:

> Mohammed Sadiq <sadiq@sadiqpk.org> writes:
>
>> The following code doesn't indent with TAB on c-ts-mode:
>>
>> #include <stdio.h>
>>
>> int
>> main (void)
>> {
>>   char *test = "some "
>>   "test";
>>
>>   puts ("more "
>>   "test");
>> }
>>
>>
>> expected indentation:
>>
>> #include <stdio.h>
>>
>> int
>> main (void)
>> {
>>   char *test = "some "
>>     "test";
>>
>>   puts ("more "
>> 	"test");
>> }
>>
>
> Thanks for the report. I’m on the road right now, but I’ll soon get back
> and work on this and your other reports, just FYI :-)
>
> Yuan

Here is a patch fixing this, Yuan.  Feel free to install at your
convenience.

Do you agree with this patch, Mohammed?

Theo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-indentation-rule-for-concatenated_string-bug-605.patch --]
[-- Type: text/x-patch, Size: 1118 bytes --]

From 0891cff08c2e6438902ed09291d5e52e742bab11 Mon Sep 17 00:00:00 2001
From: Theodor Thornhill <theo@thornhill.no>
Date: Sat, 7 Jan 2023 13:04:07 +0100
Subject: [PATCH] Add indentation rule for concatenated_string (bug#60572)

* lisp/progmodes/c-ts-mode.el (c-ts-mode--indent-styles): Indent to
parent-bol.
---
 lisp/progmodes/c-ts-mode.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index e76966e7660..a22f1f3c44f 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -138,6 +138,7 @@ c-ts-mode--indent-styles
            ((parent-is "function_definition") parent-bol 0)
            ((parent-is "conditional_expression") first-sibling 0)
            ((parent-is "assignment_expression") parent-bol c-ts-mode-indent-offset)
+           ((parent-is "concatenated_string") parent-bol c-ts-mode-indent-offset)
            ((parent-is "comma_expression") first-sibling 0)
            ((parent-is "init_declarator") parent-bol c-ts-mode-indent-offset)
            ((parent-is "parenthesized_expression") first-sibling 1)
-- 
2.34.1

bug#60572: 29.0.60; c-ts-mode: String spanning multiple lines are not indented

[Yuan Fu]

Theodor Thornhill <theo@thornhill.no> writes:

> Yuan Fu <casouri@gmail.com> writes:
>
>> Mohammed Sadiq <sadiq@sadiqpk.org> writes:
>>
>>> The following code doesn't indent with TAB on c-ts-mode:
>>>
>>> #include <stdio.h>
>>>
>>> int
>>> main (void)
>>> {
>>>   char *test = "some "
>>>   "test";
>>>
>>>   puts ("more "
>>>   "test");
>>> }
>>>
>>>
>>> expected indentation:
>>>
>>> #include <stdio.h>
>>>
>>> int
>>> main (void)
>>> {
>>>   char *test = "some "
>>>     "test";
>>>
>>>   puts ("more "
>>> 	"test");
>>> }
>>>
>>
>> Thanks for the report. I’m on the road right now, but I’ll soon get back
>> and work on this and your other reports, just FYI :-)
>>
>> Yuan
>
> Here is a patch fixing this, Yuan.  Feel free to install at your
> convenience.
>
> Do you agree with this patch, Mohammed?
>
> Theo

Thanks! Patch applied.

Yuan

bug#60572: 29.0.60; c-ts-mode: String spanning multiple lines are not indented

[Mohammed Sadiq]

> Theodor Thornhill <theo@thornhill.no> writes:
>> 
>> Here is a patch fixing this, Yuan.  Feel free to install at your
>> convenience.
>> 
>> Do you agree with this patch, Mohammed?

The line

   puts ("more"
     "test");

is still not indented right (right in the sense, the behavior is
different from c-mode):

I expect the code to be (with indent-tabs-mode set to nil):

   puts ("more"
         "test");

but I get:

   puts ("more"
     "test");

bug#60572: 29.0.60; c-ts-mode: String spanning multiple lines are not indented

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

On 8 January 2023 09:12:40 CET, Mohammed Sadiq <sadiq@sadiqpk.org> wrote:
>> Theodor Thornhill <theo@thornhill.no> writes:
>>> 
>>> Here is a patch fixing this, Yuan.  Feel free to install at your
>>> convenience.
>>> 
>>> Do you agree with this patch, Mohammed?
>
>The line
>
>  puts ("more"
>    "test");
>
>is still not indented right (right in the sense, the behavior is
>different from c-mode):
>
>I expect the code to be (with indent-tabs-mode set to nil):
>
>  puts ("more"
>        "test");
>
>but I get:
>
>  puts ("more"
>    "test");

Right, thanks. Is this indent style related? Would Linux style do this differently than gnu?

Thanks,
Theo

bug#60572: 29.0.60; c-ts-mode: String spanning multiple lines are not indented

[Mohammed Sadiq]

On 2023-01-08 14:48, Theodor Thornhill wrote:
> 
> Right, thanks. Is this indent style related? Would Linux style do this
> differently than gnu?
> 

As per 
https://www.kernel.org/doc/html/v6.0/process/coding-style.html#inline-assembly
and c-mode linux style, both GNU and Linux seem to behave similarly.


cheers,
Mohammed Sadiq

bug#60572: 29.0.60; c-ts-mode: String spanning multiple lines are not indented

[Mohammed Sadiq]

On 2023-01-07 17:37, Theodor Thornhill wrote:
> Here is a patch fixing this, Yuan.  Feel free to install at your
> convenience.
> 
> Do you agree with this patch, Mohammed?

I believe that the patch is already applied to emacs-29 branch,
I couldn't apply the patch (and reading the code, it looks it's
already in).

Anyway, This still doesn't fixes the following cases:

   some_func (arg1,
              "some really long"
                "string");
   some_func ("some really long"
     "string");


> 
> Theo