Fix align of strings with preproc. concatenations

Fixes uncrustify#3086
ArnauBigas · Jun 30, 2022 · 9e59c77 · 9e59c77 · gmaurel · Apr 28, 2024
1 parent 6105704
commit 9e59c77
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/src/indent.cpp b/src/indent.cpp
@@ -3686,11 +3686,26 @@ void indent_text()
                  && options::indent_align_string())
          {
             log_rule_B("indent_align_string");
-            const int tmp = (xml_indent != 0) ? xml_indent : prev->column;
+            int indent;
 
+            if (xml_indent != 0)
+            {
+               indent = xml_indent;
+            }
+            else
+            {
+               Chunk *tmp = prev;
+
+               while (  tmp->prev
+                     && (tmp->prev->Is(CT_WORD) || tmp->prev->Is(CT_STRING)))
+               {
+                  tmp = tmp->prev;
+               }
+               indent = tmp->column;
+            }
             LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, String => %d\n",
-                    __func__, __LINE__, pc->orig_line, tmp);
-            reindent_line(pc, tmp);
+                    __func__, __LINE__, pc->orig_line, indent);
+            reindent_line(pc, indent);
          }
          else if (pc->IsComment())
          {

diff --git a/tests/expected/c/02201-align-string.c b/tests/expected/c/02201-align-string.c
@@ -10,5 +10,8 @@ void foo(void)
 
    fprintf(stderr, "Format string: %s", "This is the first line\n"
                                         "And this is the second.\n");
+
+   fprintf(stderr, "Format string: %s", "This is the first line\n" __FILE__ "\n"
+                                        "And this is the second.\n");
 }
 
diff --git a/tests/input/c/align-string.c b/tests/input/c/align-string.c
@@ -10,5 +10,8 @@ void foo(void)
 
    fprintf(stderr, "Format string: %s", "This is the first line\n"
      "And this is the second.\n");
+
+   fprintf(stderr, "Format string: %s", "This is the first line\n" __FILE__ "\n"
+     "And this is the second.\n");
 }