Serialize scope fixtures: Add scope index when we have a target index (#3015)

Author: AndreasArvidsson

data/fixtures/scopes/html/tags.scope

@@ -1,20 +1,20 @@
 <div>hello</div>
 ---
 
-[.1 Content] =
-[.1 Removal] = 0:0-0:5
+[#1.1 Content] =
+[#1.1 Removal] = 0:0-0:5
   >-----<
 0| <div>hello</div>
 
-[.1 Insertion delimiter] = " "
+[#1.1 Insertion delimiter] = " "
 
-[.2 Content] =
-[.2 Removal] = 0:10-0:16
+[#1.2 Content] =
+[#1.2 Removal] = 0:10-0:16
             >------<
 0| <div>hello</div>
 
-[.2 Insertion delimiter] = " "
+[#1.2 Insertion delimiter] = " "
 
-[Domain] = 0:0-0:16
+[#1 Domain] = 0:0-0:16
   >----------------<
 0| <div>hello</div>

data/fixtures/scopes/javascript.jsx/tags.scope

@@ -1,20 +1,20 @@
 <div>hello</div>
 ---
 
-[.1 Content] =
-[.1 Removal] = 0:0-0:5
+[#1.1 Content] =
+[#1.1 Removal] = 0:0-0:5
   >-----<
 0| <div>hello</div>
 
-[.1 Insertion delimiter] = " "
+[#1.1 Insertion delimiter] = " "
 
-[.2 Content] =
-[.2 Removal] = 0:10-0:16
+[#1.2 Content] =
+[#1.2 Removal] = 0:10-0:16
             >------<
 0| <div>hello</div>
 
-[.2 Insertion delimiter] = " "
+[#1.2 Insertion delimiter] = " "
 
-[Domain] = 0:0-0:16
+[#1 Domain] = 0:0-0:16
   >----------------<
 0| <div>hello</div>

data/fixtures/scopes/latex/tags.scope

@@ -3,31 +3,31 @@
 \end{quote}
 ---
 
-[.1 Content] = 0:0-0:13
+[#1.1 Content] = 0:0-0:13
   >-------------<
 0| \begin{quote}
 
-[.1 Removal] = 0:0-1:0
+[#1.1 Removal] = 0:0-1:0
   >-------------
 0| \begin{quote}
 1|     Hello
    <
 
-[.1 Insertion delimiter] = " "
+[#1.1 Insertion delimiter] = " "
 
-[.2 Content] = 2:0-2:11
+[#1.2 Content] = 2:0-2:11
   >-----------<
 2| \end{quote}
 
-[.2 Removal] = 1:9-2:11
+[#1.2 Removal] = 1:9-2:11
            >
 1|     Hello
 2| \end{quote}
    -----------<
 
-[.2 Insertion delimiter] = " "
+[#1.2 Insertion delimiter] = " "
 
-[Domain] = 0:0-2:11
+[#1 Domain] = 0:0-2:11
   >-------------
 0| \begin{quote}
 1|     Hello

data/fixtures/scopes/xml/tags.scope

@@ -1,20 +1,20 @@
 <name id="name">Me</name>
 ---
 
-[.1 Content] =
-[.1 Removal] = 0:0-0:16
+[#1.1 Content] =
+[#1.1 Removal] = 0:0-0:16
   >----------------<
 0| <name id="name">Me</name>
 
-[.1 Insertion delimiter] = " "
+[#1.1 Insertion delimiter] = " "
 
-[.2 Content] =
-[.2 Removal] = 0:18-0:25
+[#1.2 Content] =
+[#1.2 Removal] = 0:18-0:25
                     >-------<
 0| <name id="name">Me</name>
 
-[.2 Insertion delimiter] = " "
+[#1.2 Insertion delimiter] = " "
 
-[Domain] = 0:0-0:25
+[#1 Domain] = 0:0-0:25
   >-------------------------<
 0| <name id="name">Me</name>

packages/cursorless-vscode-e2e/src/suite/serializeScopeFixture.ts

@@ -71,6 +71,11 @@ function serializeScope(
     });
   }
 
+  // If we're going to add a target number we need a scope number as well.
+  if (scopeNumber == null) {
+    scopeNumber = 1;
+  }
+
   // If we have multiple targets or the domain is not equal to the content range: add domain last
   return [
     ...targets.map((target, index) =>