diff --git a/data/fixtures/scopes/csharp/class.iteration.block.scope b/data/fixtures/scopes/csharp/class.iteration.block.scope
index b2423a8bd5..8a0caa305b 100644
--- a/data/fixtures/scopes/csharp/class.iteration.block.scope
+++ b/data/fixtures/scopes/csharp/class.iteration.block.scope
@@ -1,5 +1,5 @@
 public class Foo {
-  public class Bar { }
+    public class Bar { }
 }
 ---
 
@@ -7,7 +7,7 @@ public class Foo {
 [#1 Domain] = 0:0-2:1
   >------------------
 0| public class Foo {
-1|   public class Bar { }
+1|     public class Bar { }
 2| }
    -<
 
@@ -16,12 +16,12 @@ public class Foo {
 [#2 Domain] = 0:18-2:0
                     >
 0| public class Foo {
-1|   public class Bar { }
+1|     public class Bar { }
 2| }
    <
 
 
 [#3 Content] =
-[#3 Domain] = 1:20-1:21
-                      >-<
-1|   public class Bar { }
+[#3 Domain] = 1:22-1:23
+                        >-<
+1|     public class Bar { }
diff --git a/data/fixtures/scopes/css/argument/argument.actual.iteration.scope b/data/fixtures/scopes/css/argument/argument.actual.iteration.scope
index d487e07915..8ff4530b27 100644
--- a/data/fixtures/scopes/css/argument/argument.actual.iteration.scope
+++ b/data/fixtures/scopes/css/argument/argument.actual.iteration.scope
@@ -1,12 +1,12 @@
 * {
-  width: calc(100% - 50px);
+    width: calc(100% - 50px);
 }
 ---
 
-[Content] = 1:14-1:25
-                >-----------<
-1|   width: calc(100% - 50px);
+[Content] = 1:16-1:27
+                  >-----------<
+1|     width: calc(100% - 50px);
 
-[Domain] = 1:9-1:26
-           >-----------------<
-1|   width: calc(100% - 50px);
+[Domain] = 1:11-1:28
+             >-----------------<
+1|     width: calc(100% - 50px);
diff --git a/data/fixtures/scopes/css/argument/argument.actual.iteration2.scope b/data/fixtures/scopes/css/argument/argument.actual.iteration2.scope
index d79ea8fff3..7feeb605db 100644
--- a/data/fixtures/scopes/css/argument/argument.actual.iteration2.scope
+++ b/data/fixtures/scopes/css/argument/argument.actual.iteration2.scope
@@ -1,12 +1,12 @@
 * {
-  background: repeating-linear-gradient(red, orange 50px);
+    background: repeating-linear-gradient(red, orange 50px);
 }
 ---
 
-[Content] = 1:40-1:56
-                                          >----------------<
-1|   background: repeating-linear-gradient(red, orange 50px);
+[Content] = 1:42-1:58
+                                            >----------------<
+1|     background: repeating-linear-gradient(red, orange 50px);
 
-[Domain] = 1:14-1:57
-                >-------------------------------------------<
-1|   background: repeating-linear-gradient(red, orange 50px);
+[Domain] = 1:16-1:59
+                  >-------------------------------------------<
+1|     background: repeating-linear-gradient(red, orange 50px);
diff --git a/data/fixtures/scopes/css/argument/argument.actual.singleLine.scope b/data/fixtures/scopes/css/argument/argument.actual.singleLine.scope
index ae18b1f067..4ff8c5af11 100644
--- a/data/fixtures/scopes/css/argument/argument.actual.singleLine.scope
+++ b/data/fixtures/scopes/css/argument/argument.actual.singleLine.scope
@@ -1,12 +1,12 @@
 * {
-  width: calc(100% - 50px);
+    width: calc(100% - 50px);
 }
 ---
 
 [Content] =
 [Removal] =
-[Domain] = 1:14-1:25
-                >-----------<
-1|   width: calc(100% - 50px);
+[Domain] = 1:16-1:27
+                  >-----------<
+1|     width: calc(100% - 50px);
 
 [Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/css/argument/argument.actual.singleLine2.scope b/data/fixtures/scopes/css/argument/argument.actual.singleLine2.scope
index 8d7aa001cd..27daf3b3be 100644
--- a/data/fixtures/scopes/css/argument/argument.actual.singleLine2.scope
+++ b/data/fixtures/scopes/css/argument/argument.actual.singleLine2.scope
@@ -1,35 +1,35 @@
 * {
-  background: repeating-linear-gradient(red, orange 50px);
+    background: repeating-linear-gradient(red, orange 50px);
 }
 ---
 
 [#1 Content] =
-[#1 Domain] = 1:40-1:43
-                                          >---<
-1|   background: repeating-linear-gradient(red, orange 50px);
+[#1 Domain] = 1:42-1:45
+                                            >---<
+1|     background: repeating-linear-gradient(red, orange 50px);
 
-[#1 Removal] = 1:40-1:45
-                                          >-----<
-1|   background: repeating-linear-gradient(red, orange 50px);
+[#1 Removal] = 1:42-1:47
+                                            >-----<
+1|     background: repeating-linear-gradient(red, orange 50px);
 
-[#1 Trailing delimiter] = 1:43-1:45
-                                             >--<
-1|   background: repeating-linear-gradient(red, orange 50px);
+[#1 Trailing delimiter] = 1:45-1:47
+                                               >--<
+1|     background: repeating-linear-gradient(red, orange 50px);
 
 [#1 Insertion delimiter] = ", "
 
 
 [#2 Content] =
-[#2 Domain] = 1:45-1:56
-                                               >-----------<
-1|   background: repeating-linear-gradient(red, orange 50px);
+[#2 Domain] = 1:47-1:58
+                                                 >-----------<
+1|     background: repeating-linear-gradient(red, orange 50px);
 
-[#2 Removal] = 1:43-1:56
-                                             >-------------<
-1|   background: repeating-linear-gradient(red, orange 50px);
+[#2 Removal] = 1:45-1:58
+                                               >-------------<
+1|     background: repeating-linear-gradient(red, orange 50px);
 
-[#2 Leading delimiter] = 1:43-1:45
-                                             >--<
-1|   background: repeating-linear-gradient(red, orange 50px);
+[#2 Leading delimiter] = 1:45-1:47
+                                               >--<
+1|     background: repeating-linear-gradient(red, orange 50px);
 
 [#2 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/css/argument/argument.actual.singleLine3.scope b/data/fixtures/scopes/css/argument/argument.actual.singleLine3.scope
index 5884622652..b02c12bba6 100644
--- a/data/fixtures/scopes/css/argument/argument.actual.singleLine3.scope
+++ b/data/fixtures/scopes/css/argument/argument.actual.singleLine3.scope
@@ -1,35 +1,35 @@
 * {
-  clip-path: ellipse(115px 55px at 50% 40%);
+    clip-path: ellipse(115px 55px at 50% 40%);
 }
 ---
 
 [#1 Content] =
-[#1 Domain] = 1:21-1:31
-                       >----------<
-1|   clip-path: ellipse(115px 55px at 50% 40%);
+[#1 Domain] = 1:23-1:33
+                         >----------<
+1|     clip-path: ellipse(115px 55px at 50% 40%);
 
-[#1 Removal] = 1:21-1:35
-                       >--------------<
-1|   clip-path: ellipse(115px 55px at 50% 40%);
+[#1 Removal] = 1:23-1:37
+                         >--------------<
+1|     clip-path: ellipse(115px 55px at 50% 40%);
 
-[#1 Trailing delimiter] = 1:31-1:35
-                                 >----<
-1|   clip-path: ellipse(115px 55px at 50% 40%);
+[#1 Trailing delimiter] = 1:33-1:37
+                                   >----<
+1|     clip-path: ellipse(115px 55px at 50% 40%);
 
 [#1 Insertion delimiter] = ", "
 
 
 [#2 Content] =
-[#2 Domain] = 1:35-1:42
-                                     >-------<
-1|   clip-path: ellipse(115px 55px at 50% 40%);
+[#2 Domain] = 1:37-1:44
+                                       >-------<
+1|     clip-path: ellipse(115px 55px at 50% 40%);
 
-[#2 Removal] = 1:31-1:42
-                                 >-----------<
-1|   clip-path: ellipse(115px 55px at 50% 40%);
+[#2 Removal] = 1:33-1:44
+                                   >-----------<
+1|     clip-path: ellipse(115px 55px at 50% 40%);
 
-[#2 Leading delimiter] = 1:31-1:35
-                                 >----<
-1|   clip-path: ellipse(115px 55px at 50% 40%);
+[#2 Leading delimiter] = 1:33-1:37
+                                   >----<
+1|     clip-path: ellipse(115px 55px at 50% 40%);
 
 [#2 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/css/argument/argument.actual.singleLine4.scope b/data/fixtures/scopes/css/argument/argument.actual.singleLine4.scope
index 9ad6d81348..b57a92617a 100644
--- a/data/fixtures/scopes/css/argument/argument.actual.singleLine4.scope
+++ b/data/fixtures/scopes/css/argument/argument.actual.singleLine4.scope
@@ -1,55 +1,55 @@
 * {
-  clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
+    clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
 }
 ---
 
 [#1 Content] =
-[#1 Domain] = 1:21-1:27
-                       >------<
-1|   clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
+[#1 Domain] = 1:23-1:29
+                         >------<
+1|     clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
 
-[#1 Removal] = 1:21-1:29
-                       >--------<
-1|   clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
+[#1 Removal] = 1:23-1:31
+                         >--------<
+1|     clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
 
-[#1 Trailing delimiter] = 1:27-1:29
-                             >--<
-1|   clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
+[#1 Trailing delimiter] = 1:29-1:31
+                               >--<
+1|     clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
 
 [#1 Insertion delimiter] = ", "
 
 
 [#2 Content] =
-[#2 Domain] = 1:29-1:36
-                               >-------<
-1|   clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
+[#2 Domain] = 1:31-1:38
+                                 >-------<
+1|     clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
 
-[#2 Removal] = 1:29-1:38
-                               >---------<
-1|   clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
+[#2 Removal] = 1:31-1:40
+                                 >---------<
+1|     clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
 
-[#2 Leading delimiter] = 1:27-1:29
-                             >--<
-1|   clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
+[#2 Leading delimiter] = 1:29-1:31
+                               >--<
+1|     clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
 
-[#2 Trailing delimiter] = 1:36-1:38
-                                      >--<
-1|   clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
+[#2 Trailing delimiter] = 1:38-1:40
+                                        >--<
+1|     clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
 
 [#2 Insertion delimiter] = ", "
 
 
 [#3 Content] =
-[#3 Domain] = 1:38-1:46
-                                        >--------<
-1|   clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
+[#3 Domain] = 1:40-1:48
+                                          >--------<
+1|     clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
 
-[#3 Removal] = 1:36-1:46
-                                      >----------<
-1|   clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
+[#3 Removal] = 1:38-1:48
+                                        >----------<
+1|     clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
 
-[#3 Leading delimiter] = 1:36-1:38
-                                      >--<
-1|   clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
+[#3 Leading delimiter] = 1:38-1:40
+                                        >--<
+1|     clip-path: polygon(50% 0%, 60% 40%, 100% 50%);
 
 [#3 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/css/argumentList.actual.empty.scope b/data/fixtures/scopes/css/argumentList.actual.empty.scope
index fefbd1fdfd..0f04f37919 100644
--- a/data/fixtures/scopes/css/argumentList.actual.empty.scope
+++ b/data/fixtures/scopes/css/argumentList.actual.empty.scope
@@ -1,15 +1,15 @@
 * {
-  width: calc();
+    width: calc();
 }
 ---
 
 [Content] =
-[Removal] = 1:14-1:14
-                ><
-1|   width: calc();
+[Removal] = 1:16-1:16
+                  ><
+1|     width: calc();
 
-[Domain] = 1:9-1:15
-           >------<
-1|   width: calc();
+[Domain] = 1:11-1:17
+             >------<
+1|     width: calc();
 
 [Insertion delimiter] = ""
diff --git a/data/fixtures/scopes/css/argumentList.actual.multiLine.scope b/data/fixtures/scopes/css/argumentList.actual.multiLine.scope
index 0eaa8e21df..9af333b4df 100644
--- a/data/fixtures/scopes/css/argumentList.actual.multiLine.scope
+++ b/data/fixtures/scopes/css/argumentList.actual.multiLine.scope
@@ -1,35 +1,35 @@
 * {
-  clip-path: polygon(
-    50% 0%,
-    60% 40%
-  );
+    clip-path: polygon(
+        50% 0%,
+        60% 40%
+    );
 }
 ---
 
-[Content] = 2:4-3:11
-      >-------
-2|     50% 0%,
-3|     60% 40%
-   -----------<
+[Content] = 2:8-3:15
+          >-------
+2|         50% 0%,
+3|         60% 40%
+   ---------------<
 
-[Removal] = 1:21-4:2
-                       >
-1|   clip-path: polygon(
-2|     50% 0%,
-3|     60% 40%
-4|   );
-   --<
+[Removal] = 1:23-4:4
+                         >
+1|     clip-path: polygon(
+2|         50% 0%,
+3|         60% 40%
+4|     );
+   ----<
 
-[Leading delimiter] = 2:0-2:4
-  >----<
-2|     50% 0%,
+[Leading delimiter] = 2:0-2:8
+  >--------<
+2|         50% 0%,
 
-[Domain] = 1:13-4:3
-               >--------
-1|   clip-path: polygon(
-2|     50% 0%,
-3|     60% 40%
-4|   );
-   ---<
+[Domain] = 1:15-4:5
+                 >--------
+1|     clip-path: polygon(
+2|         50% 0%,
+3|         60% 40%
+4|     );
+   -----<
 
 [Insertion delimiter] = ",\n"
diff --git a/data/fixtures/scopes/css/argumentList.actual.singleLine.scope b/data/fixtures/scopes/css/argumentList.actual.singleLine.scope
index 0d64ba94cc..0c8dc8e10e 100644
--- a/data/fixtures/scopes/css/argumentList.actual.singleLine.scope
+++ b/data/fixtures/scopes/css/argumentList.actual.singleLine.scope
@@ -1,15 +1,15 @@
 * {
-  width: calc(100% - 50px);
+    width: calc(100% - 50px);
 }
 ---
 
 [Content] =
-[Removal] = 1:14-1:25
-                >-----------<
-1|   width: calc(100% - 50px);
+[Removal] = 1:16-1:27
+                  >-----------<
+1|     width: calc(100% - 50px);
 
-[Domain] = 1:9-1:26
-           >-----------------<
-1|   width: calc(100% - 50px);
+[Domain] = 1:11-1:28
+             >-----------------<
+1|     width: calc(100% - 50px);
 
 [Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.iteration.scope
index 213ddf703a..5f49b00a22 100644
--- a/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.iteration.scope
+++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.iteration.scope
@@ -1,12 +1,12 @@
 class Foo {
-  constructor(aaa, bbb) {}
+    constructor(aaa, bbb) {}
 }
 ---
 
-[Content] = 1:14-1:22
-                >--------<
-1|   constructor(aaa, bbb) {}
+[Content] = 1:16-1:24
+                  >--------<
+1|     constructor(aaa, bbb) {}
 
-[Domain] = 1:2-1:26
-    >------------------------<
-1|   constructor(aaa, bbb) {}
+[Domain] = 1:4-1:28
+      >------------------------<
+1|     constructor(aaa, bbb) {}
diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.multiLine.scope
index 216da7a765..a9a31290fd 100644
--- a/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.multiLine.scope
+++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.multiLine.scope
@@ -1,46 +1,46 @@
 class Foo {
-  constructor(
-    aaa,
-    bbb
-  ) {}
+    constructor(
+        aaa,
+        bbb
+    ) {}
 }
 ---
 
 [#1 Content] =
-[#1 Domain] = 2:4-2:7
-      >---<
-2|     aaa,
-
-[#1 Removal] = 2:4-3:4
-      >----
-2|     aaa,
-3|     bbb
-   ----<
-
-[#1 Trailing delimiter] = 2:7-3:4
-         >-
-2|     aaa,
-3|     bbb
-   ----<
+[#1 Domain] = 2:8-2:11
+          >---<
+2|         aaa,
+
+[#1 Removal] = 2:8-3:8
+          >----
+2|         aaa,
+3|         bbb
+   --------<
+
+[#1 Trailing delimiter] = 2:11-3:8
+             >-
+2|         aaa,
+3|         bbb
+   --------<
 
 [#1 Insertion delimiter] = ",\n"
 
 
 [#2 Content] =
-[#2 Domain] = 3:4-3:7
-      >---<
-3|     bbb
-
-[#2 Removal] = 2:7-3:7
-         >-
-2|     aaa,
-3|     bbb
-   -------<
-
-[#2 Leading delimiter] = 2:7-3:4
-         >-
-2|     aaa,
-3|     bbb
-   ----<
+[#2 Domain] = 3:8-3:11
+          >---<
+3|         bbb
+
+[#2 Removal] = 2:11-3:11
+             >-
+2|         aaa,
+3|         bbb
+   -----------<
+
+[#2 Leading delimiter] = 2:11-3:8
+             >-
+2|         aaa,
+3|         bbb
+   --------<
 
 [#2 Insertion delimiter] = ",\n"
diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.singleLine.scope
index 369b0ece61..e4d13b59cf 100644
--- a/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.singleLine.scope
+++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.singleLine.scope
@@ -1,35 +1,35 @@
 class Foo {
-  constructor(aaa, bbb) {}
+    constructor(aaa, bbb) {}
 }
 ---
 
 [#1 Content] =
-[#1 Domain] = 1:14-1:17
-                >---<
-1|   constructor(aaa, bbb) {}
+[#1 Domain] = 1:16-1:19
+                  >---<
+1|     constructor(aaa, bbb) {}
 
-[#1 Removal] = 1:14-1:19
-                >-----<
-1|   constructor(aaa, bbb) {}
+[#1 Removal] = 1:16-1:21
+                  >-----<
+1|     constructor(aaa, bbb) {}
 
-[#1 Trailing delimiter] = 1:17-1:19
-                   >--<
-1|   constructor(aaa, bbb) {}
+[#1 Trailing delimiter] = 1:19-1:21
+                     >--<
+1|     constructor(aaa, bbb) {}
 
 [#1 Insertion delimiter] = ", "
 
 
 [#2 Content] =
-[#2 Domain] = 1:19-1:22
-                     >---<
-1|   constructor(aaa, bbb) {}
+[#2 Domain] = 1:21-1:24
+                       >---<
+1|     constructor(aaa, bbb) {}
 
-[#2 Removal] = 1:17-1:22
-                   >-----<
-1|   constructor(aaa, bbb) {}
+[#2 Removal] = 1:19-1:24
+                     >-----<
+1|     constructor(aaa, bbb) {}
 
-[#2 Leading delimiter] = 1:17-1:19
-                   >--<
-1|   constructor(aaa, bbb) {}
+[#2 Leading delimiter] = 1:19-1:21
+                     >--<
+1|     constructor(aaa, bbb) {}
 
 [#2 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.multiLine.scope
index 9e2b7f7ab2..2866024743 100644
--- a/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.multiLine.scope
+++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.multiLine.scope
@@ -1,44 +1,44 @@
 (
-  aaa,
-  bbb
+    aaa,
+    bbb
 ) => {}
 ---
 
 [#1 Content] =
-[#1 Domain] = 1:2-1:5
-    >---<
-1|   aaa,
-
-[#1 Removal] = 1:2-2:2
-    >----
-1|   aaa,
-2|   bbb
-   --<
-
-[#1 Trailing delimiter] = 1:5-2:2
-       >-
-1|   aaa,
-2|   bbb
-   --<
+[#1 Domain] = 1:4-1:7
+      >---<
+1|     aaa,
+
+[#1 Removal] = 1:4-2:4
+      >----
+1|     aaa,
+2|     bbb
+   ----<
+
+[#1 Trailing delimiter] = 1:7-2:4
+         >-
+1|     aaa,
+2|     bbb
+   ----<
 
 [#1 Insertion delimiter] = ",\n"
 
 
 [#2 Content] =
-[#2 Domain] = 2:2-2:5
-    >---<
-2|   bbb
-
-[#2 Removal] = 1:5-2:5
-       >-
-1|   aaa,
-2|   bbb
-   -----<
-
-[#2 Leading delimiter] = 1:5-2:2
-       >-
-1|   aaa,
-2|   bbb
-   --<
+[#2 Domain] = 2:4-2:7
+      >---<
+2|     bbb
+
+[#2 Removal] = 1:7-2:7
+         >-
+1|     aaa,
+2|     bbb
+   -------<
+
+[#2 Leading delimiter] = 1:7-2:4
+         >-
+1|     aaa,
+2|     bbb
+   ----<
 
 [#2 Insertion delimiter] = ",\n"
diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.method.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.method.iteration.scope
index 41dd9b4e72..3aa2fba9bc 100644
--- a/data/fixtures/scopes/javascript.core/argument/argument.formal.method.iteration.scope
+++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.method.iteration.scope
@@ -1,12 +1,12 @@
 class Foo {
-  bar(aaa, bbb) {}
+    bar(aaa, bbb) {}
 }
 ---
 
-[Content] = 1:6-1:14
-        >--------<
-1|   bar(aaa, bbb) {}
+[Content] = 1:8-1:16
+          >--------<
+1|     bar(aaa, bbb) {}
 
-[Domain] = 1:2-1:18
-    >----------------<
-1|   bar(aaa, bbb) {}
+[Domain] = 1:4-1:20
+      >----------------<
+1|     bar(aaa, bbb) {}
diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.method.multiLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.method.multiLine.scope
index bc3e86ba74..71fb81cd10 100644
--- a/data/fixtures/scopes/javascript.core/argument/argument.formal.method.multiLine.scope
+++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.method.multiLine.scope
@@ -1,46 +1,46 @@
 class Foo {
-  bar(
-    aaa,
-    bbb
-  ) {}
+    bar(
+        aaa,
+        bbb
+    ) {}
 }
 ---
 
 [#1 Content] =
-[#1 Domain] = 2:4-2:7
-      >---<
-2|     aaa,
-
-[#1 Removal] = 2:4-3:4
-      >----
-2|     aaa,
-3|     bbb
-   ----<
-
-[#1 Trailing delimiter] = 2:7-3:4
-         >-
-2|     aaa,
-3|     bbb
-   ----<
+[#1 Domain] = 2:8-2:11
+          >---<
+2|         aaa,
+
+[#1 Removal] = 2:8-3:8
+          >----
+2|         aaa,
+3|         bbb
+   --------<
+
+[#1 Trailing delimiter] = 2:11-3:8
+             >-
+2|         aaa,
+3|         bbb
+   --------<
 
 [#1 Insertion delimiter] = ",\n"
 
 
 [#2 Content] =
-[#2 Domain] = 3:4-3:7
-      >---<
-3|     bbb
-
-[#2 Removal] = 2:7-3:7
-         >-
-2|     aaa,
-3|     bbb
-   -------<
-
-[#2 Leading delimiter] = 2:7-3:4
-         >-
-2|     aaa,
-3|     bbb
-   ----<
+[#2 Domain] = 3:8-3:11
+          >---<
+3|         bbb
+
+[#2 Removal] = 2:11-3:11
+             >-
+2|         aaa,
+3|         bbb
+   -----------<
+
+[#2 Leading delimiter] = 2:11-3:8
+             >-
+2|         aaa,
+3|         bbb
+   --------<
 
 [#2 Insertion delimiter] = ",\n"
diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.method.singleLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.method.singleLine.scope
index 31ecb7368d..be87ffe102 100644
--- a/data/fixtures/scopes/javascript.core/argument/argument.formal.method.singleLine.scope
+++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.method.singleLine.scope
@@ -1,35 +1,35 @@
 class Foo {
-  bar(aaa, bbb) {}
+    bar(aaa, bbb) {}
 }
 ---
 
 [#1 Content] =
-[#1 Domain] = 1:6-1:9
-        >---<
-1|   bar(aaa, bbb) {}
+[#1 Domain] = 1:8-1:11
+          >---<
+1|     bar(aaa, bbb) {}
 
-[#1 Removal] = 1:6-1:11
-        >-----<
-1|   bar(aaa, bbb) {}
+[#1 Removal] = 1:8-1:13
+          >-----<
+1|     bar(aaa, bbb) {}
 
-[#1 Trailing delimiter] = 1:9-1:11
-           >--<
-1|   bar(aaa, bbb) {}
+[#1 Trailing delimiter] = 1:11-1:13
+             >--<
+1|     bar(aaa, bbb) {}
 
 [#1 Insertion delimiter] = ", "
 
 
 [#2 Content] =
-[#2 Domain] = 1:11-1:14
-             >---<
-1|   bar(aaa, bbb) {}
+[#2 Domain] = 1:13-1:16
+               >---<
+1|     bar(aaa, bbb) {}
 
-[#2 Removal] = 1:9-1:14
-           >-----<
-1|   bar(aaa, bbb) {}
+[#2 Removal] = 1:11-1:16
+             >-----<
+1|     bar(aaa, bbb) {}
 
-[#2 Leading delimiter] = 1:9-1:11
-           >--<
-1|   bar(aaa, bbb) {}
+[#2 Leading delimiter] = 1:11-1:13
+             >--<
+1|     bar(aaa, bbb) {}
 
 [#2 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.empty.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.empty.scope
index 164f0d7eed..fa24754891 100644
--- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.empty.scope
+++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.empty.scope
@@ -1,15 +1,15 @@
 class Foo {
-  constructor() {}
+    constructor() {}
 }
 ---
 
 [Content] =
-[Removal] = 1:14-1:14
-                ><
-1|   constructor() {}
+[Removal] = 1:16-1:16
+                  ><
+1|     constructor() {}
 
-[Domain] = 1:2-1:18
-    >----------------<
-1|   constructor() {}
+[Domain] = 1:4-1:20
+      >----------------<
+1|     constructor() {}
 
 [Insertion delimiter] = ""
diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.multiLine.scope
index e37779bfa0..e37874109b 100644
--- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.multiLine.scope
+++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.multiLine.scope
@@ -1,35 +1,35 @@
 class Foo {
-  constructor(
-    aaa,
-    bbb
-  ) {}
+    constructor(
+        aaa,
+        bbb
+    ) {}
 }
 ---
 
-[Content] = 2:4-3:7
-      >----
-2|     aaa,
-3|     bbb
-   -------<
+[Content] = 2:8-3:11
+          >----
+2|         aaa,
+3|         bbb
+   -----------<
 
-[Removal] = 1:14-4:2
-                >
-1|   constructor(
-2|     aaa,
-3|     bbb
-4|   ) {}
-   --<
+[Removal] = 1:16-4:4
+                  >
+1|     constructor(
+2|         aaa,
+3|         bbb
+4|     ) {}
+   ----<
 
-[Leading delimiter] = 2:0-2:4
-  >----<
-2|     aaa,
+[Leading delimiter] = 2:0-2:8
+  >--------<
+2|         aaa,
 
-[Domain] = 1:2-4:6
-    >------------
-1|   constructor(
-2|     aaa,
-3|     bbb
-4|   ) {}
-   ------<
+[Domain] = 1:4-4:8
+      >------------
+1|     constructor(
+2|         aaa,
+3|         bbb
+4|     ) {}
+   --------<
 
 [Insertion delimiter] = ",\n"
diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.singleLine.scope
index 6a13020cf4..60e8b0e9b5 100644
--- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.singleLine.scope
+++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.singleLine.scope
@@ -1,15 +1,15 @@
 class Foo {
-  constructor(aaa, bbb) {}
+    constructor(aaa, bbb) {}
 }
 ---
 
 [Content] =
-[Removal] = 1:14-1:22
-                >--------<
-1|   constructor(aaa, bbb) {}
+[Removal] = 1:16-1:24
+                  >--------<
+1|     constructor(aaa, bbb) {}
 
-[Domain] = 1:2-1:26
-    >------------------------<
-1|   constructor(aaa, bbb) {}
+[Domain] = 1:4-1:28
+      >------------------------<
+1|     constructor(aaa, bbb) {}
 
 [Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine.scope
index dabd9b5f90..47cb2384bc 100644
--- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine.scope
+++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine.scope
@@ -1,32 +1,32 @@
 (
-  aaa,
-  bbb
+    aaa,
+    bbb
 ) => {}
 ---
 
-[Content] = 1:2-2:5
-    >----
-1|   aaa,
-2|   bbb
-   -----<
+[Content] = 1:4-2:7
+      >----
+1|     aaa,
+2|     bbb
+   -------<
 
 [Removal] = 0:1-3:0
    >
 0| (
-1|   aaa,
-2|   bbb
+1|     aaa,
+2|     bbb
 3| ) => {}
    <
 
-[Leading delimiter] = 1:0-1:2
-  >--<
-1|   aaa,
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa,
 
 [Domain] = 0:0-3:7
   >-
 0| (
-1|   aaa,
-2|   bbb
+1|     aaa,
+2|     bbb
 3| ) => {}
    -------<
 
diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine2.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine2.scope
index c0d07701af..9b1cccb681 100644
--- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine2.scope
+++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine2.scope
@@ -1,32 +1,32 @@
 function (
-  aaa,
-  bbb
+    aaa,
+    bbb
 ) {}
 ---
 
-[Content] = 1:2-2:5
-    >----
-1|   aaa,
-2|   bbb
-   -----<
+[Content] = 1:4-2:7
+      >----
+1|     aaa,
+2|     bbb
+   -------<
 
 [Removal] = 0:10-3:0
             >
 0| function (
-1|   aaa,
-2|   bbb
+1|     aaa,
+2|     bbb
 3| ) {}
    <
 
-[Leading delimiter] = 1:0-1:2
-  >--<
-1|   aaa,
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa,
 
 [Domain] = 0:0-3:4
   >----------
 0| function (
-1|   aaa,
-2|   bbb
+1|     aaa,
+2|     bbb
 3| ) {}
    ----<
 
diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.empty.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.empty.scope
index ee5ee44c3b..410f096cf5 100644
--- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.empty.scope
+++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.empty.scope
@@ -1,15 +1,15 @@
 class Foo {
-  bar() {}
+    bar() {}
 }
 ---
 
 [Content] =
-[Removal] = 1:6-1:6
-        ><
-1|   bar() {}
+[Removal] = 1:8-1:8
+          ><
+1|     bar() {}
 
-[Domain] = 1:2-1:10
-    >--------<
-1|   bar() {}
+[Domain] = 1:4-1:12
+      >--------<
+1|     bar() {}
 
 [Insertion delimiter] = ""
diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.multiLine.scope
index 692d941ebf..745a353518 100644
--- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.multiLine.scope
+++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.multiLine.scope
@@ -1,35 +1,35 @@
 class Foo {
-  bar(
-    aaa,
-    bbb
-  ) {}
+    bar(
+        aaa,
+        bbb
+    ) {}
 }
 ---
 
-[Content] = 2:4-3:7
-      >----
-2|     aaa,
-3|     bbb
-   -------<
+[Content] = 2:8-3:11
+          >----
+2|         aaa,
+3|         bbb
+   -----------<
 
-[Removal] = 1:6-4:2
-        >
-1|   bar(
-2|     aaa,
-3|     bbb
-4|   ) {}
-   --<
+[Removal] = 1:8-4:4
+          >
+1|     bar(
+2|         aaa,
+3|         bbb
+4|     ) {}
+   ----<
 
-[Leading delimiter] = 2:0-2:4
-  >----<
-2|     aaa,
+[Leading delimiter] = 2:0-2:8
+  >--------<
+2|         aaa,
 
-[Domain] = 1:2-4:6
-    >----
-1|   bar(
-2|     aaa,
-3|     bbb
-4|   ) {}
-   ------<
+[Domain] = 1:4-4:8
+      >----
+1|     bar(
+2|         aaa,
+3|         bbb
+4|     ) {}
+   --------<
 
 [Insertion delimiter] = ",\n"
diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.singleLine.scope
index 8a3cb1b547..2dac8c10d4 100644
--- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.singleLine.scope
+++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.singleLine.scope
@@ -1,15 +1,15 @@
 class Foo {
-  bar(aaa, bbb) {}
+    bar(aaa, bbb) {}
 }
 ---
 
 [Content] =
-[Removal] = 1:6-1:14
-        >--------<
-1|   bar(aaa, bbb) {}
+[Removal] = 1:8-1:16
+          >--------<
+1|     bar(aaa, bbb) {}
 
-[Domain] = 1:2-1:18
-    >----------------<
-1|   bar(aaa, bbb) {}
+[Domain] = 1:4-1:20
+      >----------------<
+1|     bar(aaa, bbb) {}
 
 [Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/javascript.core/branch/branch.switchCase.scope b/data/fixtures/scopes/javascript.core/branch/branch.switchCase.scope
index fa1f127230..c67cd2b4cc 100644
--- a/data/fixtures/scopes/javascript.core/branch/branch.switchCase.scope
+++ b/data/fixtures/scopes/javascript.core/branch/branch.switchCase.scope
@@ -1,44 +1,44 @@
 switch (foo) {
-  case 0:
-    break;
-  default: {}
+    case 0:
+        break;
+    default: {}
 }
 ---
 
 [#1 Content] =
-[#1 Domain] = 1:2-2:10
-    >-------
-1|   case 0:
-2|     break;
-   ----------<
+[#1 Domain] = 1:4-2:14
+      >-------
+1|     case 0:
+2|         break;
+   --------------<
 
 [#1 Removal] = 1:0-3:0
-  >---------
-1|   case 0:
-2|     break;
-3|   default: {}
+  >-----------
+1|     case 0:
+2|         break;
+3|     default: {}
    <
 
-[#1 Leading delimiter] = 1:0-1:2
-  >--<
-1|   case 0:
+[#1 Leading delimiter] = 1:0-1:4
+  >----<
+1|     case 0:
 
 [#1 Insertion delimiter] = "\n"
 
 
 [#2 Content] =
-[#2 Domain] = 3:2-3:13
-    >-----------<
-3|   default: {}
+[#2 Domain] = 3:4-3:15
+      >-----------<
+3|     default: {}
 
 [#2 Removal] = 3:0-4:0
-  >-------------
-3|   default: {}
+  >---------------
+3|     default: {}
 4| }
    <
 
-[#2 Leading delimiter] = 3:0-3:2
-  >--<
-3|   default: {}
+[#2 Leading delimiter] = 3:0-3:4
+  >----<
+3|     default: {}
 
 [#2 Insertion delimiter] = "\n"
diff --git a/data/fixtures/scopes/javascript.core/condition/condition.switchCase.scope b/data/fixtures/scopes/javascript.core/condition/condition.switchCase.scope
index f300a38b47..de92f6d536 100644
--- a/data/fixtures/scopes/javascript.core/condition/condition.switchCase.scope
+++ b/data/fixtures/scopes/javascript.core/condition/condition.switchCase.scope
@@ -1,22 +1,22 @@
 switch (foo) {
-  case 0: break;
+    case 0: break;
 }
 ---
 
-[Content] = 1:7-1:8
-         >-<
-1|   case 0: break;
+[Content] = 1:9-1:10
+           >-<
+1|     case 0: break;
 
-[Removal] = 1:6-1:8
-        >--<
-1|   case 0: break;
+[Removal] = 1:8-1:10
+          >--<
+1|     case 0: break;
 
-[Leading delimiter] = 1:6-1:7
-        >-<
-1|   case 0: break;
+[Leading delimiter] = 1:8-1:9
+          >-<
+1|     case 0: break;
 
-[Domain] = 1:2-1:16
-    >--------------<
-1|   case 0: break;
+[Domain] = 1:4-1:18
+      >--------------<
+1|     case 0: break;
 
 [Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.iteration.scope
index 5480b99118..9d07da7665 100644
--- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.iteration.scope
+++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.iteration.scope
@@ -1,5 +1,5 @@
 class Foo {
-  constructor(aaa, bbb) {}
+    constructor(aaa, bbb) {}
 }
 ---
 
@@ -7,7 +7,7 @@ class Foo {
 [#1 Domain] = 0:0-2:1
   >-----------
 0| class Foo {
-1|   constructor(aaa, bbb) {}
+1|     constructor(aaa, bbb) {}
 2| }
    -<
 
@@ -16,12 +16,12 @@ class Foo {
 [#2 Domain] = 0:11-2:0
              >
 0| class Foo {
-1|   constructor(aaa, bbb) {}
+1|     constructor(aaa, bbb) {}
 2| }
    <
 
 
 [#3 Content] =
-[#3 Domain] = 1:14-1:22
-                >--------<
-1|   constructor(aaa, bbb) {}
+[#3 Domain] = 1:16-1:24
+                  >--------<
+1|     constructor(aaa, bbb) {}
diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.scope
index 4d84f24e01..bd8ace289a 100644
--- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.scope
+++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.scope
@@ -1,5 +1,5 @@
 class Foo {
-  constructor(aaa, bbb = 0) {}
+    constructor(aaa, bbb = 0) {}
 }
 ---
 
@@ -22,7 +22,7 @@ class Foo {
 [#1 Domain] = 0:0-2:1
   >-----------
 0| class Foo {
-1|   constructor(aaa, bbb = 0) {}
+1|     constructor(aaa, bbb = 0) {}
 2| }
    -<
 
@@ -30,48 +30,48 @@ class Foo {
 
 
 [#2 Content] =
-[#2 Removal] = 1:2-1:13
-    >-----------<
-1|   constructor(aaa, bbb = 0) {}
+[#2 Removal] = 1:4-1:15
+      >-----------<
+1|     constructor(aaa, bbb = 0) {}
 
-[#2 Leading delimiter] = 1:0-1:2
-  >--<
-1|   constructor(aaa, bbb = 0) {}
+[#2 Leading delimiter] = 1:0-1:4
+  >----<
+1|     constructor(aaa, bbb = 0) {}
 
-[#2 Domain] = 1:2-1:30
-    >----------------------------<
-1|   constructor(aaa, bbb = 0) {}
+[#2 Domain] = 1:4-1:32
+      >----------------------------<
+1|     constructor(aaa, bbb = 0) {}
 
 [#2 Insertion delimiter] = " "
 
 
 [#3 Content] =
 [#3 Removal] =
-[#3 Domain] = 1:14-1:17
-                >---<
-1|   constructor(aaa, bbb = 0) {}
+[#3 Domain] = 1:16-1:19
+                  >---<
+1|     constructor(aaa, bbb = 0) {}
 
 [#3 Insertion delimiter] = " "
 
 
-[#4 Content] = 1:19-1:22
-                     >---<
-1|   constructor(aaa, bbb = 0) {}
+[#4 Content] = 1:21-1:24
+                       >---<
+1|     constructor(aaa, bbb = 0) {}
 
-[#4 Removal] = 1:19-1:23
-                     >----<
-1|   constructor(aaa, bbb = 0) {}
+[#4 Removal] = 1:21-1:25
+                       >----<
+1|     constructor(aaa, bbb = 0) {}
 
-[#4 Leading delimiter] = 1:18-1:19
-                    >-<
-1|   constructor(aaa, bbb = 0) {}
+[#4 Leading delimiter] = 1:20-1:21
+                      >-<
+1|     constructor(aaa, bbb = 0) {}
 
-[#4 Trailing delimiter] = 1:22-1:23
-                        >-<
-1|   constructor(aaa, bbb = 0) {}
+[#4 Trailing delimiter] = 1:24-1:25
+                          >-<
+1|     constructor(aaa, bbb = 0) {}
 
-[#4 Domain] = 1:19-1:26
-                     >-------<
-1|   constructor(aaa, bbb = 0) {}
+[#4 Domain] = 1:21-1:28
+                       >-------<
+1|     constructor(aaa, bbb = 0) {}
 
 [#4 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.iteration.scope
index 3c84cf6102..06175ce515 100644
--- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.iteration.scope
+++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.iteration.scope
@@ -1,5 +1,5 @@
 class Foo {
-  bar(aaa, bbb) {}
+    bar(aaa, bbb) {}
 }
 ---
 
@@ -7,7 +7,7 @@ class Foo {
 [#1 Domain] = 0:0-2:1
   >-----------
 0| class Foo {
-1|   bar(aaa, bbb) {}
+1|     bar(aaa, bbb) {}
 2| }
    -<
 
@@ -16,12 +16,12 @@ class Foo {
 [#2 Domain] = 0:11-2:0
              >
 0| class Foo {
-1|   bar(aaa, bbb) {}
+1|     bar(aaa, bbb) {}
 2| }
    <
 
 
 [#3 Content] =
-[#3 Domain] = 1:6-1:14
-        >--------<
-1|   bar(aaa, bbb) {}
+[#3 Domain] = 1:8-1:16
+          >--------<
+1|     bar(aaa, bbb) {}
diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.scope
index e7fe0d0232..cfeb102e25 100644
--- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.scope
+++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.scope
@@ -1,5 +1,5 @@
 class Foo {
-  bar(aaa, bbb = 0) {}
+    bar(aaa, bbb = 0) {}
 }
 ---
 
@@ -22,7 +22,7 @@ class Foo {
 [#1 Domain] = 0:0-2:1
   >-----------
 0| class Foo {
-1|   bar(aaa, bbb = 0) {}
+1|     bar(aaa, bbb = 0) {}
 2| }
    -<
 
@@ -30,48 +30,48 @@ class Foo {
 
 
 [#2 Content] =
-[#2 Removal] = 1:2-1:5
-    >---<
-1|   bar(aaa, bbb = 0) {}
+[#2 Removal] = 1:4-1:7
+      >---<
+1|     bar(aaa, bbb = 0) {}
 
-[#2 Leading delimiter] = 1:0-1:2
-  >--<
-1|   bar(aaa, bbb = 0) {}
+[#2 Leading delimiter] = 1:0-1:4
+  >----<
+1|     bar(aaa, bbb = 0) {}
 
-[#2 Domain] = 1:2-1:22
-    >--------------------<
-1|   bar(aaa, bbb = 0) {}
+[#2 Domain] = 1:4-1:24
+      >--------------------<
+1|     bar(aaa, bbb = 0) {}
 
 [#2 Insertion delimiter] = " "
 
 
 [#3 Content] =
 [#3 Removal] =
-[#3 Domain] = 1:6-1:9
-        >---<
-1|   bar(aaa, bbb = 0) {}
+[#3 Domain] = 1:8-1:11
+          >---<
+1|     bar(aaa, bbb = 0) {}
 
 [#3 Insertion delimiter] = " "
 
 
-[#4 Content] = 1:11-1:14
-             >---<
-1|   bar(aaa, bbb = 0) {}
+[#4 Content] = 1:13-1:16
+               >---<
+1|     bar(aaa, bbb = 0) {}
 
-[#4 Removal] = 1:11-1:15
-             >----<
-1|   bar(aaa, bbb = 0) {}
+[#4 Removal] = 1:13-1:17
+               >----<
+1|     bar(aaa, bbb = 0) {}
 
-[#4 Leading delimiter] = 1:10-1:11
-            >-<
-1|   bar(aaa, bbb = 0) {}
+[#4 Leading delimiter] = 1:12-1:13
+              >-<
+1|     bar(aaa, bbb = 0) {}
 
-[#4 Trailing delimiter] = 1:14-1:15
-                >-<
-1|   bar(aaa, bbb = 0) {}
+[#4 Trailing delimiter] = 1:16-1:17
+                  >-<
+1|     bar(aaa, bbb = 0) {}
 
-[#4 Domain] = 1:11-1:18
-             >-------<
-1|   bar(aaa, bbb = 0) {}
+[#4 Domain] = 1:13-1:20
+               >-------<
+1|     bar(aaa, bbb = 0) {}
 
 [#4 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/javascript.core/name/name.constructor.scope b/data/fixtures/scopes/javascript.core/name/name.constructor.scope
index 1de0f7a6a3..0f06c0b675 100644
--- a/data/fixtures/scopes/javascript.core/name/name.constructor.scope
+++ b/data/fixtures/scopes/javascript.core/name/name.constructor.scope
@@ -1,5 +1,5 @@
 class Foo {
-  constructor() {}
+    constructor() {}
 }
 ---
 
@@ -22,7 +22,7 @@ class Foo {
 [#1 Domain] = 0:0-2:1
   >-----------
 0| class Foo {
-1|   constructor() {}
+1|     constructor() {}
 2| }
    -<
 
@@ -30,16 +30,16 @@ class Foo {
 
 
 [#2 Content] =
-[#2 Removal] = 1:2-1:13
-    >-----------<
-1|   constructor() {}
+[#2 Removal] = 1:4-1:15
+      >-----------<
+1|     constructor() {}
 
-[#2 Leading delimiter] = 1:0-1:2
-  >--<
-1|   constructor() {}
+[#2 Leading delimiter] = 1:0-1:4
+  >----<
+1|     constructor() {}
 
-[#2 Domain] = 1:2-1:18
-    >----------------<
-1|   constructor() {}
+[#2 Domain] = 1:4-1:20
+      >----------------<
+1|     constructor() {}
 
 [#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/javascript.core/name/name.field.class.scope b/data/fixtures/scopes/javascript.core/name/name.field.class.scope
index 081d51fe83..633fe566bd 100644
--- a/data/fixtures/scopes/javascript.core/name/name.field.class.scope
+++ b/data/fixtures/scopes/javascript.core/name/name.field.class.scope
@@ -1,6 +1,6 @@
 class Foo {
-  bar;
-  baz = 0;
+    bar;
+    baz = 0;
 }
 ---
 
@@ -23,47 +23,47 @@ class Foo {
 [#1 Domain] = 0:0-3:1
   >-----------
 0| class Foo {
-1|   bar;
-2|   baz = 0;
+1|     bar;
+2|     baz = 0;
 3| }
    -<
 
 [#1 Insertion delimiter] = " "
 
 
-[#2 Content] = 1:2-1:5
-    >---<
-1|   bar;
+[#2 Content] = 1:4-1:7
+      >---<
+1|     bar;
 
-[#2 Removal] = 1:0-1:5
-  >-----<
-1|   bar;
+[#2 Removal] = 1:0-1:7
+  >-------<
+1|     bar;
 
-[#2 Leading delimiter] = 1:0-1:2
-  >--<
-1|   bar;
+[#2 Leading delimiter] = 1:0-1:4
+  >----<
+1|     bar;
 
-[#2 Domain] = 1:2-1:6
-    >----<
-1|   bar;
+[#2 Domain] = 1:4-1:8
+      >----<
+1|     bar;
 
 [#2 Insertion delimiter] = " "
 
 
-[#3 Content] = 2:2-2:5
-    >---<
-2|   baz = 0;
+[#3 Content] = 2:4-2:7
+      >---<
+2|     baz = 0;
 
-[#3 Removal] = 2:2-2:8
-    >------<
-2|   baz = 0;
+[#3 Removal] = 2:4-2:10
+      >------<
+2|     baz = 0;
 
-[#3 Trailing delimiter] = 2:5-2:8
-       >---<
-2|   baz = 0;
+[#3 Trailing delimiter] = 2:7-2:10
+         >---<
+2|     baz = 0;
 
-[#3 Domain] = 2:2-2:10
-    >--------<
-2|   baz = 0;
+[#3 Domain] = 2:4-2:12
+      >--------<
+2|     baz = 0;
 
 [#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/javascript.core/name/name.field.class2.scope b/data/fixtures/scopes/javascript.core/name/name.field.class2.scope
index 3edbee9a79..f71e2ad583 100644
--- a/data/fixtures/scopes/javascript.core/name/name.field.class2.scope
+++ b/data/fixtures/scopes/javascript.core/name/name.field.class2.scope
@@ -1,6 +1,6 @@
 class Foo {
-  @baz
-  bar = 0;
+    @baz
+    bar = 0;
 }
 ---
 
@@ -23,30 +23,30 @@ class Foo {
 [#1 Domain] = 0:0-3:1
   >-----------
 0| class Foo {
-1|   @baz
-2|   bar = 0;
+1|     @baz
+2|     bar = 0;
 3| }
    -<
 
 [#1 Insertion delimiter] = " "
 
 
-[#2 Content] = 2:2-2:5
-    >---<
-2|   bar = 0;
+[#2 Content] = 2:4-2:7
+      >---<
+2|     bar = 0;
 
-[#2 Removal] = 2:2-2:8
-    >------<
-2|   bar = 0;
+[#2 Removal] = 2:4-2:10
+      >------<
+2|     bar = 0;
 
-[#2 Trailing delimiter] = 2:5-2:8
-       >---<
-2|   bar = 0;
+[#2 Trailing delimiter] = 2:7-2:10
+         >---<
+2|     bar = 0;
 
-[#2 Domain] = 1:2-2:10
-    >----
-1|   @baz
-2|   bar = 0;
-   ----------<
+[#2 Domain] = 1:4-2:12
+      >----
+1|     @baz
+2|     bar = 0;
+   ------------<
 
 [#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.constructor.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.constructor.scope
index 9e51c27d52..aa1ece2eea 100644
--- a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.constructor.scope
+++ b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.constructor.scope
@@ -1,21 +1,21 @@
 class Foo {
-  constructor() {}
+    constructor() {}
 }
 ---
 
 [Content] =
-[Domain] = 1:2-1:18
-    >----------------<
-1|   constructor() {}
+[Domain] = 1:4-1:20
+      >----------------<
+1|     constructor() {}
 
 [Removal] = 1:0-2:0
-  >------------------
-1|   constructor() {}
+  >--------------------
+1|     constructor() {}
 2| }
    <
 
-[Leading delimiter] = 1:0-1:2
-  >--<
-1|   constructor() {}
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     constructor() {}
 
 [Insertion delimiter] = "\n\n"
diff --git a/data/fixtures/scopes/javascript.core/statement/statement.field.class.scope b/data/fixtures/scopes/javascript.core/statement/statement.field.class.scope
index c60f838a11..c2a8de9cda 100644
--- a/data/fixtures/scopes/javascript.core/statement/statement.field.class.scope
+++ b/data/fixtures/scopes/javascript.core/statement/statement.field.class.scope
@@ -1,6 +1,6 @@
 class Foo {
-  bar;
-  baz = 0;
+    bar;
+    baz = 0;
 }
 ---
 
@@ -9,8 +9,8 @@ class Foo {
 [#1 Domain] = 0:0-3:1
   >-----------
 0| class Foo {
-1|   bar;
-2|   baz = 0;
+1|     bar;
+2|     baz = 0;
 3| }
    -<
 
@@ -18,36 +18,36 @@ class Foo {
 
 
 [#2 Content] =
-[#2 Domain] = 1:2-1:6
-    >----<
-1|   bar;
+[#2 Domain] = 1:4-1:8
+      >----<
+1|     bar;
 
 [#2 Removal] = 1:0-2:0
-  >------
-1|   bar;
-2|   baz = 0;
+  >--------
+1|     bar;
+2|     baz = 0;
    <
 
-[#2 Leading delimiter] = 1:0-1:2
-  >--<
-1|   bar;
+[#2 Leading delimiter] = 1:0-1:4
+  >----<
+1|     bar;
 
 [#2 Insertion delimiter] = "\n"
 
 
 [#3 Content] =
-[#3 Domain] = 2:2-2:10
-    >--------<
-2|   baz = 0;
+[#3 Domain] = 2:4-2:12
+      >--------<
+2|     baz = 0;
 
 [#3 Removal] = 2:0-3:0
-  >----------
-2|   baz = 0;
+  >------------
+2|     baz = 0;
 3| }
    <
 
-[#3 Leading delimiter] = 2:0-2:2
-  >--<
-2|   baz = 0;
+[#3 Leading delimiter] = 2:0-2:4
+  >----<
+2|     baz = 0;
 
 [#3 Insertion delimiter] = "\n"
diff --git a/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.iteration.scope
index 9111131003..3efcf209fc 100644
--- a/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.iteration.scope
+++ b/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.iteration.scope
@@ -1,5 +1,5 @@
 class Foo {
-  constructor(aaa = 0, bbb = 1) {}
+    constructor(aaa = 0, bbb = 1) {}
 }
 ---
 
@@ -7,7 +7,7 @@ class Foo {
 [#1 Domain] = 0:0-2:1
   >-----------
 0| class Foo {
-1|   constructor(aaa = 0, bbb = 1) {}
+1|     constructor(aaa = 0, bbb = 1) {}
 2| }
    -<
 
@@ -16,12 +16,12 @@ class Foo {
 [#2 Domain] = 0:11-2:0
              >
 0| class Foo {
-1|   constructor(aaa = 0, bbb = 1) {}
+1|     constructor(aaa = 0, bbb = 1) {}
 2| }
    <
 
 
 [#3 Content] =
-[#3 Domain] = 1:14-1:30
-                >----------------<
-1|   constructor(aaa = 0, bbb = 1) {}
+[#3 Domain] = 1:16-1:32
+                  >----------------<
+1|     constructor(aaa = 0, bbb = 1) {}
diff --git a/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.scope
index 691b97923c..5d38af351b 100644
--- a/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.scope
+++ b/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.scope
@@ -1,41 +1,41 @@
 class Foo {
-  constructor(aaa = 0, bbb = 1) {}
+    constructor(aaa = 0, bbb = 1) {}
 }
 ---
 
-[#1 Content] = 1:20-1:21
-                      >-<
-1|   constructor(aaa = 0, bbb = 1) {}
+[#1 Content] = 1:22-1:23
+                        >-<
+1|     constructor(aaa = 0, bbb = 1) {}
 
-[#1 Removal] = 1:17-1:21
-                   >----<
-1|   constructor(aaa = 0, bbb = 1) {}
+[#1 Removal] = 1:19-1:23
+                     >----<
+1|     constructor(aaa = 0, bbb = 1) {}
 
-[#1 Leading delimiter] = 1:17-1:20
-                   >---<
-1|   constructor(aaa = 0, bbb = 1) {}
+[#1 Leading delimiter] = 1:19-1:22
+                     >---<
+1|     constructor(aaa = 0, bbb = 1) {}
 
-[#1 Domain] = 1:14-1:21
-                >-------<
-1|   constructor(aaa = 0, bbb = 1) {}
+[#1 Domain] = 1:16-1:23
+                  >-------<
+1|     constructor(aaa = 0, bbb = 1) {}
 
 [#1 Insertion delimiter] = " "
 
 
-[#2 Content] = 1:29-1:30
-                               >-<
-1|   constructor(aaa = 0, bbb = 1) {}
+[#2 Content] = 1:31-1:32
+                                 >-<
+1|     constructor(aaa = 0, bbb = 1) {}
 
-[#2 Removal] = 1:26-1:30
-                            >----<
-1|   constructor(aaa = 0, bbb = 1) {}
+[#2 Removal] = 1:28-1:32
+                              >----<
+1|     constructor(aaa = 0, bbb = 1) {}
 
-[#2 Leading delimiter] = 1:26-1:29
-                            >---<
-1|   constructor(aaa = 0, bbb = 1) {}
+[#2 Leading delimiter] = 1:28-1:31
+                              >---<
+1|     constructor(aaa = 0, bbb = 1) {}
 
-[#2 Domain] = 1:23-1:30
-                         >-------<
-1|   constructor(aaa = 0, bbb = 1) {}
+[#2 Domain] = 1:25-1:32
+                           >-------<
+1|     constructor(aaa = 0, bbb = 1) {}
 
 [#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.iteration.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.iteration.scope
index 9f3c788613..85e3053ac4 100644
--- a/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.iteration.scope
+++ b/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.iteration.scope
@@ -1,5 +1,5 @@
 class Foo {
-  bar(aaa = 0, bbb = 1) {}
+    bar(aaa = 0, bbb = 1) {}
 }
 ---
 
@@ -7,7 +7,7 @@ class Foo {
 [#1 Domain] = 0:0-2:1
   >-----------
 0| class Foo {
-1|   bar(aaa = 0, bbb = 1) {}
+1|     bar(aaa = 0, bbb = 1) {}
 2| }
    -<
 
@@ -16,12 +16,12 @@ class Foo {
 [#2 Domain] = 0:11-2:0
              >
 0| class Foo {
-1|   bar(aaa = 0, bbb = 1) {}
+1|     bar(aaa = 0, bbb = 1) {}
 2| }
    <
 
 
 [#3 Content] =
-[#3 Domain] = 1:6-1:22
-        >----------------<
-1|   bar(aaa = 0, bbb = 1) {}
+[#3 Domain] = 1:8-1:24
+          >----------------<
+1|     bar(aaa = 0, bbb = 1) {}
diff --git a/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.scope
index 5a3110c6f3..b95ff0d012 100644
--- a/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.scope
+++ b/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.scope
@@ -1,41 +1,41 @@
 class Foo {
-  bar(aaa = 0, bbb = 1) {}
+    bar(aaa = 0, bbb = 1) {}
 }
 ---
 
-[#1 Content] = 1:12-1:13
-              >-<
-1|   bar(aaa = 0, bbb = 1) {}
+[#1 Content] = 1:14-1:15
+                >-<
+1|     bar(aaa = 0, bbb = 1) {}
 
-[#1 Removal] = 1:9-1:13
-           >----<
-1|   bar(aaa = 0, bbb = 1) {}
+[#1 Removal] = 1:11-1:15
+             >----<
+1|     bar(aaa = 0, bbb = 1) {}
 
-[#1 Leading delimiter] = 1:9-1:12
-           >---<
-1|   bar(aaa = 0, bbb = 1) {}
+[#1 Leading delimiter] = 1:11-1:14
+             >---<
+1|     bar(aaa = 0, bbb = 1) {}
 
-[#1 Domain] = 1:6-1:13
-        >-------<
-1|   bar(aaa = 0, bbb = 1) {}
+[#1 Domain] = 1:8-1:15
+          >-------<
+1|     bar(aaa = 0, bbb = 1) {}
 
 [#1 Insertion delimiter] = " "
 
 
-[#2 Content] = 1:21-1:22
-                       >-<
-1|   bar(aaa = 0, bbb = 1) {}
+[#2 Content] = 1:23-1:24
+                         >-<
+1|     bar(aaa = 0, bbb = 1) {}
 
-[#2 Removal] = 1:18-1:22
-                    >----<
-1|   bar(aaa = 0, bbb = 1) {}
+[#2 Removal] = 1:20-1:24
+                      >----<
+1|     bar(aaa = 0, bbb = 1) {}
 
-[#2 Leading delimiter] = 1:18-1:21
-                    >---<
-1|   bar(aaa = 0, bbb = 1) {}
+[#2 Leading delimiter] = 1:20-1:23
+                      >---<
+1|     bar(aaa = 0, bbb = 1) {}
 
-[#2 Domain] = 1:15-1:22
-                 >-------<
-1|   bar(aaa = 0, bbb = 1) {}
+[#2 Domain] = 1:17-1:24
+                   >-------<
+1|     bar(aaa = 0, bbb = 1) {}
 
 [#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/javascript.core/value/value.field.class.scope b/data/fixtures/scopes/javascript.core/value/value.field.class.scope
index f10f3be28c..452aa9d7cb 100644
--- a/data/fixtures/scopes/javascript.core/value/value.field.class.scope
+++ b/data/fixtures/scopes/javascript.core/value/value.field.class.scope
@@ -1,22 +1,22 @@
 class Foo {
-  bar = 0;
+    bar = 0;
 }
 ---
 
-[Content] = 1:8-1:9
-          >-<
-1|   bar = 0;
+[Content] = 1:10-1:11
+            >-<
+1|     bar = 0;
 
-[Removal] = 1:5-1:9
-       >----<
-1|   bar = 0;
+[Removal] = 1:7-1:11
+         >----<
+1|     bar = 0;
 
-[Leading delimiter] = 1:5-1:8
-       >---<
-1|   bar = 0;
+[Leading delimiter] = 1:7-1:10
+         >---<
+1|     bar = 0;
 
-[Domain] = 1:2-1:10
-    >--------<
-1|   bar = 0;
+[Domain] = 1:4-1:12
+      >--------<
+1|     bar = 0;
 
 [Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/javascript.core/value/value.return.scope b/data/fixtures/scopes/javascript.core/value/value.return.scope
index d9c04a9825..7f2e86a4e2 100644
--- a/data/fixtures/scopes/javascript.core/value/value.return.scope
+++ b/data/fixtures/scopes/javascript.core/value/value.return.scope
@@ -1,22 +1,22 @@
 function foo() {
-  return 0;
+    return 0;
 }
 ---
 
-[Content] = 1:9-1:10
-           >-<
-1|   return 0;
+[Content] = 1:11-1:12
+             >-<
+1|     return 0;
 
-[Removal] = 1:8-1:10
-          >--<
-1|   return 0;
+[Removal] = 1:10-1:12
+            >--<
+1|     return 0;
 
-[Leading delimiter] = 1:8-1:9
-          >-<
-1|   return 0;
+[Leading delimiter] = 1:10-1:11
+            >-<
+1|     return 0;
 
-[Domain] = 1:2-1:11
-    >---------<
-1|   return 0;
+[Domain] = 1:4-1:13
+      >---------<
+1|     return 0;
 
 [Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/scss/branch.if.iteration.scope b/data/fixtures/scopes/scss/branch.if.iteration.scope
index 2d6287d7d6..01105de730 100644
--- a/data/fixtures/scopes/scss/branch.if.iteration.scope
+++ b/data/fixtures/scopes/scss/branch.if.iteration.scope
@@ -1,14 +1,14 @@
 * {
-  @if true {}
-  @else if false {}
-  @else {}
+    @if true {}
+    @else if false {}
+    @else {}
 }
 ---
 
 [Content] =
-[Domain] = 1:2-3:10
-    >-----------
-1|   @if true {}
-2|   @else if false {}
-3|   @else {}
-   ----------<
+[Domain] = 1:4-3:12
+      >-----------
+1|     @if true {}
+2|     @else if false {}
+3|     @else {}
+   ------------<
diff --git a/data/fixtures/scopes/scss/disqualifyDelimiter.scope b/data/fixtures/scopes/scss/disqualifyDelimiter.scope
index cff0af49a4..e1c1631e97 100644
--- a/data/fixtures/scopes/scss/disqualifyDelimiter.scope
+++ b/data/fixtures/scopes/scss/disqualifyDelimiter.scope
@@ -1,22 +1,22 @@
 * {
-  @if $container-width < $base-width {}
-  @if $container-width <= $base-width {}
-  @if $container-width > $base-width {}
-  @if $container-width >= $base-width {}
+    @if $container-width < $base-width {}
+    @if $container-width <= $base-width {}
+    @if $container-width > $base-width {}
+    @if $container-width >= $base-width {}
 }
 ---
-[#1 Content] = 1:23-1:24
-                         >-<
-1|   @if $container-width < $base-width {}
+[#1 Content] = 1:25-1:26
+                           >-<
+1|     @if $container-width < $base-width {}
 
-[#2 Content] = 2:23-2:25
-                         >--<
-2|   @if $container-width <= $base-width {}
+[#2 Content] = 2:25-2:27
+                           >--<
+2|     @if $container-width <= $base-width {}
 
-[#3 Content] = 3:23-3:24
-                         >-<
-3|   @if $container-width > $base-width {}
+[#3 Content] = 3:25-3:26
+                           >-<
+3|     @if $container-width > $base-width {}
 
-[#4 Content] = 4:23-4:25
-                         >--<
-4|   @if $container-width >= $base-width {}
+[#4 Content] = 4:25-4:27
+                           >--<
+4|     @if $container-width >= $base-width {}
diff --git a/data/fixtures/scopes/scss/value.return.scope b/data/fixtures/scopes/scss/value.return.scope
index 68e2761d2a..b37da7804c 100644
--- a/data/fixtures/scopes/scss/value.return.scope
+++ b/data/fixtures/scopes/scss/value.return.scope
@@ -1,22 +1,22 @@
 @function foo() {
-  @return 0;
+    @return 0;
 }
 ---
 
-[Content] = 1:10-1:11
-            >-<
-1|   @return 0;
+[Content] = 1:12-1:13
+              >-<
+1|     @return 0;
 
-[Removal] = 1:9-1:11
-           >--<
-1|   @return 0;
+[Removal] = 1:11-1:13
+             >--<
+1|     @return 0;
 
-[Leading delimiter] = 1:9-1:10
-           >-<
-1|   @return 0;
+[Leading delimiter] = 1:11-1:12
+             >-<
+1|     @return 0;
 
-[Domain] = 1:2-1:12
-    >----------<
-1|   @return 0;
+[Domain] = 1:4-1:14
+      >----------<
+1|     @return 0;
 
 [Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/typescript.core/namedFunction/namedFunction.constructor.scope b/data/fixtures/scopes/typescript.core/namedFunction/namedFunction.constructor.scope
index 22e8c6d5d1..df576d2c67 100644
--- a/data/fixtures/scopes/typescript.core/namedFunction/namedFunction.constructor.scope
+++ b/data/fixtures/scopes/typescript.core/namedFunction/namedFunction.constructor.scope
@@ -1,21 +1,21 @@
 class Foo {
-  constructor();
+    constructor();
 }
 ---
 
 [Content] =
-[Domain] = 1:2-1:16
-    >--------------<
-1|   constructor();
+[Domain] = 1:4-1:18
+      >--------------<
+1|     constructor();
 
 [Removal] = 1:0-2:0
-  >----------------
-1|   constructor();
+  >------------------
+1|     constructor();
 2| }
    <
 
-[Leading delimiter] = 1:0-1:2
-  >--<
-1|   constructor();
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     constructor();
 
 [Insertion delimiter] = "\n\n"
diff --git a/data/fixtures/scopes/typescript.core/namedFunction/namedFunction.method.scope b/data/fixtures/scopes/typescript.core/namedFunction/namedFunction.method.scope
index bc0d80a165..14d8abdc88 100644
--- a/data/fixtures/scopes/typescript.core/namedFunction/namedFunction.method.scope
+++ b/data/fixtures/scopes/typescript.core/namedFunction/namedFunction.method.scope
@@ -1,21 +1,21 @@
 class Foo {
-  bar();
+    bar();
 }
 ---
 
 [Content] =
-[Domain] = 1:2-1:8
-    >------<
-1|   bar();
+[Domain] = 1:4-1:10
+      >------<
+1|     bar();
 
 [Removal] = 1:0-2:0
-  >--------
-1|   bar();
+  >----------
+1|     bar();
 2| }
    <
 
-[Leading delimiter] = 1:0-1:2
-  >--<
-1|   bar();
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     bar();
 
 [Insertion delimiter] = "\n\n"
diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.iteration.scope
index 9d824ab820..b221ca820a 100644
--- a/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.iteration.scope
+++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.iteration.scope
@@ -1,5 +1,5 @@
 class Foo {
-  constructor(aaa: number, bbb: number) {}
+    constructor(aaa: number, bbb: number) {}
 }
 ---
 
@@ -7,7 +7,7 @@ class Foo {
 [#1 Domain] = 0:0-2:1
   >-----------
 0| class Foo {
-1|   constructor(aaa: number, bbb: number) {}
+1|     constructor(aaa: number, bbb: number) {}
 2| }
    -<
 
@@ -16,12 +16,12 @@ class Foo {
 [#2 Domain] = 0:11-2:0
              >
 0| class Foo {
-1|   constructor(aaa: number, bbb: number) {}
+1|     constructor(aaa: number, bbb: number) {}
 2| }
    <
 
 
 [#3 Content] =
-[#3 Domain] = 1:14-1:38
-                >------------------------<
-1|   constructor(aaa: number, bbb: number) {}
+[#3 Domain] = 1:16-1:40
+                  >------------------------<
+1|     constructor(aaa: number, bbb: number) {}
diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.scope
index 2dfab90cd5..fc1ecbd126 100644
--- a/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.scope
+++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.scope
@@ -1,5 +1,5 @@
 class Foo {
-  constructor(aaa: number, bbb: number = 0) {}
+    constructor(aaa: number, bbb: number = 0) {}
 }
 ---
 
@@ -8,46 +8,46 @@ class Foo {
 [#1 Domain] = 0:0-2:1
   >-----------
 0| class Foo {
-1|   constructor(aaa: number, bbb: number = 0) {}
+1|     constructor(aaa: number, bbb: number = 0) {}
 2| }
    -<
 
 [#1 Insertion delimiter] = " "
 
 
-[#2 Content] = 1:19-1:25
-                     >------<
-1|   constructor(aaa: number, bbb: number = 0) {}
+[#2 Content] = 1:21-1:27
+                       >------<
+1|     constructor(aaa: number, bbb: number = 0) {}
 
-[#2 Removal] = 1:17-1:25
-                   >--------<
-1|   constructor(aaa: number, bbb: number = 0) {}
+[#2 Removal] = 1:19-1:27
+                     >--------<
+1|     constructor(aaa: number, bbb: number = 0) {}
 
-[#2 Leading delimiter] = 1:17-1:19
-                   >--<
-1|   constructor(aaa: number, bbb: number = 0) {}
+[#2 Leading delimiter] = 1:19-1:21
+                     >--<
+1|     constructor(aaa: number, bbb: number = 0) {}
 
-[#2 Domain] = 1:14-1:25
-                >-----------<
-1|   constructor(aaa: number, bbb: number = 0) {}
+[#2 Domain] = 1:16-1:27
+                  >-----------<
+1|     constructor(aaa: number, bbb: number = 0) {}
 
 [#2 Insertion delimiter] = " "
 
 
-[#3 Content] = 1:32-1:38
-                                  >------<
-1|   constructor(aaa: number, bbb: number = 0) {}
+[#3 Content] = 1:34-1:40
+                                    >------<
+1|     constructor(aaa: number, bbb: number = 0) {}
 
-[#3 Removal] = 1:30-1:38
-                                >--------<
-1|   constructor(aaa: number, bbb: number = 0) {}
+[#3 Removal] = 1:32-1:40
+                                  >--------<
+1|     constructor(aaa: number, bbb: number = 0) {}
 
-[#3 Leading delimiter] = 1:30-1:32
-                                >--<
-1|   constructor(aaa: number, bbb: number = 0) {}
+[#3 Leading delimiter] = 1:32-1:34
+                                  >--<
+1|     constructor(aaa: number, bbb: number = 0) {}
 
-[#3 Domain] = 1:27-1:42
-                             >---------------<
-1|   constructor(aaa: number, bbb: number = 0) {}
+[#3 Domain] = 1:29-1:44
+                               >---------------<
+1|     constructor(aaa: number, bbb: number = 0) {}
 
 [#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.iteration.scope
index 167b724f4b..9cfad09f80 100644
--- a/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.iteration.scope
+++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.iteration.scope
@@ -1,5 +1,5 @@
 class Foo {
-  bar(aaa: number, bbb: number) {}
+    bar(aaa: number, bbb: number) {}
 }
 ---
 
@@ -7,7 +7,7 @@ class Foo {
 [#1 Domain] = 0:0-2:1
   >-----------
 0| class Foo {
-1|   bar(aaa: number, bbb: number) {}
+1|     bar(aaa: number, bbb: number) {}
 2| }
    -<
 
@@ -16,12 +16,12 @@ class Foo {
 [#2 Domain] = 0:11-2:0
              >
 0| class Foo {
-1|   bar(aaa: number, bbb: number) {}
+1|     bar(aaa: number, bbb: number) {}
 2| }
    <
 
 
 [#3 Content] =
-[#3 Domain] = 1:6-1:30
-        >------------------------<
-1|   bar(aaa: number, bbb: number) {}
+[#3 Domain] = 1:8-1:32
+          >------------------------<
+1|     bar(aaa: number, bbb: number) {}
diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.scope
index d2b5ce8331..0b05712f20 100644
--- a/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.scope
+++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.scope
@@ -1,5 +1,5 @@
 class Foo {
-  bar(aaa: number, bbb: number = 0) {}
+    bar(aaa: number, bbb: number = 0) {}
 }
 ---
 
@@ -8,46 +8,46 @@ class Foo {
 [#1 Domain] = 0:0-2:1
   >-----------
 0| class Foo {
-1|   bar(aaa: number, bbb: number = 0) {}
+1|     bar(aaa: number, bbb: number = 0) {}
 2| }
    -<
 
 [#1 Insertion delimiter] = " "
 
 
-[#2 Content] = 1:11-1:17
-             >------<
-1|   bar(aaa: number, bbb: number = 0) {}
+[#2 Content] = 1:13-1:19
+               >------<
+1|     bar(aaa: number, bbb: number = 0) {}
 
-[#2 Removal] = 1:9-1:17
-           >--------<
-1|   bar(aaa: number, bbb: number = 0) {}
+[#2 Removal] = 1:11-1:19
+             >--------<
+1|     bar(aaa: number, bbb: number = 0) {}
 
-[#2 Leading delimiter] = 1:9-1:11
-           >--<
-1|   bar(aaa: number, bbb: number = 0) {}
+[#2 Leading delimiter] = 1:11-1:13
+             >--<
+1|     bar(aaa: number, bbb: number = 0) {}
 
-[#2 Domain] = 1:6-1:17
-        >-----------<
-1|   bar(aaa: number, bbb: number = 0) {}
+[#2 Domain] = 1:8-1:19
+          >-----------<
+1|     bar(aaa: number, bbb: number = 0) {}
 
 [#2 Insertion delimiter] = " "
 
 
-[#3 Content] = 1:24-1:30
-                          >------<
-1|   bar(aaa: number, bbb: number = 0) {}
+[#3 Content] = 1:26-1:32
+                            >------<
+1|     bar(aaa: number, bbb: number = 0) {}
 
-[#3 Removal] = 1:22-1:30
-                        >--------<
-1|   bar(aaa: number, bbb: number = 0) {}
+[#3 Removal] = 1:24-1:32
+                          >--------<
+1|     bar(aaa: number, bbb: number = 0) {}
 
-[#3 Leading delimiter] = 1:22-1:24
-                        >--<
-1|   bar(aaa: number, bbb: number = 0) {}
+[#3 Leading delimiter] = 1:24-1:26
+                          >--<
+1|     bar(aaa: number, bbb: number = 0) {}
 
-[#3 Domain] = 1:19-1:34
-                     >---------------<
-1|   bar(aaa: number, bbb: number = 0) {}
+[#3 Domain] = 1:21-1:36
+                       >---------------<
+1|     bar(aaa: number, bbb: number = 0) {}
 
 [#3 Insertion delimiter] = " "