Confirm token equality, safer loop

Using different variable to iterate to guarantee unchanged behaviour if anything doesn't work as intended.
dlang-community · Oct 17, 2023 · 4a08417 · 4a08417
1 parent 979c74d
commit 4a08417
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
@@ -1055,10 +1055,17 @@ private:
 
             // Account for possible function literals in this array which offset
             // the previously set index (pos). Fixes issue #432.
-            while(astInformation.indentInfoSortedByEndLocation[pos].endLocation !=
+            size_t newPos = pos;
+            while(astInformation.indentInfoSortedByEndLocation[newPos].endLocation <
                 tokens[index].index)
             {
-                pos++;
+                newPos++;
+            }
+
+            if (astInformation.indentInfoSortedByEndLocation[newPos].endLocation ==
+                tokens[index].index)
+            {
+                pos = newPos;
             }
 
             auto indentInfo = astInformation.indentInfoSortedByEndLocation[pos];