From be24f122dd7de23aac1beb81e468b946d6ddc305 Mon Sep 17 00:00:00 2001
From: Daniel Zuncke <daniel.zuncke@gmail.com>
Date: Tue, 17 Oct 2023 03:49:31 +0200
Subject: [PATCH] Fix issue #432

Overview:
Array astInformation.structInitEndLocations is used to find index to use
in astInformation.indentInfoSortedByEndLocation.
Both are sorted, first is used to find the array index, second is
accessed at that index to get brace indentation information.

Problem:
structInitEndLocations is generated from struct initializers
exclusively while the brace information array also contains entries
for function literal initializers. Thus when function literal init(s)
are used, we get accumulating off by one errors in the second array:

match value in structInitEndLocations and take that index:
[3, 50]
    ^--> index 1

take brace indent information from that index:
[3, 15, 50]
    |   ^--> the one we want
    ^------> the one we get (function literal init)

Solution:
This guarantees that searching forward works.
While better search strategies than linear are possible, this should be
enough for any sane and most of the insane code files.
---
 src/dfmt/formatter.d         |  8 ++++++++
 tests/allman/issue0432.d.ref | 17 +++++++++++++++++
 tests/issue0432.d            | 19 +++++++++++++++++++
 tests/knr/issue0432.d.ref    | 16 ++++++++++++++++
 tests/otbs/issue0432.d.ref   | 15 +++++++++++++++
 5 files changed, 75 insertions(+)
 create mode 100644 tests/allman/issue0432.d.ref
 create mode 100644 tests/issue0432.d
 create mode 100644 tests/knr/issue0432.d.ref
 create mode 100644 tests/otbs/issue0432.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 7f73ad3..f76e6e2 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -1053,6 +1053,14 @@ private:
             if (niBraceDepth > 0)
                 niBraceDepth--;
 
+            // Account for possible function literals in this array which offset
+            // the previously set index (pos). Fixes issue #432.
+            while(astInformation.indentInfoSortedByEndLocation[pos].endLocation !=
+                tokens[index].index)
+            {
+                pos++;
+            }
+
             auto indentInfo = astInformation.indentInfoSortedByEndLocation[pos];
             if (indentInfo.flags & BraceIndentInfoFlags.tempIndent)
             {
diff --git a/tests/allman/issue0432.d.ref b/tests/allman/issue0432.d.ref
new file mode 100644
index 0000000..fde6383
--- /dev/null
+++ b/tests/allman/issue0432.d.ref
@@ -0,0 +1,17 @@
+struct S
+{
+    ulong x;
+    ulong y;
+    ulong z;
+    ulong w;
+}
+
+immutable int function(int) f = (x) { return x + 1111; };
+
+immutable S s = {
+    1111111111111111111, 1111111111111111111, 1111111111111111111, 1111111111111111111,
+};
+
+void main()
+{
+}
diff --git a/tests/issue0432.d b/tests/issue0432.d
new file mode 100644
index 0000000..9140425
--- /dev/null
+++ b/tests/issue0432.d
@@ -0,0 +1,19 @@
+struct S
+{
+    ulong x;
+    ulong y;
+    ulong z;
+    ulong w;
+}
+
+immutable int function(int) f = (x) { return x + 1111; };
+
+immutable S s = {
+    1111111111111111111,
+    1111111111111111111,
+    1111111111111111111,
+    1111111111111111111,};
+
+    void main()
+    {
+    }
diff --git a/tests/knr/issue0432.d.ref b/tests/knr/issue0432.d.ref
new file mode 100644
index 0000000..9f54651
--- /dev/null
+++ b/tests/knr/issue0432.d.ref
@@ -0,0 +1,16 @@
+struct S {
+    ulong x;
+    ulong y;
+    ulong z;
+    ulong w;
+}
+
+immutable int function(int) f = (x) { return x + 1111; };
+
+immutable S s = {
+    1111111111111111111, 1111111111111111111, 1111111111111111111, 1111111111111111111,
+};
+
+void main()
+{
+}
diff --git a/tests/otbs/issue0432.d.ref b/tests/otbs/issue0432.d.ref
new file mode 100644
index 0000000..81cae57
--- /dev/null
+++ b/tests/otbs/issue0432.d.ref
@@ -0,0 +1,15 @@
+struct S {
+    ulong x;
+    ulong y;
+    ulong z;
+    ulong w;
+}
+
+immutable int function(int) f = (x) { return x + 1111; };
+
+immutable S s = {
+    1111111111111111111, 1111111111111111111, 1111111111111111111, 1111111111111111111,
+};
+
+void main() {
+}