From f629d81df094d296fbd6965d825a5085eb0affcc Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 24 Jan 2025 22:21:27 +0100
Subject: [PATCH] test: Fix shifted source positions after formatting

---
 ...putDependencies-multi-elem-context.err.exp | 10 +--
 ...putDependencies-wrong-element-kind.err.exp | 10 +--
 ...al-fail-assert-equal-attrs-names-2.err.exp |  4 +-
 ...eval-fail-assert-equal-attrs-names.err.exp |  4 +-
 ...ail-assert-equal-derivations-extra.err.exp | 18 ++---
 ...eval-fail-assert-equal-derivations.err.exp | 18 ++---
 ...-fail-assert-equal-function-direct.err.exp |  4 +-
 ...eval-fail-assert-equal-list-length.err.exp |  4 +-
 .../lang/eval-fail-assert-nested-bool.err.exp | 76 ++++++++----------
 .../functional/lang/eval-fail-assert.err.exp  | 36 ++++-----
 .../lang/eval-fail-attr-name-type.err.exp     | 14 ++--
 ...fail-attrset-merge-drops-later-rec.err.exp |  9 ++-
 ...al-fail-bad-string-interpolation-4.err.exp |  8 +-
 .../lang/eval-fail-derivation-name.err.exp    | 16 ++--
 .../lang/eval-fail-dup-dynamic-attrs.err.exp  | 16 ++--
 .../lang/eval-fail-duplicate-traces.err.exp   | 52 ++++++------
 ...-fail-fetchurl-baseName-attrs-name.err.exp |  4 +-
 ...ake-ref-to-string-negative-integer.err.exp | 18 +++--
 ...-foldlStrict-strict-op-application.err.exp | 44 +++++-----
 .../lang/eval-fail-hashfile-missing.err.exp   | 10 +--
 tests/functional/lang/eval-fail-list.err.exp  |  6 +-
 .../lang/eval-fail-missing-arg.err.exp        | 13 +--
 .../lang/eval-fail-mutual-recursion.err.exp   | 80 +++++++++----------
 .../lang/eval-fail-nested-list-items.err.exp  | 10 +--
 .../lang/eval-fail-not-throws.err.exp         | 12 +--
 .../lang/eval-fail-overflowing-add.err.exp    | 10 +--
 .../lang/eval-fail-overflowing-div.err.exp    | 30 +++----
 .../lang/eval-fail-overflowing-mul.err.exp    | 20 ++---
 .../lang/eval-fail-overflowing-sub.err.exp    | 10 +--
 .../lang/eval-fail-recursion.err.exp          | 18 +++--
 .../functional/lang/eval-fail-remove.err.exp  | 16 ++--
 .../functional/lang/eval-fail-scope-5.err.exp | 36 ++++-----
 .../lang/eval-fail-undeclared-arg.err.exp     |  8 +-
 .../eval-fail-using-set-as-attr-name.err.exp  | 20 ++---
 .../repl/doc-comment-curried-args.expected    |  6 +-
 .../repl/doc-comment-formals.expected         |  3 +-
 .../repl/doc-comment-function.expected        |  3 +-
 tests/functional/repl/doc-compact.expected    |  3 +-
 tests/functional/repl/doc-constant.expected   | 33 ++++----
 tests/functional/repl/doc-floatedIn.expected  |  3 +-
 tests/functional/repl/doc-functor.expected    | 52 ++++++------
 .../repl/doc-lambda-flavors.expected          | 12 ++-
 .../functional/repl/doc-measurement.expected  |  3 +-
 .../functional/repl/doc-unambiguous.expected  |  3 +-
 44 files changed, 400 insertions(+), 385 deletions(-)

diff --git a/tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp b/tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp
index 6828e03c8e7..56fbffa1942 100644
--- a/tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp
+++ b/tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp
@@ -1,9 +1,9 @@
 error:
        … while calling the 'addDrvOutputDependencies' builtin
-         at /pwd/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.nix:18:4:
-           17|
-           18| in builtins.addDrvOutputDependencies combo-path
-             |    ^
-           19|
+         at /pwd/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.nix:25:1:
+           24| in
+           25| builtins.addDrvOutputDependencies combo-path
+             | ^
+           26|
 
        error: context of string '/nix/store/pg9yqs4yd85yhdm3f4i5dyaqp5jahrsz-fail.drv/nix/store/2dxd5frb715z451vbf7s8birlf3argbk-fail-2.drv' must have exactly one element, but has 2
diff --git a/tests/functional/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.err.exp b/tests/functional/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.err.exp
index 72b5e636897..d8399380eb4 100644
--- a/tests/functional/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.err.exp
+++ b/tests/functional/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.err.exp
@@ -1,9 +1,9 @@
 error:
        … while calling the 'addDrvOutputDependencies' builtin
-         at /pwd/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.nix:9:4:
-            8|
-            9| in builtins.addDrvOutputDependencies drv.outPath
-             |    ^
-           10|
+         at /pwd/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.nix:13:1:
+           12| in
+           13| builtins.addDrvOutputDependencies drv.outPath
+             | ^
+           14|
 
        error: `addDrvOutputDependencies` can only act on derivations, not on a derivation output such as 'out'
diff --git a/tests/functional/lang/eval-fail-assert-equal-attrs-names-2.err.exp b/tests/functional/lang/eval-fail-assert-equal-attrs-names-2.err.exp
index 4b68d97c20c..5912e6b8c30 100644
--- a/tests/functional/lang/eval-fail-assert-equal-attrs-names-2.err.exp
+++ b/tests/functional/lang/eval-fail-assert-equal-attrs-names-2.err.exp
@@ -1,8 +1,8 @@
 error:
        … while evaluating the condition of the assertion '({ a = true; } == { a = true; b = true; })'
          at /pwd/lang/eval-fail-assert-equal-attrs-names-2.nix:1:1:
-            1| assert { a = true; } == { a = true; b = true; };
+            1| assert
              | ^
-            2| throw "unreachable"
+            2|   {
 
        error: attribute names of attribute set '{ a = true; }' differs from attribute set '{ a = true; b = true; }'
diff --git a/tests/functional/lang/eval-fail-assert-equal-attrs-names.err.exp b/tests/functional/lang/eval-fail-assert-equal-attrs-names.err.exp
index bc61ca63a27..a93b26324cc 100644
--- a/tests/functional/lang/eval-fail-assert-equal-attrs-names.err.exp
+++ b/tests/functional/lang/eval-fail-assert-equal-attrs-names.err.exp
@@ -1,8 +1,8 @@
 error:
        … while evaluating the condition of the assertion '({ a = true; b = true; } == { a = true; })'
          at /pwd/lang/eval-fail-assert-equal-attrs-names.nix:1:1:
-            1| assert { a = true; b = true; } == { a = true; };
+            1| assert
              | ^
-            2| throw "unreachable"
+            2|   {
 
        error: attribute names of attribute set '{ a = true; b = true; }' differs from attribute set '{ a = true; }'
diff --git a/tests/functional/lang/eval-fail-assert-equal-derivations-extra.err.exp b/tests/functional/lang/eval-fail-assert-equal-derivations-extra.err.exp
index 7f49240747c..9ccf5e4dc10 100644
--- a/tests/functional/lang/eval-fail-assert-equal-derivations-extra.err.exp
+++ b/tests/functional/lang/eval-fail-assert-equal-derivations-extra.err.exp
@@ -3,23 +3,23 @@ error:
          at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:1:1:
             1| assert
              | ^
-            2|   { foo = { type = "derivation"; outPath = "/nix/store/0"; }; }
+            2|   {
 
        … while comparing attribute 'foo'
 
        … where left hand side is
-         at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:2:5:
-            1| assert
-            2|   { foo = { type = "derivation"; outPath = "/nix/store/0"; }; }
+         at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:3:5:
+            2|   {
+            3|     foo = {
              |     ^
-            3|   ==
+            4|       type = "derivation";
 
        … where right hand side is
-         at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:4:5:
-            3|   ==
-            4|   { foo = { type = "derivation"; outPath = "/nix/store/1"; devious = true; }; };
+         at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:8:5:
+            7|   } == {
+            8|     foo = {
              |     ^
-            5| throw "unreachable"
+            9|       type = "derivation";
 
        … while comparing a derivation by its 'outPath' attribute
 
diff --git a/tests/functional/lang/eval-fail-assert-equal-derivations.err.exp b/tests/functional/lang/eval-fail-assert-equal-derivations.err.exp
index d7f0face077..2be1f48583c 100644
--- a/tests/functional/lang/eval-fail-assert-equal-derivations.err.exp
+++ b/tests/functional/lang/eval-fail-assert-equal-derivations.err.exp
@@ -3,23 +3,23 @@ error:
          at /pwd/lang/eval-fail-assert-equal-derivations.nix:1:1:
             1| assert
              | ^
-            2|   { foo = { type = "derivation"; outPath = "/nix/store/0"; ignored = abort "not ignored"; }; }
+            2|   {
 
        … while comparing attribute 'foo'
 
        … where left hand side is
-         at /pwd/lang/eval-fail-assert-equal-derivations.nix:2:5:
-            1| assert
-            2|   { foo = { type = "derivation"; outPath = "/nix/store/0"; ignored = abort "not ignored"; }; }
+         at /pwd/lang/eval-fail-assert-equal-derivations.nix:3:5:
+            2|   {
+            3|     foo = {
              |     ^
-            3|   ==
+            4|       type = "derivation";
 
        … where right hand side is
-         at /pwd/lang/eval-fail-assert-equal-derivations.nix:4:5:
-            3|   ==
-            4|   { foo = { type = "derivation"; outPath = "/nix/store/1"; ignored = abort "not ignored"; }; };
+         at /pwd/lang/eval-fail-assert-equal-derivations.nix:9:5:
+            8|   } == {
+            9|     foo = {
              |     ^
-            5| throw "unreachable"
+           10|       type = "derivation";
 
        … while comparing a derivation by its 'outPath' attribute
 
diff --git a/tests/functional/lang/eval-fail-assert-equal-function-direct.err.exp b/tests/functional/lang/eval-fail-assert-equal-function-direct.err.exp
index f06d796981b..93c88a80cd4 100644
--- a/tests/functional/lang/eval-fail-assert-equal-function-direct.err.exp
+++ b/tests/functional/lang/eval-fail-assert-equal-function-direct.err.exp
@@ -2,8 +2,8 @@ error:
        … while evaluating the condition of the assertion '((x: x) == (x: x))'
          at /pwd/lang/eval-fail-assert-equal-function-direct.nix:3:1:
             2| # This only compares a direct comparison and makes no claims about functions in nested structures.
-            3| assert
+            3| assert (x: x) == (x: x);
              | ^
-            4|   (x: x)
+            4| abort "unreachable"
 
        error: distinct functions and immediate comparisons of identical functions compare as unequal
diff --git a/tests/functional/lang/eval-fail-assert-equal-list-length.err.exp b/tests/functional/lang/eval-fail-assert-equal-list-length.err.exp
index 90108552cf0..e82f3787517 100644
--- a/tests/functional/lang/eval-fail-assert-equal-list-length.err.exp
+++ b/tests/functional/lang/eval-fail-assert-equal-list-length.err.exp
@@ -1,8 +1,8 @@
 error:
        … while evaluating the condition of the assertion '([ (1) (0) ] == [ (10) ])'
          at /pwd/lang/eval-fail-assert-equal-list-length.nix:1:1:
-            1| assert [ 1 0 ] == [ 10 ];
+            1| assert
              | ^
-            2| throw "unreachable"
+            2|   [
 
        error: list of size '2' is not equal to list of size '1', left hand side is '[ 1 0 ]', right hand side is '[ 10 ]'
diff --git a/tests/functional/lang/eval-fail-assert-nested-bool.err.exp b/tests/functional/lang/eval-fail-assert-nested-bool.err.exp
index 1debb668c98..fdc0818200b 100644
--- a/tests/functional/lang/eval-fail-assert-nested-bool.err.exp
+++ b/tests/functional/lang/eval-fail-assert-nested-bool.err.exp
@@ -1,74 +1,66 @@
 error:
        … while evaluating the condition of the assertion '({ a = { b = [ ({ c = { d = true; }; }) ]; }; } == { a = { b = [ ({ c = { d = false; }; }) ]; }; })'
          at /pwd/lang/eval-fail-assert-nested-bool.nix:1:1:
-            1| assert
+            1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
              | ^
-            2|   { a.b = [ { c.d = true; } ]; }
+            2|
 
        … while comparing attribute 'a'
 
        … where left hand side is
-         at /pwd/lang/eval-fail-assert-nested-bool.nix:2:5:
-            1| assert
-            2|   { a.b = [ { c.d = true; } ]; }
-             |     ^
-            3|   ==
+         at /pwd/lang/eval-fail-assert-nested-bool.nix:1:10:
+            1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
+             |          ^
+            2|
 
        … where right hand side is
-         at /pwd/lang/eval-fail-assert-nested-bool.nix:4:5:
-            3|   ==
-            4|   { a.b = [ { c.d = false; } ]; };
-             |     ^
-            5|
+         at /pwd/lang/eval-fail-assert-nested-bool.nix:1:44:
+            1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
+             |                                            ^
+            2|
 
        … while comparing attribute 'b'
 
        … where left hand side is
-         at /pwd/lang/eval-fail-assert-nested-bool.nix:2:5:
-            1| assert
-            2|   { a.b = [ { c.d = true; } ]; }
-             |     ^
-            3|   ==
+         at /pwd/lang/eval-fail-assert-nested-bool.nix:1:10:
+            1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
+             |          ^
+            2|
 
        … where right hand side is
-         at /pwd/lang/eval-fail-assert-nested-bool.nix:4:5:
-            3|   ==
-            4|   { a.b = [ { c.d = false; } ]; };
-             |     ^
-            5|
+         at /pwd/lang/eval-fail-assert-nested-bool.nix:1:44:
+            1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
+             |                                            ^
+            2|
 
        … while comparing list element 0
 
        … while comparing attribute 'c'
 
        … where left hand side is
-         at /pwd/lang/eval-fail-assert-nested-bool.nix:2:15:
-            1| assert
-            2|   { a.b = [ { c.d = true; } ]; }
-             |               ^
-            3|   ==
+         at /pwd/lang/eval-fail-assert-nested-bool.nix:1:20:
+            1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
+             |                    ^
+            2|
 
        … where right hand side is
-         at /pwd/lang/eval-fail-assert-nested-bool.nix:4:15:
-            3|   ==
-            4|   { a.b = [ { c.d = false; } ]; };
-             |               ^
-            5|
+         at /pwd/lang/eval-fail-assert-nested-bool.nix:1:54:
+            1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
+             |                                                      ^
+            2|
 
        … while comparing attribute 'd'
 
        … where left hand side is
-         at /pwd/lang/eval-fail-assert-nested-bool.nix:2:15:
-            1| assert
-            2|   { a.b = [ { c.d = true; } ]; }
-             |               ^
-            3|   ==
+         at /pwd/lang/eval-fail-assert-nested-bool.nix:1:20:
+            1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
+             |                    ^
+            2|
 
        … where right hand side is
-         at /pwd/lang/eval-fail-assert-nested-bool.nix:4:15:
-            3|   ==
-            4|   { a.b = [ { c.d = false; } ]; };
-             |               ^
-            5|
+         at /pwd/lang/eval-fail-assert-nested-bool.nix:1:54:
+            1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
+             |                                                      ^
+            2|
 
        error: boolean 'true' is not equal to boolean 'false'
diff --git a/tests/functional/lang/eval-fail-assert.err.exp b/tests/functional/lang/eval-fail-assert.err.exp
index 7be9e238797..5fffe79bf0d 100644
--- a/tests/functional/lang/eval-fail-assert.err.exp
+++ b/tests/functional/lang/eval-fail-assert.err.exp
@@ -1,30 +1,30 @@
 error:
        … while evaluating the attribute 'body'
-         at /pwd/lang/eval-fail-assert.nix:4:3:
-            3|
-            4|   body = x "x";
+         at /pwd/lang/eval-fail-assert.nix:7:3:
+            6|
+            7|   body = x "x";
              |   ^
-            5| }
+            8| }
 
        … from call site
-         at /pwd/lang/eval-fail-assert.nix:4:10:
-            3|
-            4|   body = x "x";
+         at /pwd/lang/eval-fail-assert.nix:7:10:
+            6|
+            7|   body = x "x";
              |          ^
-            5| }
+            8| }
 
        … while calling 'x'
-         at /pwd/lang/eval-fail-assert.nix:2:7:
-            1| let {
-            2|   x = arg: assert arg == "y"; 123;
-             |       ^
-            3|
+         at /pwd/lang/eval-fail-assert.nix:3:5:
+            2|   x =
+            3|     arg:
+             |     ^
+            4|     assert arg == "y";
 
        … while evaluating the condition of the assertion '(arg == "y")'
-         at /pwd/lang/eval-fail-assert.nix:2:12:
-            1| let {
-            2|   x = arg: assert arg == "y"; 123;
-             |            ^
-            3|
+         at /pwd/lang/eval-fail-assert.nix:4:5:
+            3|     arg:
+            4|     assert arg == "y";
+             |     ^
+            5|     123;
 
        error: string '"x"' is not equal to string '"y"'
diff --git a/tests/functional/lang/eval-fail-attr-name-type.err.exp b/tests/functional/lang/eval-fail-attr-name-type.err.exp
index 6848a35ed80..4ea209b130f 100644
--- a/tests/functional/lang/eval-fail-attr-name-type.err.exp
+++ b/tests/functional/lang/eval-fail-attr-name-type.err.exp
@@ -2,20 +2,20 @@ error:
        … while evaluating the attribute 'puppy."${key}"'
          at /pwd/lang/eval-fail-attr-name-type.nix:3:5:
             2|   attrs = {
-            3|     puppy.doggy = {};
+            3|     puppy.doggy = { };
              |     ^
             4|   };
 
        … while evaluating an attribute name
-         at /pwd/lang/eval-fail-attr-name-type.nix:7:17:
+         at /pwd/lang/eval-fail-attr-name-type.nix:7:15:
             6| in
-            7|   attrs.puppy.${key}
-             |                 ^
+            7| attrs.puppy.${key}
+             |               ^
             8|
 
        error: expected a string but found an integer: 1
-       at /pwd/lang/eval-fail-attr-name-type.nix:7:17:
+       at /pwd/lang/eval-fail-attr-name-type.nix:7:15:
             6| in
-            7|   attrs.puppy.${key}
-             |                 ^
+            7| attrs.puppy.${key}
+             |               ^
             8|
diff --git a/tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.err.exp b/tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.err.exp
index d1cdc7b769f..ba9185dce1c 100644
--- a/tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.err.exp
+++ b/tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.err.exp
@@ -1,5 +1,6 @@
 error: undefined variable 'd'
-       at /pwd/lang/eval-fail-attrset-merge-drops-later-rec.nix:1:26:
-            1| { a.b = 1; a = rec { c = d + 2; d = 3; }; }.c
-             |                          ^
-            2|
+       at /pwd/lang/eval-fail-attrset-merge-drops-later-rec.nix:4:9:
+            3|   a = rec {
+            4|     c = d + 2;
+             |         ^
+            5|     d = 3;
diff --git a/tests/functional/lang/eval-fail-bad-string-interpolation-4.err.exp b/tests/functional/lang/eval-fail-bad-string-interpolation-4.err.exp
index b262e814dbc..ea5910072c3 100644
--- a/tests/functional/lang/eval-fail-bad-string-interpolation-4.err.exp
+++ b/tests/functional/lang/eval-fail-bad-string-interpolation-4.err.exp
@@ -1,9 +1,9 @@
 error:
        … while evaluating a path segment
-         at /pwd/lang/eval-fail-bad-string-interpolation-4.nix:9:3:
-            8| # The error message should not be too long.
-            9| ''${pkgs}''
+         at /pwd/lang/eval-fail-bad-string-interpolation-4.nix:19:3:
+           18| # The error message should not be too long.
+           19| ''${pkgs}''
              |   ^
-           10|
+           20|
 
        error: cannot coerce a set to a string: { a = { a = { a = { a = "ha"; b = "ha"; c = "ha"; d = "ha"; e = "ha"; f = "ha"; g = "ha"; h = "ha"; j = "ha"; }; «8 attributes elided» }; «8 attributes elided» }; «8 attributes elided» }
diff --git a/tests/functional/lang/eval-fail-derivation-name.err.exp b/tests/functional/lang/eval-fail-derivation-name.err.exp
index 0ef98674d81..017326c3490 100644
--- a/tests/functional/lang/eval-fail-derivation-name.err.exp
+++ b/tests/functional/lang/eval-fail-derivation-name.err.exp
@@ -1,17 +1,17 @@
 error:
        … while evaluating the attribute 'outPath'
          at <nix/derivation-internal.nix>:<number>:<number>:
-     <number>|       value = commonAttrs // {
-     <number>|         outPath = builtins.getAttr outputName strict;
-             |         ^
-     <number>|         drvPath = strict.drvPath;
+     <number>|     value = commonAttrs // {
+     <number>|       outPath = builtins.getAttr outputName strict;
+             |       ^
+     <number>|       drvPath = strict.drvPath;
 
        … while calling the 'getAttr' builtin
          at <nix/derivation-internal.nix>:<number>:<number>:
-     <number>|       value = commonAttrs // {
-     <number>|         outPath = builtins.getAttr outputName strict;
-             |                   ^
-     <number>|         drvPath = strict.drvPath;
+     <number>|     value = commonAttrs // {
+     <number>|       outPath = builtins.getAttr outputName strict;
+             |                 ^
+     <number>|       drvPath = strict.drvPath;
 
        … while calling the 'derivationStrict' builtin
          at <nix/derivation-internal.nix>:<number>:<number>:
diff --git a/tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp b/tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp
index 834f9c67bc4..4eafe945b74 100644
--- a/tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp
+++ b/tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp
@@ -2,13 +2,13 @@ error:
        … while evaluating the attribute 'set'
          at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:2:3:
             1| {
-            2|   set = { "${"" + "b"}" = 1; };
+            2|   set = {
              |   ^
-            3|   set = { "${"b" + ""}" = 2; };
+            3|     "${"" + "b"}" = 1;
 
-       error: dynamic attribute 'b' already defined at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:2:11
-       at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:3:11:
-            2|   set = { "${"" + "b"}" = 1; };
-            3|   set = { "${"b" + ""}" = 2; };
-             |           ^
-            4| }
+       error: dynamic attribute 'b' already defined at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:3:5
+       at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:6:5:
+            5|   set = {
+            6|     "${"b" + ""}" = 2;
+             |     ^
+            7|   };
diff --git a/tests/functional/lang/eval-fail-duplicate-traces.err.exp b/tests/functional/lang/eval-fail-duplicate-traces.err.exp
index cedaebd3b58..e6ae60f3ca0 100644
--- a/tests/functional/lang/eval-fail-duplicate-traces.err.exp
+++ b/tests/functional/lang/eval-fail-duplicate-traces.err.exp
@@ -1,51 +1,51 @@
 error:
        … from call site
-         at /pwd/lang/eval-fail-duplicate-traces.nix:9:3:
-            8| in
-            9|   throwAfter 2
-             |   ^
-           10|
+         at /pwd/lang/eval-fail-duplicate-traces.nix:6:1:
+            5| in
+            6| throwAfter 2
+             | ^
+            7|
 
        … while calling 'throwAfter'
          at /pwd/lang/eval-fail-duplicate-traces.nix:4:16:
             3| let
-            4|   throwAfter = n:
+            4|   throwAfter = n: if n > 0 then throwAfter (n - 1) else throw "Uh oh!";
              |                ^
-            5|     if n > 0
+            5| in
 
        … from call site
-         at /pwd/lang/eval-fail-duplicate-traces.nix:6:10:
-            5|     if n > 0
-            6|     then throwAfter (n - 1)
-             |          ^
-            7|     else throw "Uh oh!";
+         at /pwd/lang/eval-fail-duplicate-traces.nix:4:33:
+            3| let
+            4|   throwAfter = n: if n > 0 then throwAfter (n - 1) else throw "Uh oh!";
+             |                                 ^
+            5| in
 
        … while calling 'throwAfter'
          at /pwd/lang/eval-fail-duplicate-traces.nix:4:16:
             3| let
-            4|   throwAfter = n:
+            4|   throwAfter = n: if n > 0 then throwAfter (n - 1) else throw "Uh oh!";
              |                ^
-            5|     if n > 0
+            5| in
 
        … from call site
-         at /pwd/lang/eval-fail-duplicate-traces.nix:6:10:
-            5|     if n > 0
-            6|     then throwAfter (n - 1)
-             |          ^
-            7|     else throw "Uh oh!";
+         at /pwd/lang/eval-fail-duplicate-traces.nix:4:33:
+            3| let
+            4|   throwAfter = n: if n > 0 then throwAfter (n - 1) else throw "Uh oh!";
+             |                                 ^
+            5| in
 
        … while calling 'throwAfter'
          at /pwd/lang/eval-fail-duplicate-traces.nix:4:16:
             3| let
-            4|   throwAfter = n:
+            4|   throwAfter = n: if n > 0 then throwAfter (n - 1) else throw "Uh oh!";
              |                ^
-            5|     if n > 0
+            5| in
 
        … while calling the 'throw' builtin
-         at /pwd/lang/eval-fail-duplicate-traces.nix:7:10:
-            6|     then throwAfter (n - 1)
-            7|     else throw "Uh oh!";
-             |          ^
-            8| in
+         at /pwd/lang/eval-fail-duplicate-traces.nix:4:57:
+            3| let
+            4|   throwAfter = n: if n > 0 then throwAfter (n - 1) else throw "Uh oh!";
+             |                                                         ^
+            5| in
 
        error: Uh oh!
diff --git a/tests/functional/lang/eval-fail-fetchurl-baseName-attrs-name.err.exp b/tests/functional/lang/eval-fail-fetchurl-baseName-attrs-name.err.exp
index 30f8b6a3544..2cac02f5875 100644
--- a/tests/functional/lang/eval-fail-fetchurl-baseName-attrs-name.err.exp
+++ b/tests/functional/lang/eval-fail-fetchurl-baseName-attrs-name.err.exp
@@ -1,8 +1,8 @@
 error:
        … while calling the 'fetchurl' builtin
          at /pwd/lang/eval-fail-fetchurl-baseName-attrs-name.nix:1:1:
-            1| builtins.fetchurl { url = "https://example.com/foo.tar.gz"; name = "~wobble~"; }
+            1| builtins.fetchurl {
              | ^
-            2|
+            2|   url = "https://example.com/foo.tar.gz";
 
        error: invalid store path name when fetching URL 'https://example.com/foo.tar.gz': name '~wobble~' contains illegal character '~'. Please change the value for the 'name' attribute passed to 'fetchurl', so that it can create a valid store path.
diff --git a/tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp b/tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp
index 25c8d7eaaa8..2b56939c621 100644
--- a/tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp
+++ b/tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp
@@ -1,14 +1,16 @@
 error:
        … while calling the 'seq' builtin
-         at /pwd/lang/eval-fail-flake-ref-to-string-negative-integer.nix:1:16:
-            1| let n = -1; in builtins.seq n (builtins.flakeRefToString {
-             |                ^
-            2|   type  = "github";
+         at /pwd/lang/eval-fail-flake-ref-to-string-negative-integer.nix:4:1:
+            3| in
+            4| builtins.seq n (
+             | ^
+            5|   builtins.flakeRefToString {
 
        … while calling the 'flakeRefToString' builtin
-         at /pwd/lang/eval-fail-flake-ref-to-string-negative-integer.nix:1:32:
-            1| let n = -1; in builtins.seq n (builtins.flakeRefToString {
-             |                                ^
-            2|   type  = "github";
+         at /pwd/lang/eval-fail-flake-ref-to-string-negative-integer.nix:5:3:
+            4| builtins.seq n (
+            5|   builtins.flakeRefToString {
+             |   ^
+            6|     type = "github";
 
        error: negative value given for flake ref attr repo: -1
diff --git a/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.err.exp b/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.err.exp
index 4903bc82d54..bb02ecdcb8f 100644
--- a/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.err.exp
+++ b/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.err.exp
@@ -2,36 +2,36 @@ error:
        … while calling the 'foldl'' builtin
          at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:2:1:
             1| # Tests that the result of applying op is forced even if the value is never used
-            2| builtins.foldl'
+            2| builtins.foldl' (_: f: f null) null [
              | ^
-            3|   (_: f: f null)
+            3|   (_: throw "Not the final value, but is still forced!")
 
        … while calling anonymous lambda
-         at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:3:7:
-            2| builtins.foldl'
-            3|   (_: f: f null)
-             |       ^
-            4|   null
+         at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:2:21:
+            1| # Tests that the result of applying op is forced even if the value is never used
+            2| builtins.foldl' (_: f: f null) null [
+             |                     ^
+            3|   (_: throw "Not the final value, but is still forced!")
 
        … from call site
-         at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:3:10:
-            2| builtins.foldl'
-            3|   (_: f: f null)
-             |          ^
-            4|   null
+         at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:2:24:
+            1| # Tests that the result of applying op is forced even if the value is never used
+            2| builtins.foldl' (_: f: f null) null [
+             |                        ^
+            3|   (_: throw "Not the final value, but is still forced!")
 
        … while calling anonymous lambda
-         at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:5:6:
-            4|   null
-            5|   [ (_: throw "Not the final value, but is still forced!") (_: 23) ]
-             |      ^
-            6|
+         at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:3:4:
+            2| builtins.foldl' (_: f: f null) null [
+            3|   (_: throw "Not the final value, but is still forced!")
+             |    ^
+            4|   (_: 23)
 
        … while calling the 'throw' builtin
-         at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:5:9:
-            4|   null
-            5|   [ (_: throw "Not the final value, but is still forced!") (_: 23) ]
-             |         ^
-            6|
+         at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:3:7:
+            2| builtins.foldl' (_: f: f null) null [
+            3|   (_: throw "Not the final value, but is still forced!")
+             |       ^
+            4|   (_: 23)
 
        error: Not the final value, but is still forced!
diff --git a/tests/functional/lang/eval-fail-hashfile-missing.err.exp b/tests/functional/lang/eval-fail-hashfile-missing.err.exp
index 1e465392744..0d3747a6d57 100644
--- a/tests/functional/lang/eval-fail-hashfile-missing.err.exp
+++ b/tests/functional/lang/eval-fail-hashfile-missing.err.exp
@@ -1,10 +1,10 @@
 error:
        … while calling the 'toString' builtin
-         at /pwd/lang/eval-fail-hashfile-missing.nix:4:3:
-            3| in
-            4|   toString (builtins.concatLists (map (hash: map (builtins.hashFile hash) paths) ["md5" "sha1" "sha256" "sha512"]))
-             |   ^
-            5|
+         at /pwd/lang/eval-fail-hashfile-missing.nix:7:1:
+            6| in
+            7| toString (
+             | ^
+            8|   builtins.concatLists (
 
        … while evaluating the first argument passed to builtins.toString
 
diff --git a/tests/functional/lang/eval-fail-list.err.exp b/tests/functional/lang/eval-fail-list.err.exp
index d492f8bd2e4..8b21e9a3715 100644
--- a/tests/functional/lang/eval-fail-list.err.exp
+++ b/tests/functional/lang/eval-fail-list.err.exp
@@ -1,8 +1,8 @@
 error:
        … while evaluating one of the elements to concatenate
-         at /pwd/lang/eval-fail-list.nix:1:2:
-            1| 8++1
-             |  ^
+         at /pwd/lang/eval-fail-list.nix:1:3:
+            1| 8 ++ 1
+             |   ^
             2|
 
        error: expected a list but found an integer: 8
diff --git a/tests/functional/lang/eval-fail-missing-arg.err.exp b/tests/functional/lang/eval-fail-missing-arg.err.exp
index 3b162fe1b60..d5a66d2c5ea 100644
--- a/tests/functional/lang/eval-fail-missing-arg.err.exp
+++ b/tests/functional/lang/eval-fail-missing-arg.err.exp
@@ -1,12 +1,13 @@
 error:
        … from call site
          at /pwd/lang/eval-fail-missing-arg.nix:1:1:
-            1| ({x, y, z}: x + y + z) {x = "foo"; z = "bar";}
+            1| (
              | ^
-            2|
+            2|   {
 
        error: function 'anonymous lambda' called without required argument 'y'
-       at /pwd/lang/eval-fail-missing-arg.nix:1:2:
-            1| ({x, y, z}: x + y + z) {x = "foo"; z = "bar";}
-             |  ^
-            2|
+       at /pwd/lang/eval-fail-missing-arg.nix:2:3:
+            1| (
+            2|   {
+             |   ^
+            3|     x,
diff --git a/tests/functional/lang/eval-fail-mutual-recursion.err.exp b/tests/functional/lang/eval-fail-mutual-recursion.err.exp
index c034afcd5e0..9d84aa43f0f 100644
--- a/tests/functional/lang/eval-fail-mutual-recursion.err.exp
+++ b/tests/functional/lang/eval-fail-mutual-recursion.err.exp
@@ -1,64 +1,64 @@
 error:
        … from call site
-         at /pwd/lang/eval-fail-mutual-recursion.nix:36:3:
-           35| in
-           36|   throwAfterA true 10
-             |   ^
-           37|
+         at /pwd/lang/eval-fail-mutual-recursion.nix:40:1:
+           39| in
+           40| throwAfterA true 10
+             | ^
+           41|
 
        … while calling 'throwAfterA'
-         at /pwd/lang/eval-fail-mutual-recursion.nix:29:26:
-           28|
-           29|   throwAfterA = recurse: n:
-             |                          ^
-           30|     if n > 0
+         at /pwd/lang/eval-fail-mutual-recursion.nix:32:14:
+           31|   throwAfterA =
+           32|     recurse: n:
+             |              ^
+           33|     if n > 0 then
 
        … from call site
-         at /pwd/lang/eval-fail-mutual-recursion.nix:31:10:
-           30|     if n > 0
-           31|     then throwAfterA recurse (n - 1)
-             |          ^
-           32|     else if recurse
+         at /pwd/lang/eval-fail-mutual-recursion.nix:34:7:
+           33|     if n > 0 then
+           34|       throwAfterA recurse (n - 1)
+             |       ^
+           35|     else if recurse then
 
        (19 duplicate frames omitted)
 
        … from call site
-         at /pwd/lang/eval-fail-mutual-recursion.nix:33:10:
-           32|     else if recurse
-           33|     then throwAfterB true 10
-             |          ^
-           34|     else throw "Uh oh!";
+         at /pwd/lang/eval-fail-mutual-recursion.nix:36:7:
+           35|     else if recurse then
+           36|       throwAfterB true 10
+             |       ^
+           37|     else
 
        … while calling 'throwAfterB'
-         at /pwd/lang/eval-fail-mutual-recursion.nix:22:26:
-           21| let
-           22|   throwAfterB = recurse: n:
-             |                          ^
-           23|     if n > 0
+         at /pwd/lang/eval-fail-mutual-recursion.nix:23:14:
+           22|   throwAfterB =
+           23|     recurse: n:
+             |              ^
+           24|     if n > 0 then
 
        … from call site
-         at /pwd/lang/eval-fail-mutual-recursion.nix:24:10:
-           23|     if n > 0
-           24|     then throwAfterB recurse (n - 1)
-             |          ^
-           25|     else if recurse
+         at /pwd/lang/eval-fail-mutual-recursion.nix:25:7:
+           24|     if n > 0 then
+           25|       throwAfterB recurse (n - 1)
+             |       ^
+           26|     else if recurse then
 
        (19 duplicate frames omitted)
 
        … from call site
-         at /pwd/lang/eval-fail-mutual-recursion.nix:26:10:
-           25|     else if recurse
-           26|     then throwAfterA false 10
-             |          ^
-           27|     else throw "Uh oh!";
+         at /pwd/lang/eval-fail-mutual-recursion.nix:27:7:
+           26|     else if recurse then
+           27|       throwAfterA false 10
+             |       ^
+           28|     else
 
        (21 duplicate frames omitted)
 
        … while calling the 'throw' builtin
-         at /pwd/lang/eval-fail-mutual-recursion.nix:34:10:
-           33|     then throwAfterB true 10
-           34|     else throw "Uh oh!";
-             |          ^
-           35| in
+         at /pwd/lang/eval-fail-mutual-recursion.nix:38:7:
+           37|     else
+           38|       throw "Uh oh!";
+             |       ^
+           39| in
 
        error: Uh oh!
diff --git a/tests/functional/lang/eval-fail-nested-list-items.err.exp b/tests/functional/lang/eval-fail-nested-list-items.err.exp
index 90d43906165..1169b8326ca 100644
--- a/tests/functional/lang/eval-fail-nested-list-items.err.exp
+++ b/tests/functional/lang/eval-fail-nested-list-items.err.exp
@@ -1,9 +1,9 @@
 error:
        … while evaluating a path segment
-         at /pwd/lang/eval-fail-nested-list-items.nix:11:6:
-           10|
-           11| "" + (let v = [ [ 1 2 3 4 5 6 7 8 ] [1 2 3 4]]; in builtins.deepSeq v v)
-             |      ^
-           12|
+         at /pwd/lang/eval-fail-nested-list-items.nix:12:3:
+           11| ""
+           12| + (
+             |   ^
+           13|   let
 
        error: cannot coerce a list to a string: [ [ 1 2 3 4 5 6 7 8 ] [ 1 «3 items elided» ] ]
diff --git a/tests/functional/lang/eval-fail-not-throws.err.exp b/tests/functional/lang/eval-fail-not-throws.err.exp
index fc81f7277e1..b49ed7b0048 100644
--- a/tests/functional/lang/eval-fail-not-throws.err.exp
+++ b/tests/functional/lang/eval-fail-not-throws.err.exp
@@ -1,14 +1,14 @@
 error:
        … in the argument of the not operator
-         at /pwd/lang/eval-fail-not-throws.nix:1:4:
-            1| ! (throw "uh oh!")
-             |    ^
+         at /pwd/lang/eval-fail-not-throws.nix:1:3:
+            1| !(throw "uh oh!")
+             |   ^
             2|
 
        … while calling the 'throw' builtin
-         at /pwd/lang/eval-fail-not-throws.nix:1:4:
-            1| ! (throw "uh oh!")
-             |    ^
+         at /pwd/lang/eval-fail-not-throws.nix:1:3:
+            1| !(throw "uh oh!")
+             |   ^
             2|
 
        error: uh oh!
diff --git a/tests/functional/lang/eval-fail-overflowing-add.err.exp b/tests/functional/lang/eval-fail-overflowing-add.err.exp
index 6458cf1c933..5a77e9c9d97 100644
--- a/tests/functional/lang/eval-fail-overflowing-add.err.exp
+++ b/tests/functional/lang/eval-fail-overflowing-add.err.exp
@@ -1,6 +1,6 @@
 error: integer overflow in adding 9223372036854775807 + 1
-       at /pwd/lang/eval-fail-overflowing-add.nix:4:8:
-            3|   b = 1;
-            4| in a + b
-             |        ^
-            5|
+       at /pwd/lang/eval-fail-overflowing-add.nix:5:5:
+            4| in
+            5| a + b
+             |     ^
+            6|
diff --git a/tests/functional/lang/eval-fail-overflowing-div.err.exp b/tests/functional/lang/eval-fail-overflowing-div.err.exp
index 8ce07d4d662..812c6056b76 100644
--- a/tests/functional/lang/eval-fail-overflowing-div.err.exp
+++ b/tests/functional/lang/eval-fail-overflowing-div.err.exp
@@ -1,23 +1,23 @@
 error:
        … while calling the 'seq' builtin
-         at /pwd/lang/eval-fail-overflowing-div.nix:7:4:
-            6|   b = -1;
-            7| in builtins.seq intMin (builtins.seq b (intMin / b))
-             |    ^
-            8|
+         at /pwd/lang/eval-fail-overflowing-div.nix:8:1:
+            7| in
+            8| builtins.seq intMin (builtins.seq b (intMin / b))
+             | ^
+            9|
 
        … while calling the 'seq' builtin
-         at /pwd/lang/eval-fail-overflowing-div.nix:7:25:
-            6|   b = -1;
-            7| in builtins.seq intMin (builtins.seq b (intMin / b))
-             |                         ^
-            8|
+         at /pwd/lang/eval-fail-overflowing-div.nix:8:22:
+            7| in
+            8| builtins.seq intMin (builtins.seq b (intMin / b))
+             |                      ^
+            9|
 
        … while calling the 'div' builtin
-         at /pwd/lang/eval-fail-overflowing-div.nix:7:48:
-            6|   b = -1;
-            7| in builtins.seq intMin (builtins.seq b (intMin / b))
-             |                                                ^
-            8|
+         at /pwd/lang/eval-fail-overflowing-div.nix:8:45:
+            7| in
+            8| builtins.seq intMin (builtins.seq b (intMin / b))
+             |                                             ^
+            9|
 
        error: integer overflow in dividing -9223372036854775808 / -1
diff --git a/tests/functional/lang/eval-fail-overflowing-mul.err.exp b/tests/functional/lang/eval-fail-overflowing-mul.err.exp
index f42b39d4db9..aaae4b7bd86 100644
--- a/tests/functional/lang/eval-fail-overflowing-mul.err.exp
+++ b/tests/functional/lang/eval-fail-overflowing-mul.err.exp
@@ -1,16 +1,16 @@
 error:
        … while calling the 'mul' builtin
-         at /pwd/lang/eval-fail-overflowing-mul.nix:3:10:
-            2|   a = 4294967297;
-            3| in a * a * a
-             |          ^
-            4|
+         at /pwd/lang/eval-fail-overflowing-mul.nix:4:7:
+            3| in
+            4| a * a * a
+             |       ^
+            5|
 
        … while calling the 'mul' builtin
-         at /pwd/lang/eval-fail-overflowing-mul.nix:3:6:
-            2|   a = 4294967297;
-            3| in a * a * a
-             |      ^
-            4|
+         at /pwd/lang/eval-fail-overflowing-mul.nix:4:3:
+            3| in
+            4| a * a * a
+             |   ^
+            5|
 
        error: integer overflow in multiplying 4294967297 * 4294967297
diff --git a/tests/functional/lang/eval-fail-overflowing-sub.err.exp b/tests/functional/lang/eval-fail-overflowing-sub.err.exp
index 66a3a03f885..5904c8dcc9d 100644
--- a/tests/functional/lang/eval-fail-overflowing-sub.err.exp
+++ b/tests/functional/lang/eval-fail-overflowing-sub.err.exp
@@ -1,9 +1,9 @@
 error:
        … while calling the 'sub' builtin
-         at /pwd/lang/eval-fail-overflowing-sub.nix:4:6:
-            3|   b = 2;
-            4| in a - b
-             |      ^
-            5|
+         at /pwd/lang/eval-fail-overflowing-sub.nix:5:3:
+            4| in
+            5| a - b
+             |   ^
+            6|
 
        error: integer overflow in subtracting -9223372036854775807 - 2
diff --git a/tests/functional/lang/eval-fail-recursion.err.exp b/tests/functional/lang/eval-fail-recursion.err.exp
index 19380dc6536..8bfb4e12e47 100644
--- a/tests/functional/lang/eval-fail-recursion.err.exp
+++ b/tests/functional/lang/eval-fail-recursion.err.exp
@@ -1,12 +1,14 @@
 error:
        … in the right operand of the update (//) operator
-         at /pwd/lang/eval-fail-recursion.nix:1:12:
-            1| let a = {} // a; in a.foo
-             |            ^
-            2|
+         at /pwd/lang/eval-fail-recursion.nix:2:11:
+            1| let
+            2|   a = { } // a;
+             |           ^
+            3| in
 
        error: infinite recursion encountered
-       at /pwd/lang/eval-fail-recursion.nix:1:15:
-            1| let a = {} // a; in a.foo
-             |               ^
-            2|
+       at /pwd/lang/eval-fail-recursion.nix:2:14:
+            1| let
+            2|   a = { } // a;
+             |              ^
+            3| in
diff --git a/tests/functional/lang/eval-fail-remove.err.exp b/tests/functional/lang/eval-fail-remove.err.exp
index 292b3c3f33a..0e087688a25 100644
--- a/tests/functional/lang/eval-fail-remove.err.exp
+++ b/tests/functional/lang/eval-fail-remove.err.exp
@@ -1,15 +1,15 @@
 error:
        … while evaluating the attribute 'body'
-         at /pwd/lang/eval-fail-remove.nix:4:3:
-            3|
-            4|   body = (removeAttrs attrs ["x"]).x;
+         at /pwd/lang/eval-fail-remove.nix:7:3:
+            6|
+            7|   body = (removeAttrs attrs [ "x" ]).x;
              |   ^
-            5| }
+            8| }
 
        error: attribute 'x' missing
-       at /pwd/lang/eval-fail-remove.nix:4:10:
-            3|
-            4|   body = (removeAttrs attrs ["x"]).x;
+       at /pwd/lang/eval-fail-remove.nix:7:10:
+            6|
+            7|   body = (removeAttrs attrs [ "x" ]).x;
              |          ^
-            5| }
+            8| }
        Did you mean y?
diff --git a/tests/functional/lang/eval-fail-scope-5.err.exp b/tests/functional/lang/eval-fail-scope-5.err.exp
index b0b05cad737..6edc85f4f16 100644
--- a/tests/functional/lang/eval-fail-scope-5.err.exp
+++ b/tests/functional/lang/eval-fail-scope-5.err.exp
@@ -1,28 +1,28 @@
 error:
        … while evaluating the attribute 'body'
-         at /pwd/lang/eval-fail-scope-5.nix:8:3:
-            7|
-            8|   body = f {};
+         at /pwd/lang/eval-fail-scope-5.nix:13:3:
+           12|
+           13|   body = f { };
              |   ^
-            9|
+           14|
 
        … from call site
-         at /pwd/lang/eval-fail-scope-5.nix:8:10:
-            7|
-            8|   body = f {};
+         at /pwd/lang/eval-fail-scope-5.nix:13:10:
+           12|
+           13|   body = f { };
              |          ^
-            9|
+           14|
 
        … while calling 'f'
-         at /pwd/lang/eval-fail-scope-5.nix:6:7:
-            5|
-            6|   f = {x ? y, y ? x}: x + y;
-             |       ^
-            7|
+         at /pwd/lang/eval-fail-scope-5.nix:7:5:
+            6|   f =
+            7|     {
+             |     ^
+            8|       x ? y,
 
        error: infinite recursion encountered
-       at /pwd/lang/eval-fail-scope-5.nix:6:12:
-            5|
-            6|   f = {x ? y, y ? x}: x + y;
-             |            ^
-            7|
+       at /pwd/lang/eval-fail-scope-5.nix:8:11:
+            7|     {
+            8|       x ? y,
+             |           ^
+            9|       y ? x,
diff --git a/tests/functional/lang/eval-fail-undeclared-arg.err.exp b/tests/functional/lang/eval-fail-undeclared-arg.err.exp
index 6e13a138eb7..353894d01e6 100644
--- a/tests/functional/lang/eval-fail-undeclared-arg.err.exp
+++ b/tests/functional/lang/eval-fail-undeclared-arg.err.exp
@@ -1,13 +1,13 @@
 error:
        … from call site
          at /pwd/lang/eval-fail-undeclared-arg.nix:1:1:
-            1| ({x, z}: x + z) {x = "foo"; y = "bla"; z = "bar";}
+            1| ({ x, z }: x + z) {
              | ^
-            2|
+            2|   x = "foo";
 
        error: function 'anonymous lambda' called with unexpected argument 'y'
        at /pwd/lang/eval-fail-undeclared-arg.nix:1:2:
-            1| ({x, z}: x + z) {x = "foo"; y = "bla"; z = "bar";}
+            1| ({ x, z }: x + z) {
              |  ^
-            2|
+            2|   x = "foo";
        Did you mean one of x or z?
diff --git a/tests/functional/lang/eval-fail-using-set-as-attr-name.err.exp b/tests/functional/lang/eval-fail-using-set-as-attr-name.err.exp
index 4326c965008..9a59f37f35e 100644
--- a/tests/functional/lang/eval-fail-using-set-as-attr-name.err.exp
+++ b/tests/functional/lang/eval-fail-using-set-as-attr-name.err.exp
@@ -1,14 +1,14 @@
 error:
        … while evaluating an attribute name
-         at /pwd/lang/eval-fail-using-set-as-attr-name.nix:5:10:
-            4| in
-            5|   attr.${key}
-             |          ^
-            6|
+         at /pwd/lang/eval-fail-using-set-as-attr-name.nix:7:8:
+            6| in
+            7| attr.${key}
+             |        ^
+            8|
 
        error: expected a string but found a set: { }
-       at /pwd/lang/eval-fail-using-set-as-attr-name.nix:5:10:
-            4| in
-            5|   attr.${key}
-             |          ^
-            6|
+       at /pwd/lang/eval-fail-using-set-as-attr-name.nix:7:8:
+            6| in
+            7| attr.${key}
+             |        ^
+            8|
diff --git a/tests/functional/repl/doc-comment-curried-args.expected b/tests/functional/repl/doc-comment-curried-args.expected
index 56607e911e8..d2a5bf32853 100644
--- a/tests/functional/repl/doc-comment-curried-args.expected
+++ b/tests/functional/repl/doc-comment-curried-args.expected
@@ -6,7 +6,8 @@ Added <number omitted> variables.
 
 nix-repl> :doc curriedArgs
 Function `curriedArgs`\
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:48:5
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:87:5
+
 
 A documented function.
 
@@ -17,7 +18,8 @@ nix-repl> "Note that users may not expect this to behave as it currently does"
 
 nix-repl> :doc x
 Function `curriedArgs`\
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:50:5
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:91:5
+
 
 The function returned by applying once
 
diff --git a/tests/functional/repl/doc-comment-formals.expected b/tests/functional/repl/doc-comment-formals.expected
index 1024919f4b9..357cf998680 100644
--- a/tests/functional/repl/doc-comment-formals.expected
+++ b/tests/functional/repl/doc-comment-formals.expected
@@ -9,6 +9,7 @@ nix-repl> "Note that this is not yet complete"
 
 nix-repl> :doc documentedFormals
 Function `documentedFormals`\
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:57:5
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:104:5
+
 
 Finds x
diff --git a/tests/functional/repl/doc-comment-function.expected b/tests/functional/repl/doc-comment-function.expected
index 3889c4f7860..030cfc3265a 100644
--- a/tests/functional/repl/doc-comment-function.expected
+++ b/tests/functional/repl/doc-comment-function.expected
@@ -2,6 +2,7 @@ Nix <nix version>
 Type :? for help.
 
 nix-repl> :doc import ./doc-comment-function.nix
-Function defined at /path/to/tests/functional/repl/doc-comment-function.nix:2:1
+Function defined at /path/to/tests/functional/repl/doc-comment-function.nix:4:1
 
+ 
 A doc comment for a file that only contains a function
diff --git a/tests/functional/repl/doc-compact.expected b/tests/functional/repl/doc-compact.expected
index 79f1fd44f59..276de2e60b5 100644
--- a/tests/functional/repl/doc-compact.expected
+++ b/tests/functional/repl/doc-compact.expected
@@ -6,6 +6,7 @@ Added <number omitted> variables.
 
 nix-repl> :doc compact
 Function `compact`\
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:18:20
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:27:5
+
 
 boom
diff --git a/tests/functional/repl/doc-constant.expected b/tests/functional/repl/doc-constant.expected
index 5787e04dc19..a68188b25ab 100644
--- a/tests/functional/repl/doc-constant.expected
+++ b/tests/functional/repl/doc-constant.expected
@@ -10,25 +10,27 @@ error: value does not have documentation
 nix-repl> :doc lib.version
 Attribute `version`
 
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:30:3
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:47:3
+
 
 Immovably fixed.
 
 nix-repl> :doc lib.attr.empty
 Attribute `empty`
 
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:33:3
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:52:3
+
 
 Unchangeably constant.
 
 nix-repl> :doc lib.attr.undocument
 error:
        … while evaluating the attribute 'attr.undocument'
-         at /path/to/tests/functional/repl/doc-comments.nix:33:3:
-           32|   /** Unchangeably constant. */
-           33|   lib.attr.empty = { };
+         at /path/to/tests/functional/repl/doc-comments.nix:52:3:
+           51|   */
+           52|   lib.attr.empty = { };
              |   ^
-           34|
+           53|
 
        error: attribute 'undocument' missing
        at «string»:1:1:
@@ -39,28 +41,31 @@ error:
 nix-repl> :doc (import ./doc-comments.nix).constant
 Attribute `constant`
 
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:27:3
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:42:3
+
 
 Firmly rigid.
 
 nix-repl> :doc (import ./doc-comments.nix).lib.version
 Attribute `version`
 
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:30:3
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:47:3
+
 
 Immovably fixed.
 
 nix-repl> :doc (import ./doc-comments.nix).lib.attr.empty
 Attribute `empty`
 
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:33:3
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:52:3
+
 
 Unchangeably constant.
 
 nix-repl> :doc (import ./doc-comments.nix).lib.attr.undocumented
 Attribute `undocumented`
 
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:35:3
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:54:3
 
 No documentation found.
 
@@ -97,11 +102,11 @@ error: attribute 'missing' missing
 nix-repl> :doc lib.attr.undocumental
 error:
        … while evaluating the attribute 'attr.undocumental'
-         at /path/to/tests/functional/repl/doc-comments.nix:33:3:
-           32|   /** Unchangeably constant. */
-           33|   lib.attr.empty = { };
+         at /path/to/tests/functional/repl/doc-comments.nix:52:3:
+           51|   */
+           52|   lib.attr.empty = { };
              |   ^
-           34|
+           53|
 
        error: attribute 'undocumental' missing
        at «string»:1:1:
diff --git a/tests/functional/repl/doc-floatedIn.expected b/tests/functional/repl/doc-floatedIn.expected
index 82bb80b9501..3bf1c40715b 100644
--- a/tests/functional/repl/doc-floatedIn.expected
+++ b/tests/functional/repl/doc-floatedIn.expected
@@ -6,6 +6,7 @@ Added <number omitted> variables.
 
 nix-repl> :doc floatedIn
 Function `floatedIn`\
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:16:5
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:21:5
+
 
 This also works.
diff --git a/tests/functional/repl/doc-functor.expected b/tests/functional/repl/doc-functor.expected
index 8cb2706ef0f..503fb807368 100644
--- a/tests/functional/repl/doc-functor.expected
+++ b/tests/functional/repl/doc-functor.expected
@@ -20,7 +20,7 @@ Look, it's just like a function!
 
 nix-repl> :doc recursive
 Function `__functor`\
-  … defined at /path/to/tests/functional/repl/doc-functor.nix:77:23
+  … defined at /path/to/tests/functional/repl/doc-functor.nix:82:23
 
 
 This looks bad, but the docs are ok because of the eta expansion.
@@ -30,27 +30,27 @@ error:
        … while partially calling '__functor' to retrieve documentation
 
        … while calling '__functor'
-         at /path/to/tests/functional/repl/doc-functor.nix:85:17:
-           84|      */
-           85|     __functor = self: self.__functor self;
+         at /path/to/tests/functional/repl/doc-functor.nix:90:17:
+           89|     */
+           90|     __functor = self: self.__functor self;
              |                 ^
-           86|   };
+           91|   };
 
        … from call site
-         at /path/to/tests/functional/repl/doc-functor.nix:85:23:
-           84|      */
-           85|     __functor = self: self.__functor self;
+         at /path/to/tests/functional/repl/doc-functor.nix:90:23:
+           89|     */
+           90|     __functor = self: self.__functor self;
              |                       ^
-           86|   };
+           91|   };
 
        (19999 duplicate frames omitted)
 
        error: stack overflow; max-call-depth exceeded
-       at /path/to/tests/functional/repl/doc-functor.nix:85:23:
-           84|      */
-           85|     __functor = self: self.__functor self;
+       at /path/to/tests/functional/repl/doc-functor.nix:90:23:
+           89|     */
+           90|     __functor = self: self.__functor self;
              |                       ^
-           86|   };
+           91|   };
 
 nix-repl> :doc diverging
 error:
@@ -59,18 +59,18 @@ error:
        (10000 duplicate frames omitted)
 
        … while calling '__functor'
-         at /path/to/tests/functional/repl/doc-functor.nix:97:19:
-           96|     f = x: {
-           97|       __functor = self: (f (x + 1));
-             |                   ^
-           98|     };
+         at /path/to/tests/functional/repl/doc-functor.nix:103:21:
+          102|       f = x: {
+          103|         __functor = self: (f (x + 1));
+             |                     ^
+          104|       };
 
        error: stack overflow; max-call-depth exceeded
-       at /path/to/tests/functional/repl/doc-functor.nix:97:26:
-           96|     f = x: {
-           97|       __functor = self: (f (x + 1));
-             |                          ^
-           98|     };
+       at /path/to/tests/functional/repl/doc-functor.nix:103:28:
+          102|       f = x: {
+          103|         __functor = self: (f (x + 1));
+             |                            ^
+          104|       };
 
 nix-repl> :doc helper
 Function `square`\
@@ -81,21 +81,21 @@ Compute x^2
 
 nix-repl> :doc helper2
 Function `__functor`\
-  … defined at /path/to/tests/functional/repl/doc-functor.nix:45:23
+  … defined at /path/to/tests/functional/repl/doc-functor.nix:46:13
 
 
 This is a function that can be overridden.
 
 nix-repl> :doc lib.helper3
 Function `__functor`\
-  … defined at /path/to/tests/functional/repl/doc-functor.nix:45:23
+  … defined at /path/to/tests/functional/repl/doc-functor.nix:46:13
 
 
 This is a function that can be overridden.
 
 nix-repl> :doc helper3
 Function `__functor`\
-  … defined at /path/to/tests/functional/repl/doc-functor.nix:45:23
+  … defined at /path/to/tests/functional/repl/doc-functor.nix:46:13
 
 
 This is a function that can be overridden.
diff --git a/tests/functional/repl/doc-lambda-flavors.expected b/tests/functional/repl/doc-lambda-flavors.expected
index ab5c956390f..437c09d2b31 100644
--- a/tests/functional/repl/doc-lambda-flavors.expected
+++ b/tests/functional/repl/doc-lambda-flavors.expected
@@ -6,24 +6,28 @@ Added <number omitted> variables.
 
 nix-repl> :doc nonStrict
 Function `nonStrict`\
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:37:70
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:60:5
+
 
 My syntax is not strict, but I'm strict anyway.
 
 nix-repl> :doc strict
 Function `strict`\
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:38:63
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:65:5
+
 
 I don't have to be strict, but I am anyway.
 
 nix-repl> :doc strictPre
 Function `strictPre`\
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:40:48
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:71:5
+
 
 Here's one way to do this
 
 nix-repl> :doc strictPost
 Function `strictPost`\
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:41:53
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:76:5
+
 
 Here's another way to do this
diff --git a/tests/functional/repl/doc-measurement.expected b/tests/functional/repl/doc-measurement.expected
index 555cac9a2a0..862697613be 100644
--- a/tests/functional/repl/doc-measurement.expected
+++ b/tests/functional/repl/doc-measurement.expected
@@ -6,6 +6,7 @@ Added <number omitted> variables.
 
 nix-repl> :doc measurement
 Function `measurement`\
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:13:17
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:15:17
+
 
 👈 precisely this wide 👉
diff --git a/tests/functional/repl/doc-unambiguous.expected b/tests/functional/repl/doc-unambiguous.expected
index 0db5505d781..32ca9aef22a 100644
--- a/tests/functional/repl/doc-unambiguous.expected
+++ b/tests/functional/repl/doc-unambiguous.expected
@@ -6,6 +6,7 @@ Added <number omitted> variables.
 
 nix-repl> :doc unambiguous
 Function `unambiguous`\
-  … defined at /path/to/tests/functional/repl/doc-comments.nix:24:5
+  … defined at /path/to/tests/functional/repl/doc-comments.nix:37:5
+
 
 Very close