Fix tests

kishikawakatsumi · kishikawakatsumi · commit 106357392035 · 2023-07-09T10:40:07.000+09:00
diff --git a/Resources/branch_main/Sources/parser/TreeNode.swift b/Resources/branch_main/Sources/parser/TreeNode.swift
@@ -33,13 +33,15 @@ extension TreeNode: Equatable {
 extension TreeNode: CustomStringConvertible {
   var description: String {
     """
-    id: \(id)
-    parent: \(String(describing: parent))
-    text: \(text)
-    range: \(range)
-    structure: \(structure)
-    type: \(type)
-    token: \(String(describing: token))
+    {
+      id: \(id)
+      parent: \(String(describing: parent))
+      text: \(text)
+      range: \(range)
+      structure: \(structure)
+      type: \(type)
+      token: \(String(describing: token))
+    }
     """
   }
 }
@@ -54,10 +56,12 @@ struct Range: Codable, Equatable {
 extension Range: CustomStringConvertible {
   var description: String {
     """
-    startRow: \(startRow)
-    startColumn: \(startColumn)
-    endRow: \(endRow)
-    endColumn: \(endColumn)
+    {
+      startRow: \(startRow)
+      startColumn: \(startColumn)
+      endRow: \(endRow)
+      endColumn: \(endColumn)
+    }
     """
   }
 }
@@ -77,9 +81,11 @@ struct StructureProperty: Codable, Equatable {
 extension StructureProperty: CustomStringConvertible {
   var description: String {
     """
-    name: \(name)
-    value: \(String(describing: value))
-    ref: \(String(describing: ref))
+    {
+      name: \(name)
+      value: \(String(describing: value))
+      ref: \(String(describing: ref))
+    }
     """
   }
 }
@@ -97,8 +103,10 @@ struct StructureValue: Codable, Equatable {
 extension StructureValue: CustomStringConvertible {
   var description: String {
     """
-    text: \(text)
-    kind: \(String(describing: kind))
+    {
+      text: \(text)
+      kind: \(String(describing: kind))
+    }
     """
   }
 }
@@ -121,9 +129,11 @@ struct Token: Codable, Equatable {
 extension Token: CustomStringConvertible {
   var description: String {
     """
-    kind: \(kind)
-    leadingTrivia: \(leadingTrivia)
-    trailingTrivia: \(trailingTrivia)
+    {
+      kind: \(kind)
+      leadingTrivia: \(leadingTrivia)
+      trailingTrivia: \(trailingTrivia)
+    }
     """
   }
 }
diff --git a/Resources/branch_main/Tests/Tests/Fixtures/test-1-1.json b/Resources/branch_main/Tests/Tests/Fixtures/test-1-1.json
@@ -150,20 +150,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenModifiersAndBindingKeyword",
+        "name": "unexpectedBetweenModifiersAndBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.let)",
           "text": "let␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndBindings",
+        "name": "unexpectedBetweenBindingSpecifierAndBindings",
         "value": {
           "text": "nil"
         }
diff --git a/Resources/branch_main/Tests/Tests/Fixtures/test-1-2.json b/Resources/branch_main/Tests/Tests/Fixtures/test-1-2.json
@@ -150,20 +150,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenModifiersAndBindingKeyword",
+        "name": "unexpectedBetweenModifiersAndBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.var)",
           "text": "var␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndBindings",
+        "name": "unexpectedBetweenBindingSpecifierAndBindings",
         "value": {
           "text": "nil"
         }
diff --git a/Resources/branch_main/Tests/Tests/Fixtures/test-1-3.json b/Resources/branch_main/Tests/Tests/Fixtures/test-1-3.json
@@ -163,19 +163,19 @@
         }
       },
       {
-        "name": "unexpectedBetweenImportKeywordAndImportKind",
+        "name": "unexpectedBetweenImportKeywordAndImportKindSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "importKind",
+        "name": "importKindSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "unexpectedBetweenImportKindAndPath",
+        "name": "unexpectedBetweenImportKindSpecifierAndPath",
         "value": {
           "text": "nil"
         }
@@ -5954,20 +5954,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenModifiersAndBindingKeyword",
+        "name": "unexpectedBetweenModifiersAndBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.let)",
           "text": "↲␣␣␣␣␣␣let␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndBindings",
+        "name": "unexpectedBetweenBindingSpecifierAndBindings",
         "value": {
           "text": "nil"
         }
@@ -6734,20 +6734,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenModifiersAndBindingKeyword",
+        "name": "unexpectedBetweenModifiersAndBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.var)",
           "text": "↲↲␣␣␣␣var␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndBindings",
+        "name": "unexpectedBetweenBindingSpecifierAndBindings",
         "value": {
           "text": "nil"
         }
@@ -11111,20 +11111,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenModifiersAndBindingKeyword",
+        "name": "unexpectedBetweenModifiersAndBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.let)",
           "text": "↲↲␣␣//␣BlackjackCard␣properties␣and␣methods↲␣␣let␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndBindings",
+        "name": "unexpectedBetweenBindingSpecifierAndBindings",
         "value": {
           "text": "nil"
         }
@@ -11809,20 +11809,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenModifiersAndBindingKeyword",
+        "name": "unexpectedBetweenModifiersAndBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.var)",
           "text": "↲␣␣var␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndBindings",
+        "name": "unexpectedBetweenBindingSpecifierAndBindings",
         "value": {
           "text": "nil"
         }
@@ -12332,20 +12332,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenModifiersAndBindingKeyword",
+        "name": "unexpectedBetweenModifiersAndBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.var)",
           "text": "↲␣␣␣␣var␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndBindings",
+        "name": "unexpectedBetweenBindingSpecifierAndBindings",
         "value": {
           "text": "nil"
         }
@@ -14494,20 +14494,20 @@
     },
     "structure": [
       {
-        "name": "unexpectedBeforeBindingKeyword",
+        "name": "unexpectedBeforeBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.let)",
           "text": "let␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndPattern",
+        "name": "unexpectedBetweenBindingSpecifierAndPattern",
         "value": {
           "text": "nil"
         }
diff --git a/Resources/branch_main/Tests/Tests/Fixtures/test-1-4.json b/Resources/branch_main/Tests/Tests/Fixtures/test-1-4.json
@@ -730,20 +730,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenModifiersAndBindingKeyword",
+        "name": "unexpectedBetweenModifiersAndBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.let)",
           "text": "↲␣␣let␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndBindings",
+        "name": "unexpectedBetweenBindingSpecifierAndBindings",
         "value": {
           "text": "nil"
         }
@@ -1149,20 +1149,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenModifiersAndBindingKeyword",
+        "name": "unexpectedBetweenModifiersAndBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.let)",
           "text": "↲␣␣let␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndBindings",
+        "name": "unexpectedBetweenBindingSpecifierAndBindings",
         "value": {
           "text": "nil"
         }
diff --git a/Resources/branch_main/Tests/Tests/Fixtures/test-2-1.json b/Resources/branch_main/Tests/Tests/Fixtures/test-2-1.json
@@ -150,20 +150,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenModifiersAndBindingKeyword",
+        "name": "unexpectedBetweenModifiersAndBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.let)",
           "text": "let␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndBindings",
+        "name": "unexpectedBetweenBindingSpecifierAndBindings",
         "value": {
           "text": "nil"
         }
diff --git a/Resources/branch_main/Tests/Tests/Fixtures/test-2-2.json b/Resources/branch_main/Tests/Tests/Fixtures/test-2-2.json
@@ -150,20 +150,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenModifiersAndBindingKeyword",
+        "name": "unexpectedBetweenModifiersAndBindingSpecifier",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "bindingKeyword",
+        "name": "bindingSpecifier",
         "value": {
           "kind": "keyword(SwiftSyntax.Keyword.var)",
           "text": "var␣"
         }
       },
       {
-        "name": "unexpectedBetweenBindingKeywordAndBindings",
+        "name": "unexpectedBetweenBindingSpecifierAndBindings",
         "value": {
           "text": "nil"
         }
diff --git a/Resources/branch_main/Tests/Tests/Fixtures/test-2-3.json b/Resources/branch_main/Tests/Tests/Fixtures/test-2-3.json
diff --git a/Resources/branch_main/Tests/Tests/Fixtures/test-2-4.json b/Resources/branch_main/Tests/Tests/Fixtures/test-2-4.json

Original file line number	Diff line number	Diff line change
`@@ -150,20 +150,20 @@`
`150`	`150`	`}`
`151`	`151`	`},`
`152`	`152`	`{`
`153`		`- "name": "unexpectedBetweenModifiersAndBindingKeyword",`
	`153`	`+ "name": "unexpectedBetweenModifiersAndBindingSpecifier",`
`154`	`154`	`"value": {`
`155`	`155`	`"text": "nil"`
`156`	`156`	`}`
`157`	`157`	`},`
`158`	`158`	`{`
`159`		`- "name": "bindingKeyword",`
	`159`	`+ "name": "bindingSpecifier",`
`160`	`160`	`"value": {`
`161`	`161`	`"kind": "keyword(SwiftSyntax.Keyword.let)",`
`162`	`162`	`"text": "let␣"`
`163`	`163`	`}`
`164`	`164`	`},`
`165`	`165`	`{`
`166`		`- "name": "unexpectedBetweenBindingKeywordAndBindings",`
	`166`	`+ "name": "unexpectedBetweenBindingSpecifierAndBindings",`
`167`	`167`	`"value": {`
`168`	`168`	`"text": "nil"`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,19 +163,19 @@`
`163`	`163`	`}`
`164`	`164`	`},`
`165`	`165`	`{`
`166`		`- "name": "unexpectedBetweenImportKeywordAndImportKind",`
	`166`	`+ "name": "unexpectedBetweenImportKeywordAndImportKindSpecifier",`
`167`	`167`	`"value": {`
`168`	`168`	`"text": "nil"`
`169`	`169`	`}`
`170`	`170`	`},`
`171`	`171`	`{`
`172`		`- "name": "importKind",`
	`172`	`+ "name": "importKindSpecifier",`
`173`	`173`	`"value": {`
`174`	`174`	`"text": "nil"`
`175`	`175`	`}`
`176`	`176`	`},`
`177`	`177`	`{`
`178`		`- "name": "unexpectedBetweenImportKindAndPath",`
	`178`	`+ "name": "unexpectedBetweenImportKindSpecifierAndPath",`
`179`	`179`	`"value": {`
`180`	`180`	`"text": "nil"`
`181`	`181`	`}`
`@@ -5954,20 +5954,20 @@`
`5954`	`5954`	`}`
`5955`	`5955`	`},`
`5956`	`5956`	`{`
`5957`		`- "name": "unexpectedBetweenModifiersAndBindingKeyword",`
	`5957`	`+ "name": "unexpectedBetweenModifiersAndBindingSpecifier",`
`5958`	`5958`	`"value": {`
`5959`	`5959`	`"text": "nil"`
`5960`	`5960`	`}`
`5961`	`5961`	`},`
`5962`	`5962`	`{`
`5963`		`- "name": "bindingKeyword",`
	`5963`	`+ "name": "bindingSpecifier",`
`5964`	`5964`	`"value": {`
`5965`	`5965`	`"kind": "keyword(SwiftSyntax.Keyword.let)",`
`5966`	`5966`	`"text": "↲␣␣␣␣␣␣let␣"`
`5967`	`5967`	`}`
`5968`	`5968`	`},`
`5969`	`5969`	`{`
`5970`		`- "name": "unexpectedBetweenBindingKeywordAndBindings",`
	`5970`	`+ "name": "unexpectedBetweenBindingSpecifierAndBindings",`
`5971`	`5971`	`"value": {`
`5972`	`5972`	`"text": "nil"`
`5973`	`5973`	`}`
`@@ -6734,20 +6734,20 @@`
`6734`	`6734`	`}`
`6735`	`6735`	`},`
`6736`	`6736`	`{`
`6737`		`- "name": "unexpectedBetweenModifiersAndBindingKeyword",`
	`6737`	`+ "name": "unexpectedBetweenModifiersAndBindingSpecifier",`
`6738`	`6738`	`"value": {`
`6739`	`6739`	`"text": "nil"`
`6740`	`6740`	`}`
`6741`	`6741`	`},`
`6742`	`6742`	`{`
`6743`		`- "name": "bindingKeyword",`
	`6743`	`+ "name": "bindingSpecifier",`
`6744`	`6744`	`"value": {`
`6745`	`6745`	`"kind": "keyword(SwiftSyntax.Keyword.var)",`
`6746`	`6746`	`"text": "↲↲␣␣␣␣var␣"`
`6747`	`6747`	`}`
`6748`	`6748`	`},`
`6749`	`6749`	`{`
`6750`		`- "name": "unexpectedBetweenBindingKeywordAndBindings",`
	`6750`	`+ "name": "unexpectedBetweenBindingSpecifierAndBindings",`
`6751`	`6751`	`"value": {`
`6752`	`6752`	`"text": "nil"`
`6753`	`6753`	`}`
`@@ -11111,20 +11111,20 @@`
`11111`	`11111`	`}`
`11112`	`11112`	`},`
`11113`	`11113`	`{`
`11114`		`- "name": "unexpectedBetweenModifiersAndBindingKeyword",`
	`11114`	`+ "name": "unexpectedBetweenModifiersAndBindingSpecifier",`
`11115`	`11115`	`"value": {`
`11116`	`11116`	`"text": "nil"`
`11117`	`11117`	`}`
`11118`	`11118`	`},`
`11119`	`11119`	`{`
`11120`		`- "name": "bindingKeyword",`
	`11120`	`+ "name": "bindingSpecifier",`
`11121`	`11121`	`"value": {`
`11122`	`11122`	`"kind": "keyword(SwiftSyntax.Keyword.let)",`
`11123`	`11123`	`"text": "↲↲␣␣//␣BlackjackCard␣properties␣and␣methods↲␣␣let␣"`
`11124`	`11124`	`}`
`11125`	`11125`	`},`
`11126`	`11126`	`{`
`11127`		`- "name": "unexpectedBetweenBindingKeywordAndBindings",`
	`11127`	`+ "name": "unexpectedBetweenBindingSpecifierAndBindings",`
`11128`	`11128`	`"value": {`
`11129`	`11129`	`"text": "nil"`
`11130`	`11130`	`}`
`@@ -11809,20 +11809,20 @@`
`11809`	`11809`	`}`
`11810`	`11810`	`},`
`11811`	`11811`	`{`
`11812`		`- "name": "unexpectedBetweenModifiersAndBindingKeyword",`
	`11812`	`+ "name": "unexpectedBetweenModifiersAndBindingSpecifier",`
`11813`	`11813`	`"value": {`
`11814`	`11814`	`"text": "nil"`
`11815`	`11815`	`}`
`11816`	`11816`	`},`
`11817`	`11817`	`{`
`11818`		`- "name": "bindingKeyword",`
	`11818`	`+ "name": "bindingSpecifier",`
`11819`	`11819`	`"value": {`
`11820`	`11820`	`"kind": "keyword(SwiftSyntax.Keyword.var)",`
`11821`	`11821`	`"text": "↲␣␣var␣"`
`11822`	`11822`	`}`
`11823`	`11823`	`},`
`11824`	`11824`	`{`
`11825`		`- "name": "unexpectedBetweenBindingKeywordAndBindings",`
	`11825`	`+ "name": "unexpectedBetweenBindingSpecifierAndBindings",`
`11826`	`11826`	`"value": {`
`11827`	`11827`	`"text": "nil"`
`11828`	`11828`	`}`
`@@ -12332,20 +12332,20 @@`
`12332`	`12332`	`}`
`12333`	`12333`	`},`
`12334`	`12334`	`{`
`12335`		`- "name": "unexpectedBetweenModifiersAndBindingKeyword",`
	`12335`	`+ "name": "unexpectedBetweenModifiersAndBindingSpecifier",`
`12336`	`12336`	`"value": {`
`12337`	`12337`	`"text": "nil"`
`12338`	`12338`	`}`
`12339`	`12339`	`},`
`12340`	`12340`	`{`
`12341`		`- "name": "bindingKeyword",`
	`12341`	`+ "name": "bindingSpecifier",`
`12342`	`12342`	`"value": {`
`12343`	`12343`	`"kind": "keyword(SwiftSyntax.Keyword.var)",`
`12344`	`12344`	`"text": "↲␣␣␣␣var␣"`
`12345`	`12345`	`}`
`12346`	`12346`	`},`
`12347`	`12347`	`{`
`12348`		`- "name": "unexpectedBetweenBindingKeywordAndBindings",`
	`12348`	`+ "name": "unexpectedBetweenBindingSpecifierAndBindings",`
`12349`	`12349`	`"value": {`
`12350`	`12350`	`"text": "nil"`
`12351`	`12351`	`}`
`@@ -14494,20 +14494,20 @@`
`14494`	`14494`	`},`
`14495`	`14495`	`"structure": [`
`14496`	`14496`	`{`
`14497`		`- "name": "unexpectedBeforeBindingKeyword",`
	`14497`	`+ "name": "unexpectedBeforeBindingSpecifier",`
`14498`	`14498`	`"value": {`
`14499`	`14499`	`"text": "nil"`
`14500`	`14500`	`}`
`14501`	`14501`	`},`
`14502`	`14502`	`{`
`14503`		`- "name": "bindingKeyword",`
	`14503`	`+ "name": "bindingSpecifier",`
`14504`	`14504`	`"value": {`
`14505`	`14505`	`"kind": "keyword(SwiftSyntax.Keyword.let)",`
`14506`	`14506`	`"text": "let␣"`
`14507`	`14507`	`}`
`14508`	`14508`	`},`
`14509`	`14509`	`{`
`14510`		`- "name": "unexpectedBetweenBindingKeywordAndPattern",`
	`14510`	`+ "name": "unexpectedBetweenBindingSpecifierAndPattern",`
`14511`	`14511`	`"value": {`
`14512`	`14512`	`"text": "nil"`
`14513`	`14513`	`}`
Original file line number	Diff line number	Diff line change
`@@ -730,20 +730,20 @@`
`730`	`730`	`}`
`731`	`731`	`},`
`732`	`732`	`{`
`733`		`- "name": "unexpectedBetweenModifiersAndBindingKeyword",`
	`733`	`+ "name": "unexpectedBetweenModifiersAndBindingSpecifier",`
`734`	`734`	`"value": {`
`735`	`735`	`"text": "nil"`
`736`	`736`	`}`
`737`	`737`	`},`
`738`	`738`	`{`
`739`		`- "name": "bindingKeyword",`
	`739`	`+ "name": "bindingSpecifier",`
`740`	`740`	`"value": {`
`741`	`741`	`"kind": "keyword(SwiftSyntax.Keyword.let)",`
`742`	`742`	`"text": "↲␣␣let␣"`
`743`	`743`	`}`
`744`	`744`	`},`
`745`	`745`	`{`
`746`		`- "name": "unexpectedBetweenBindingKeywordAndBindings",`
	`746`	`+ "name": "unexpectedBetweenBindingSpecifierAndBindings",`
`747`	`747`	`"value": {`
`748`	`748`	`"text": "nil"`
`749`	`749`	`}`
`@@ -1149,20 +1149,20 @@`
`1149`	`1149`	`}`
`1150`	`1150`	`},`
`1151`	`1151`	`{`
`1152`		`- "name": "unexpectedBetweenModifiersAndBindingKeyword",`
	`1152`	`+ "name": "unexpectedBetweenModifiersAndBindingSpecifier",`
`1153`	`1153`	`"value": {`
`1154`	`1154`	`"text": "nil"`
`1155`	`1155`	`}`
`1156`	`1156`	`},`
`1157`	`1157`	`{`
`1158`		`- "name": "bindingKeyword",`
	`1158`	`+ "name": "bindingSpecifier",`
`1159`	`1159`	`"value": {`
`1160`	`1160`	`"kind": "keyword(SwiftSyntax.Keyword.let)",`
`1161`	`1161`	`"text": "↲␣␣let␣"`
`1162`	`1162`	`}`
`1163`	`1163`	`},`
`1164`	`1164`	`{`
`1165`		`- "name": "unexpectedBetweenBindingKeywordAndBindings",`
	`1165`	`+ "name": "unexpectedBetweenBindingSpecifierAndBindings",`
`1166`	`1166`	`"value": {`
`1167`	`1167`	`"text": "nil"`
`1168`	`1168`	`}`