nimamasl114514
1e82deb73d
fix #20078 : nimpretty --indent applies to keepIndents regions ( #25985 )
...
## Summary
- nimpretty with non-default \--indent\ (e.g. 3 or 10) produced invalid
indentation in if/block/try expression regions because layouter kept the
original column when \keepIndents > 0\ and ignored \indWidth\.
- Rebase the column onto \indWidth\ using the relative offset from the
enclosing block baseline (\indentStack[^1]\).
## Root cause
\parser.nim\'s \
imprettyDontTouch\ template sets \keepIndents\ for if/block/try
expressions. layouter in the \keepIndents > 0\ branch used \ ok.indent\
(source column) directly as \indentLevel\ without scaling by \indWidth\,
so lines in these regions kept the original column and misaligned with
the rest of the file when \--indent\ differed from source indent width.
## Fix
\\\
im
em.indentLevel = em.indentStack.high * em.indWidth +
(tok.indent - em.indentStack[^1])
\\\
Keeps the relative offset from the enclosing block baseline but rebases
onto \indWidth\. At default \--indent:2\ the offset equals \indWidth\,
so output is unchanged (backwards compatible).
## Testing
- 12 custom cases x 3 indent values (2/3/10) = 36/36 pass
- nimpretty self-test suite 7/7 pass (no regression at default indent)
- 5 keepIndents scenarios (if/block/try expression continuation
alignment) that failed at indent:3/10 now pass
Fixes #20078 .
2026-08-03 12:15:44 +02:00
..
2026-07-03 15:52:41 +02:00
2025-11-13 21:31:24 +01:00
2023-08-06 14:26:21 +02:00
2026-08-03 11:51:16 +02:00
2026-07-20 13:01:30 +02:00
2026-06-29 18:24:49 +02:00
2025-12-01 22:59:12 +01:00
2026-07-03 15:52:41 +02:00
2024-04-16 12:46:59 +02:00
2026-06-11 14:10:42 +02:00
2023-10-11 17:44:14 +02:00
2026-02-10 13:21:35 +01:00
2024-11-19 08:51:54 +01:00
2026-01-05 15:21:59 +01:00
2024-11-18 17:34:37 +01:00
2024-11-18 17:34:37 +01:00
2026-08-03 11:51:16 +02:00
2026-08-03 11:51:16 +02:00
2026-04-27 18:00:29 +02:00
2022-11-30 21:51:13 +01:00
2025-10-06 21:55:31 +02:00
2026-06-14 22:35:06 +02:00
2026-06-25 23:20:34 +02:00
2024-11-18 17:34:37 +01:00
2026-07-03 15:52:41 +02:00
2026-06-29 18:24:49 +02:00
2026-07-03 15:52:41 +02:00
2026-06-14 22:35:06 +02:00
2026-06-25 23:20:34 +02:00
2026-07-24 14:06:27 +02:00
2026-06-24 21:58:51 +02:00
2026-06-14 22:35:06 +02:00
2026-07-20 13:01:30 +02:00
2023-06-18 16:06:14 +02:00
2025-12-31 13:33:57 +01:00
2026-02-01 17:06:33 +01:00
2017-01-07 22:35:09 +01:00
2022-06-10 20:40:08 +02:00
2023-10-29 14:48:11 +01:00
2026-07-09 22:13:39 +02:00
2026-02-10 13:21:35 +01:00
2023-08-06 14:26:21 +02:00
2026-03-27 10:20:10 +01:00
2026-06-14 22:35:06 +02:00
2023-11-20 21:12:13 +01:00
2025-12-11 18:22:38 +01:00
2025-12-11 18:22:38 +01:00
2024-08-28 20:46:36 +02:00
2025-07-14 23:14:06 +02:00
2023-10-29 14:48:11 +01:00
2023-10-29 14:48:11 +01:00
2023-10-29 14:48:11 +01:00
2026-05-27 23:29:27 +02:00
2025-11-21 21:26:43 +01:00
2026-07-09 22:13:39 +02:00
2026-07-03 15:52:41 +02:00
2026-07-04 10:13:39 +02:00
2023-10-29 14:48:11 +01:00
2026-07-09 22:13:39 +02:00
2026-05-08 06:50:13 +02:00
2020-06-01 19:21:41 +02:00
2026-07-24 14:07:15 +02:00
2025-11-25 12:49:23 +01:00
2025-10-13 13:47:06 +02:00
2026-04-02 07:19:43 +02:00
2024-12-27 19:42:18 +01:00
2026-06-14 22:35:06 +02:00
2026-07-03 09:55:58 +02:00
2025-07-14 23:15:44 +02:00
2026-06-29 18:24:49 +02:00
2026-04-02 07:19:43 +02:00
2026-08-03 12:15:44 +02:00
2026-05-18 07:55:33 +02:00
2026-07-30 14:54:12 +02:00
2025-12-11 18:22:38 +01:00
2026-06-08 09:00:00 +02:00
2026-01-23 22:50:00 +01:00
2026-04-02 07:19:43 +02:00
2026-06-14 22:35:06 +02:00
2026-06-25 23:20:34 +02:00
2021-01-12 09:36:51 +01:00
2026-03-07 07:39:57 +01:00
2026-07-08 15:39:40 +02:00
2026-06-29 18:24:49 +02:00
2026-08-03 12:02:29 +02:00
2026-01-09 13:10:04 +01:00
2026-06-14 22:35:06 +02:00
2026-06-24 21:58:51 +02:00
2026-07-03 15:52:41 +02:00
2026-07-03 15:52:41 +02:00
2026-06-08 09:00:00 +02:00
2026-06-29 18:24:49 +02:00
2026-07-08 15:39:40 +02:00
2023-12-15 08:13:25 +01:00
2026-06-24 21:58:51 +02:00
2025-11-13 21:31:24 +01:00
2023-10-29 14:48:11 +01:00
2023-10-29 14:48:11 +01:00
2025-12-11 18:22:38 +01:00
2023-10-29 14:48:11 +01:00
2024-08-12 15:33:26 +02:00
2023-04-17 20:55:22 +02:00
2025-04-03 12:54:00 +02:00
2026-07-20 13:01:30 +02:00
2023-08-06 14:26:21 +02:00
2025-11-13 21:31:24 +01:00
2025-09-24 06:29:57 +02:00
2026-06-14 22:35:06 +02:00
2022-08-24 09:44:16 +02:00
2026-01-16 12:19:17 +01:00
2023-10-29 14:48:11 +01:00
2025-04-12 08:39:11 +02:00
2026-07-20 13:01:30 +02:00
2026-06-14 22:35:06 +02:00
2026-06-11 23:49:50 +02:00
2018-05-27 19:19:12 +02:00
2026-02-10 13:21:35 +01:00
2023-10-29 14:48:11 +01:00
2024-04-10 14:41:16 +02:00
2024-09-03 09:19:52 +02:00
2023-07-02 22:36:05 +02:00
2026-04-16 09:44:58 +02:00
2023-10-29 14:48:11 +01:00
2025-04-12 08:39:11 +02:00
2023-11-06 18:33:28 +01:00
2023-08-10 14:26:40 +02:00
2020-09-11 01:04:07 +02:00
2026-02-10 00:04:11 +01:00
2026-07-10 14:07:35 +02:00
2026-06-15 21:20:09 +02:00
2026-07-20 13:01:30 +02:00
2026-08-03 11:49:48 +02:00
2025-12-11 18:22:38 +01:00
2026-07-03 15:52:41 +02:00
2026-06-24 21:58:51 +02:00
2026-06-14 22:35:06 +02:00
2025-12-11 18:22:38 +01:00
2026-07-24 14:07:15 +02:00
2026-05-05 21:05:17 +02:00
2025-12-11 18:22:38 +01:00
2026-07-10 07:39:32 +02:00
2026-07-20 13:01:30 +02:00
2022-12-11 16:58:50 +01:00
2026-01-16 12:19:17 +01:00
2026-07-26 18:08:44 +02:00
2026-07-03 15:52:41 +02:00
2026-07-09 15:47:58 +02:00
2026-08-03 11:52:04 +02:00
2025-12-26 21:59:38 +01:00
2026-06-13 10:17:44 +02:00
2024-03-16 08:35:18 +08:00
2026-05-21 13:42:38 +02:00
2026-06-24 21:58:51 +02:00
2025-07-18 08:44:36 +02:00
2024-04-10 14:41:16 +02:00
2023-08-10 14:26:40 +02:00
2026-06-25 23:20:34 +02:00
2026-07-24 14:07:15 +02:00
2025-12-31 13:33:57 +01:00
2026-03-30 15:09:11 +02:00
2026-07-04 10:13:39 +02:00
2026-07-03 15:52:41 +02:00
2023-10-29 14:48:11 +01:00
2026-08-03 12:02:29 +02:00
2026-07-03 15:52:41 +02:00
2023-12-12 16:54:50 +01:00
2026-06-13 07:04:17 +02:00
2026-03-09 11:59:12 +01:00
2026-07-20 12:59:18 +02:00
2023-08-10 14:26:40 +02:00
2024-04-10 14:41:16 +02:00
2026-06-14 22:35:06 +02:00
2025-11-13 21:31:24 +01:00
2026-06-05 16:37:00 +02:00
2023-12-25 07:12:54 +01:00