luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only coalesce if subbed

Browse source
This commit is contained in:
Alexander Wang 2023-07-11 13:52:29 -07:00
parent 22bd50a7ef
commit 78e9e4565e
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
180 changed files with 869 additions and 459 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
d2ir/compile.go
View file

@ -108,6 +108,7 @@ func (c *compiler) resolveSubstitutions(refctx *RefContext) {
varsMap = vars.Map()
}
subbed := false
switch {
case refctx.Key.Value.UnquotedString != nil:
for i, box := range refctx.Key.Value.UnquotedString.Value {
@ -115,20 +116,26 @@ func (c *compiler) resolveSubstitutions(refctx *RefContext) {
resolvedField := c.resolveSubstitution(varsMap, refctx.Key, box.Substitution)
if resolvedField != nil {
refctx.Key.Value.UnquotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String())
subbed = true
}
}
}
refctx.Key.Value.UnquotedString.Coalesce()
if subbed {
refctx.Key.Value.UnquotedString.Coalesce()
}
case refctx.Key.Value.DoubleQuotedString != nil:
for i, box := range refctx.Key.Value.DoubleQuotedString.Value {
if box.Substitution != nil {
resolvedField := c.resolveSubstitution(varsMap, refctx.Key, box.Substitution)
if resolvedField != nil {
refctx.Key.Value.DoubleQuotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String())
subbed = true
}
}
}
refctx.Key.Value.DoubleQuotedString.Coalesce()
if subbed {
refctx.Key.Value.DoubleQuotedString.Coalesce()
}
}
}

BIN
e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf vendored
View file

Binary file not shown.

15
testdata/d2compiler/TestCompile/array-classes.exp.json generated vendored
View file

@ -76,11 +76,7 @@
"value": {
"double_quoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,2:11:39-2:13:41",
"value": [
{
"string": ""
}
]
"value": null
}
}
}
@ -110,7 +106,8 @@
"range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,3:11:53-3:17:59",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}
@ -153,7 +150,8 @@
"range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,4:16:76-4:22:82",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -214,7 +212,8 @@
"range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,7:11:108-7:17:114",
"value": [
{
"string": "then"
"string": "then",
"raw_string": "then"
}
]
}

3
testdata/d2compiler/TestCompile/basic_icon.exp.json generated vendored
View file

@ -59,7 +59,8 @@
"range": "d2/testdata/d2compiler/TestCompile/basic_icon.d2,1:8:18-1:64:74",
"value": [
{
"string": "https://icons.terrastruct.com/essentials/004-picture.svg"
"string": "https://icons.terrastruct.com/essentials/004-picture.svg",
"raw_string": "https://icons.terrastruct.com/essentials/004-picture.svg"
}
]
}

3
testdata/d2compiler/TestCompile/basic_sequence.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/basic_sequence.d2,1:9:14-1:25:30",
"value": [
{
"string": "sequence_diagram"
"string": "sequence_diagram",
"raw_string": "sequence_diagram"
}
]
}

3
testdata/d2compiler/TestCompile/basic_shape.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/basic_shape.d2,2:9:15-2:15:21",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}

9
testdata/d2compiler/TestCompile/class-shape-class.exp.json generated vendored
View file

@ -78,7 +78,8 @@
"range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,2:11:38-2:16:43",
"value": [
{
"string": "class"
"string": "class",
"raw_string": "class"
}
]
}
@ -144,7 +145,8 @@
"range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,7:9:70-7:19:80",
"value": [
{
"string": "classClass"
"string": "classClass",
"raw_string": "classClass"
}
]
}
@ -176,7 +178,8 @@
"range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,8:12:93-8:15:96",
"value": [
{
"string": "int"
"string": "int",
"raw_string": "int"
}
]
}

9
testdata/d2compiler/TestCompile/class_paren.exp.json generated vendored
View file

@ -64,7 +64,8 @@
"range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,1:9:28-1:14:33",
"value": [
{
"string": "class"
"string": "class",
"raw_string": "class"
}
]
}
@ -119,7 +120,8 @@
"range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,4:13:60-4:19:66",
"value": [
{
"string": "string"
"string": "string",
"raw_string": "string"
}
]
}
@ -151,7 +153,8 @@
"range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,5:8:75-5:12:79",
"value": [
{
"string": "bool"
"string": "bool",
"raw_string": "bool"
}
]
}

6
testdata/d2compiler/TestCompile/class_style.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/class_style.d2,1:9:28-1:16:35",
"value": [
{
"string": "class"
"string": "class",
"raw_string": "class"
}
]
}
@ -86,7 +87,8 @@
"range": "d2/testdata/d2compiler/TestCompile/class_style.d2,2:14:50-2:22:58",
"value": [
{
"string": "string"
"string": "string",
"raw_string": "string"
}
]
}

33
testdata/d2compiler/TestCompile/classes.exp.json generated vendored
View file

@ -76,11 +76,7 @@
"value": {
"double_quoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/classes.d2,2:11:39-2:13:41",
"value": [
{
"string": ""
}
]
"value": null
}
}
}
@ -110,7 +106,8 @@
"range": "d2/testdata/d2compiler/TestCompile/classes.d2,3:11:53-3:17:59",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}
@ -153,7 +150,8 @@
"range": "d2/testdata/d2compiler/TestCompile/classes.d2,4:16:76-4:22:82",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -214,7 +212,8 @@
"range": "d2/testdata/d2compiler/TestCompile/classes.d2,7:11:108-7:17:114",
"value": [
{
"string": "then"
"string": "then",
"raw_string": "then"
}
]
}
@ -320,7 +319,8 @@
"range": "d2/testdata/d2compiler/TestCompile/classes.d2,11:17:164-11:28:175",
"value": [
{
"string": "dragon_ball"
"string": "dragon_ball",
"raw_string": "dragon_ball"
}
]
}
@ -391,7 +391,8 @@
"range": "d2/testdata/d2compiler/TestCompile/classes.d2,12:20:198-12:31:209",
"value": [
{
"string": "dragon_ball"
"string": "dragon_ball",
"raw_string": "dragon_ball"
}
]
}
@ -434,7 +435,8 @@
"range": "d2/testdata/d2compiler/TestCompile/classes.d2,12:45:223-12:48:226",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -495,7 +497,8 @@
"range": "d2/testdata/d2compiler/TestCompile/classes.d2,13:16:245-13:20:249",
"value": [
{
"string": "**"
"string": "**",
"raw_string": "**"
}
]
}
@ -527,7 +530,8 @@
"range": "d2/testdata/d2compiler/TestCompile/classes.d2,13:29:258-13:40:269",
"value": [
{
"string": "dragon_ball"
"string": "dragon_ball",
"raw_string": "dragon_ball"
}
]
}
@ -611,7 +615,8 @@
"range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:26:299-15:30:303",
"value": [
{
"string": "path"
"string": "path",
"raw_string": "path"
}
]
}

24
testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json generated vendored
View file

@ -78,7 +78,8 @@
"range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,3:9:45-3:15:51",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}
@ -163,7 +164,8 @@
"range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,7:10:89-7:17:96",
"value": [
{
"string": "diamond"
"string": "diamond",
"raw_string": "diamond"
}
]
}
@ -287,7 +289,8 @@
"range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,13:9:163-13:16:170",
"value": [
{
"string": "diamond"
"string": "diamond",
"raw_string": "diamond"
}
]
}
@ -401,7 +404,8 @@
"range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,18:10:221-18:16:227",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}
@ -496,7 +500,8 @@
"range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,23:9:277-23:13:281",
"value": [
{
"string": "oval"
"string": "oval",
"raw_string": "oval"
}
]
}
@ -610,7 +615,8 @@
"range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,28:10:333-28:17:340",
"value": [
{
"string": "hexagon"
"string": "hexagon",
"raw_string": "hexagon"
}
]
}
@ -734,7 +740,8 @@
"range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,34:9:407-34:16:414",
"value": [
{
"string": "hexagon"
"string": "hexagon",
"raw_string": "hexagon"
}
]
}
@ -848,7 +855,8 @@
"range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,39:10:463-39:14:467",
"value": [
{
"string": "oval"
"string": "oval",
"raw_string": "oval"
}
]
}

3
testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json generated vendored
View file

@ -59,7 +59,8 @@
"range": "d2/testdata/d2compiler/TestCompile/dimensions_on_nonimage.d2,1:9:19-1:16:26",
"value": [
{
"string": "hexagon"
"string": "hexagon",
"raw_string": "hexagon"
}
]
}

6
testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json generated vendored
View file

@ -111,7 +111,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,2:11:80-2:18:87",
"value": [
{
"string": "diamond"
"string": "diamond",
"raw_string": "diamond"
}
]
}
@ -148,7 +149,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,4:20:112-4:24:116",
"value": [
{
"string": "QOTD"
"string": "QOTD",
"raw_string": "QOTD"
}
]
}

3
testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json generated vendored
View file

@ -77,7 +77,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,1:20:30-1:56:66",
"value": [
{
"string": "Reisner's Rule of Conceptual Inertia"
"string": "Reisner's Rule of Conceptual Inertia",
"raw_string": "Reisner's Rule of Conceptual Inertia"
}
]
}

3
testdata/d2compiler/TestCompile/edge_chain.exp.json generated vendored
View file

@ -90,7 +90,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:13:14-1:55:56",
"value": [
{
"string": "The kids will love our inflatable slides"
"string": "The kids will love our inflatable slides",
"raw_string": "The kids will love our inflatable slides"
}
]
}

3
testdata/d2compiler/TestCompile/edge_chain_map.exp.json generated vendored
View file

@ -114,7 +114,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,2:9:25-2:88:104",
"value": [
{
"string": "Space: the final frontier. These are the voyages of the starship Enterprise."
"string": "Space: the final frontier. These are the voyages of the starship Enterprise.",
"raw_string": "Space: the final frontier. These are the voyages of the starship Enterprise."
}
]
}

18
testdata/d2compiler/TestCompile/edge_column_index.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,1:8:15-1:17:24",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}
@ -86,7 +87,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,2:5:30-2:8:33",
"value": [
{
"string": "int"
"string": "int",
"raw_string": "int"
}
]
}
@ -118,7 +120,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,3:9:43-3:12:46",
"value": [
{
"string": "int"
"string": "int",
"raw_string": "int"
}
]
}
@ -179,7 +182,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,7:8:65-7:17:74",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}
@ -211,7 +215,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,8:5:80-8:8:83",
"value": [
{
"string": "int"
"string": "int",
"raw_string": "int"
}
]
}
@ -243,7 +248,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,9:7:91-9:13:97",
"value": [
{
"string": "string"
"string": "string",
"raw_string": "string"
}
]
}

3
testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json generated vendored
View file

@ -131,7 +131,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:36:43-1:43:50",
"value": [
{
"string": "diamond"
"string": "diamond",
"raw_string": "diamond"
}
]
}

3
testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json generated vendored
View file

@ -94,7 +94,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,2:26:48-2:28:50",
"value": [
{
"string": "yo"
"string": "yo",
"raw_string": "yo"
}
]
}

6
testdata/d2compiler/TestCompile/edge_index.exp.json generated vendored
View file

@ -53,7 +53,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:8:9-1:11:12",
"value": [
{
"string": "one"
"string": "one",
"raw_string": "one"
}
]
}
@ -113,7 +114,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:13:26-2:16:29",
"value": [
{
"string": "two"
"string": "two",
"raw_string": "two"
}
]
}

3
testdata/d2compiler/TestCompile/edge_index_map.exp.json generated vendored
View file

@ -128,7 +128,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,3:9:32-3:88:111",
"value": [
{
"string": "Space: the final frontier. These are the voyages of the starship Enterprise."
"string": "Space: the final frontier. These are the voyages of the starship Enterprise.",
"raw_string": "Space: the final frontier. These are the voyages of the starship Enterprise."
}
]
}

6
testdata/d2compiler/TestCompile/edge_index_nested.exp.json generated vendored
View file

@ -77,7 +77,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:9:15-2:12:18",
"value": [
{
"string": "one"
"string": "one",
"raw_string": "one"
}
]
}
@ -137,7 +138,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:14:33-3:17:36",
"value": [
{
"string": "two"
"string": "two",
"raw_string": "two"
}
]
}

6
testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json generated vendored
View file

@ -77,7 +77,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:9:15-2:12:18",
"value": [
{
"string": "one"
"string": "one",
"raw_string": "one"
}
]
}
@ -158,7 +159,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:15:36-4:18:39",
"value": [
{
"string": "two"
"string": "two",
"raw_string": "two"
}
]
}

3
testdata/d2compiler/TestCompile/edge_map.exp.json generated vendored
View file

@ -77,7 +77,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,2:9:20-2:88:99",
"value": [
{
"string": "Space: the final frontier. These are the voyages of the starship Enterprise."
"string": "Space: the final frontier. These are the voyages of the starship Enterprise.",
"raw_string": "Space: the final frontier. These are the voyages of the starship Enterprise."
}
]
}

3
testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json generated vendored
View file

@ -101,7 +101,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,2:11:43-2:18:50",
"value": [
{
"string": "diamond"
"string": "diamond",
"raw_string": "diamond"
}
]
}

6
testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json generated vendored
View file

@ -88,7 +88,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,1:26:36-1:33:43",
"value": [
{
"string": "diamond"
"string": "diamond",
"raw_string": "diamond"
}
]
}
@ -193,7 +194,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,4:9:87-4:16:94",
"value": [
{
"string": "diamond"
"string": "diamond",
"raw_string": "diamond"
}
]
}

3
testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json generated vendored
View file

@ -88,7 +88,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:34:34-0:42:42",
"value": [
{
"string": "triangle"
"string": "triangle",
"raw_string": "triangle"
}
]
}

3
testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json generated vendored
View file

@ -144,7 +144,8 @@
"range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,2:9:48-2:16:55",
"value": [
{
"string": "diamond"
"string": "diamond",
"raw_string": "diamond"
}
]
}

3
testdata/d2compiler/TestCompile/fill-pattern.exp.json generated vendored
View file

@ -78,7 +78,8 @@
"range": "d2/testdata/d2compiler/TestCompile/fill-pattern.d2,2:18:33-2:22:37",
"value": [
{
"string": "dots"
"string": "dots",
"raw_string": "dots"
}
]
}

3
testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json generated vendored
View file

@ -88,7 +88,8 @@
"range": "d2/testdata/d2compiler/TestCompile/icon-near-composite-together.d2,2:8:41-2:24:57",
"value": [
{
"string": "outside-top-left"
"string": "outside-top-left",
"raw_string": "outside-top-left"
}
]
}

9
testdata/d2compiler/TestCompile/image_style.exp.json generated vendored
View file

@ -59,7 +59,8 @@
"range": "d2/testdata/d2compiler/TestCompile/image_style.d2,1:8:18-1:64:74",
"value": [
{
"string": "https://icons.terrastruct.com/essentials/004-picture.svg"
"string": "https://icons.terrastruct.com/essentials/004-picture.svg",
"raw_string": "https://icons.terrastruct.com/essentials/004-picture.svg"
}
]
}
@ -91,7 +92,8 @@
"range": "d2/testdata/d2compiler/TestCompile/image_style.d2,2:9:84-2:14:89",
"value": [
{
"string": "image"
"string": "image",
"raw_string": "image"
}
]
}
@ -134,7 +136,8 @@
"range": "d2/testdata/d2compiler/TestCompile/image_style.d2,3:16:106-3:25:115",
"value": [
{
"string": "#0D32B2"
"string": "#0D32B2",
"raw_string": "#0D32B2"
}
]
}

6
testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/label-near-composite-separate.d2,1:8:15-1:13:20",
"value": [
{
"string": "sushi"
"string": "sushi",
"raw_string": "sushi"
}
]
}
@ -97,7 +98,8 @@
"range": "d2/testdata/d2compiler/TestCompile/label-near-composite-separate.d2,2:13:34-2:29:50",
"value": [
{
"string": "outside-top-left"
"string": "outside-top-left",
"raw_string": "outside-top-left"
}
]
}

3
testdata/d2compiler/TestCompile/label-near-composite-together.exp.json generated vendored
View file

@ -88,7 +88,8 @@
"range": "d2/testdata/d2compiler/TestCompile/label-near-composite-together.d2,2:8:32-2:24:48",
"value": [
{
"string": "outside-top-left"
"string": "outside-top-left",
"raw_string": "outside-top-left"
}
]
}

3
testdata/d2compiler/TestCompile/label-near-parent.exp.json generated vendored
View file

@ -75,7 +75,8 @@
"range": "d2/testdata/d2compiler/TestCompile/label-near-parent.d2,1:13:26-1:29:42",
"value": [
{
"string": "outside-top-left"
"string": "outside-top-left",
"raw_string": "outside-top-left"
}
]
}

18
testdata/d2compiler/TestCompile/link-board-mixed.exp.json generated vendored
View file

@ -30,7 +30,8 @@
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30",
"value": [
{
"string": "How does the cat go?"
"string": "How does the cat go?",
"raw_string": "How does the cat go?"
}
]
}
@ -176,7 +177,8 @@
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107",
"value": [
{
"string": "goes"
"string": "goes",
"raw_string": "goes"
}
]
}
@ -288,7 +290,8 @@
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169",
"value": [
{
"string": "green"
"string": "green",
"raw_string": "green"
}
]
}
@ -508,7 +511,8 @@
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107",
"value": [
{
"string": "goes"
"string": "goes",
"raw_string": "goes"
}
]
}
@ -697,7 +701,8 @@
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30",
"value": [
{
"string": "How does the cat go?"
"string": "How does the cat go?",
"raw_string": "How does the cat go?"
}
]
}
@ -783,7 +788,8 @@
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169",
"value": [
{
"string": "green"
"string": "green",
"raw_string": "green"
}
]
}

3
testdata/d2compiler/TestCompile/missing-class.exp.json generated vendored
View file

@ -41,7 +41,8 @@
"range": "d2/testdata/d2compiler/TestCompile/missing-class.d2,0:9:9-0:11:11",
"value": [
{
"string": "yo"
"string": "yo",
"raw_string": "yo"
}
]
}

3
testdata/d2compiler/TestCompile/near_constant.exp.json generated vendored
View file

@ -41,7 +41,8 @@
"range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:8:8-0:18:18",
"value": [
{
"string": "top-center"
"string": "top-center",
"raw_string": "top-center"
}
]
}

3
testdata/d2compiler/TestCompile/nested-array-classes.exp.json generated vendored
View file

@ -158,7 +158,8 @@
"range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:26:101-5:31:106",
"value": [
{
"string": "arrow"
"string": "arrow",
"raw_string": "arrow"
}
]
}

9
testdata/d2compiler/TestCompile/nested_sql.exp.json generated vendored
View file

@ -78,7 +78,8 @@
"range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,2:11:31-2:20:40",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}
@ -110,7 +111,8 @@
"range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,4:15:57-4:21:63",
"value": [
{
"string": "string"
"string": "string",
"raw_string": "string"
}
]
}
@ -142,7 +144,8 @@
"range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,5:10:74-5:14:78",
"value": [
{
"string": "bool"
"string": "bool",
"raw_string": "bool"
}
]
}

3
testdata/d2compiler/TestCompile/path_link.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:8:13-1:39:44",
"value": [
{
"string": "Overview.Untitled board 7.zzzzz"
"string": "Overview.Untitled board 7.zzzzz",
"raw_string": "Overview.Untitled board 7.zzzzz"
}
]
}

9
testdata/d2compiler/TestCompile/reordered-classes.exp.json generated vendored
View file

@ -78,7 +78,8 @@
"range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,2:11:29-2:17:35",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}
@ -131,7 +132,8 @@
"range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,5:9:51-5:10:52",
"value": [
{
"string": "x"
"string": "x",
"raw_string": "x"
}
]
}
@ -185,7 +187,8 @@
"range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,6:17:70-6:24:77",
"value": [
{
"string": "diamond"
"string": "diamond",
"raw_string": "diamond"
}
]
}

12
testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,1:8:13-1:14:19",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -137,7 +138,8 @@
"range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,3:16:57-3:19:60",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -180,7 +182,8 @@
"range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,4:13:74-4:18:79",
"value": [
{
"string": "green"
"string": "green",
"raw_string": "green"
}
]
}
@ -228,7 +231,8 @@
"range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,6:8:90-6:9:91",
"value": [
{
"string": "y"
"string": "y",
"raw_string": "y"
}
]
}

3
testdata/d2compiler/TestCompile/root_direction.exp.json generated vendored
View file

@ -30,7 +30,8 @@
"range": "d2/testdata/d2compiler/TestCompile/root_direction.d2,0:11:11-0:16:16",
"value": [
{
"string": "right"
"string": "right",
"raw_string": "right"
}
]
}

3
testdata/d2compiler/TestCompile/root_sequence.exp.json generated vendored
View file

@ -30,7 +30,8 @@
"range": "d2/testdata/d2compiler/TestCompile/root_sequence.d2,0:7:7-0:23:23",
"value": [
{
"string": "sequence_diagram"
"string": "sequence_diagram",
"raw_string": "sequence_diagram"
}
]
}

3
testdata/d2compiler/TestCompile/sequence-timestamp.exp.json generated vendored
View file

@ -30,7 +30,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,0:7:7-0:23:23",
"value": [
{
"string": "sequence_diagram"
"string": "sequence_diagram",
"raw_string": "sequence_diagram"
}
]
}

3
testdata/d2compiler/TestCompile/sequence_container.exp.json generated vendored
View file

@ -30,7 +30,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,0:7:7-0:23:23",
"value": [
{
"string": "sequence_diagram"
"string": "sequence_diagram",
"raw_string": "sequence_diagram"
}
]
}

3
testdata/d2compiler/TestCompile/sequence_container_2.exp.json generated vendored
View file

@ -30,7 +30,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,0:7:7-0:23:23",
"value": [
{
"string": "sequence_diagram"
"string": "sequence_diagram",
"raw_string": "sequence_diagram"
}
]
}

3
testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json generated vendored
View file

@ -30,7 +30,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,0:7:7-0:23:23",
"value": [
{
"string": "sequence_diagram"
"string": "sequence_diagram",
"raw_string": "sequence_diagram"
}
]
}

3
testdata/d2compiler/TestCompile/sequence_scoping.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,1:9:14-1:25:30",
"value": [
{
"string": "sequence_diagram"
"string": "sequence_diagram",
"raw_string": "sequence_diagram"
}
]
}

3
testdata/d2compiler/TestCompile/set_direction.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/set_direction.d2,1:13:18-1:17:22",
"value": [
{
"string": "left"
"string": "left",
"raw_string": "left"
}
]
}

3
testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json generated vendored
View file

@ -59,7 +59,8 @@
"range": "d2/testdata/d2compiler/TestCompile/single_dimension_on_circle.d2,1:8:18-1:14:24",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}

6
testdata/d2compiler/TestCompile/sql-constraints.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:9:14-1:18:23",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}
@ -120,7 +121,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:22:46-2:33:57",
"value": [
{
"string": "primary_key"
"string": "primary_key",
"raw_string": "primary_key"
}
]
}

6
testdata/d2compiler/TestCompile/sql-regression.exp.json generated vendored
View file

@ -78,7 +78,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,2:10:26-2:22:38",
"value": [
{
"string": "lemonchiffon"
"string": "lemonchiffon",
"raw_string": "lemonchiffon"
}
]
}
@ -139,7 +140,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,5:11:61-5:20:70",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}

9
testdata/d2compiler/TestCompile/sql_paren.exp.json generated vendored
View file

@ -64,7 +64,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,1:9:28-1:18:37",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}
@ -96,7 +97,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,3:13:52-3:19:58",
"value": [
{
"string": "string"
"string": "string",
"raw_string": "string"
}
]
}
@ -128,7 +130,8 @@
"range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,4:8:67-4:12:71",
"value": [
{
"string": "bool"
"string": "bool",
"raw_string": "bool"
}
]
}

6
testdata/d2compiler/TestCompile/table_connection_attr.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,1:9:14-1:18:23",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}
@ -138,7 +139,8 @@
"range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,5:9:44-5:18:53",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}

6
testdata/d2compiler/TestCompile/table_style.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/table_style.d2,1:9:28-1:18:37",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}
@ -86,7 +87,8 @@
"range": "d2/testdata/d2compiler/TestCompile/table_style.d2,2:13:51-2:19:57",
"value": [
{
"string": "string"
"string": "string",
"raw_string": "string"
}
]
}

9
testdata/d2compiler/TestCompile/table_style_map.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,1:9:28-1:18:37",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}
@ -86,7 +87,8 @@
"range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,2:13:51-2:19:57",
"value": [
{
"string": "string"
"string": "string",
"raw_string": "string"
}
]
}
@ -171,7 +173,8 @@
"range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,5:16:102-5:20:106",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}

12
testdata/d2compiler/TestCompile/text-transform.exp.json generated vendored
View file

@ -30,7 +30,8 @@
"range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,0:11:11-0:16:16",
"value": [
{
"string": "right"
"string": "right",
"raw_string": "right"
}
]
}
@ -143,7 +144,8 @@
"range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,3:20:61-3:30:71",
"value": [
{
"string": "capitalize"
"string": "capitalize",
"raw_string": "capitalize"
}
]
}
@ -207,7 +209,8 @@
"range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,6:24:102-6:33:111",
"value": [
{
"string": "uppercase"
"string": "uppercase",
"raw_string": "uppercase"
}
]
}
@ -261,7 +264,8 @@
"range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,7:24:136-7:33:145",
"value": [
{
"string": "lowercase"
"string": "lowercase",
"raw_string": "lowercase"
}
]
}

6
testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json generated vendored
View file

@ -53,7 +53,8 @@
"range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:8:9-1:77:78",
"value": [
{
"string": "Can you imagine how life could be improved if we could do away with"
"string": "Can you imagine how life could be improved if we could do away with",
"raw_string": "Can you imagine how life could be improved if we could do away with"
}
]
}
@ -154,7 +155,8 @@
"range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:13:97-3:80:164",
"value": [
{
"string": "Well, it's garish, ugly, and derelicts have used it for a toilet."
"string": "Well, it's garish, ugly, and derelicts have used it for a toilet.",
"raw_string": "Well, it's garish, ugly, and derelicts have used it for a toilet."
}
]
}

6
testdata/d2compiler/TestCompile/underscore_edge_index.exp.json generated vendored
View file

@ -53,7 +53,8 @@
"range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:8:9-1:77:78",
"value": [
{
"string": "Can you imagine how life could be improved if we could do away with"
"string": "Can you imagine how life could be improved if we could do away with",
"raw_string": "Can you imagine how life could be improved if we could do away with"
}
]
}
@ -159,7 +160,8 @@
"range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:18:102-3:85:169",
"value": [
{
"string": "Well, it's garish, ugly, and derelicts have used it for a toilet."
"string": "Well, it's garish, ugly, and derelicts have used it for a toilet.",
"raw_string": "Well, it's garish, ugly, and derelicts have used it for a toilet."
}
]
}

6
testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json generated vendored
View file

@ -65,7 +65,8 @@
"range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,2:6:12-2:84:90",
"value": [
{
"string": "All we are given is possibilities -- to make ourselves one thing or another."
"string": "All we are given is possibilities -- to make ourselves one thing or another.",
"raw_string": "All we are given is possibilities -- to make ourselves one thing or another."
}
]
}
@ -102,7 +103,8 @@
"range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,4:3:96-4:80:173",
"value": [
{
"string": "But it's real. And if it's real it can be affected ... we may not be able"
"string": "But it's real. And if it's real it can be affected ... we may not be able",
"raw_string": "But it's real. And if it's real it can be affected ... we may not be able"
}
]
}

6
testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json generated vendored
View file

@ -30,7 +30,8 @@
"range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,1:3:4-1:80:81",
"value": [
{
"string": "But it's real. And if it's real it can be affected ... we may not be able"
"string": "But it's real. And if it's real it can be affected ... we may not be able",
"raw_string": "But it's real. And if it's real it can be affected ... we may not be able"
}
]
}
@ -97,7 +98,8 @@
"range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,3:6:93-3:84:171",
"value": [
{
"string": "All we are given is possibilities -- to make ourselves one thing or another."
"string": "All we are given is possibilities -- to make ourselves one thing or another.",
"raw_string": "All we are given is possibilities -- to make ourselves one thing or another."
}
]
}

3
testdata/d2compiler/TestCompile/url_link.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:8:13-1:26:31",
"value": [
{
"string": "https://google.com"
"string": "https://google.com",
"raw_string": "https://google.com"
}
]
}

6
testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.d2,0:10:10-0:28:28",
"value": [
{
"string": "https://google.com"
"string": "https://google.com",
"raw_string": "https://google.com"
}
]
}
@ -86,7 +87,8 @@
"range": "d2/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.d2,0:39:39-0:50:50",
"value": [
{
"string": "hello world"
"string": "hello world",
"raw_string": "hello world"
}
]
}

6
testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:10:10-0:32:32",
"value": [
{
"string": "https://not-google.com"
"string": "https://not-google.com",
"raw_string": "https://not-google.com"
}
]
}
@ -86,7 +87,8 @@
"range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:43:43-0:92:92",
"value": [
{
"string": "note: url.ParseRequestURI might see this as a URL"
"string": "note: url.ParseRequestURI might see this as a URL",
"raw_string": "note: url.ParseRequestURI might see this as a URL"
}
]
}

3
testdata/d2compiler/TestCompile/url_tooltip.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/url_tooltip.d2,0:13:13-0:31:31",
"value": [
{
"string": "https://google.com"
"string": "https://google.com",
"raw_string": "https://google.com"
}
]
}

33
testdata/d2compiler/TestCompile/wrong_column_index.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,1:9:24-1:18:33",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}
@ -120,7 +121,8 @@
"range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,2:23:57-2:34:68",
"value": [
{
"string": "primary_key"
"string": "primary_key",
"raw_string": "primary_key"
}
]
}
@ -157,7 +159,8 @@
"range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,3:15:85-3:18:88",
"value": [
{
"string": "int"
"string": "int",
"raw_string": "int"
}
]
}
@ -189,7 +192,8 @@
"range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,4:13:102-4:19:108",
"value": [
{
"string": "string"
"string": "string",
"raw_string": "string"
}
]
}
@ -221,7 +225,8 @@
"range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,5:7:116-5:10:119",
"value": [
{
"string": "int"
"string": "int",
"raw_string": "int"
}
]
}
@ -287,7 +292,8 @@
"range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,6:27:147-6:38:158",
"value": [
{
"string": "foreign_key"
"string": "foreign_key",
"raw_string": "foreign_key"
}
]
}
@ -358,7 +364,8 @@
"range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,7:30:190-7:41:201",
"value": [
{
"string": "foreign_key"
"string": "foreign_key",
"raw_string": "foreign_key"
}
]
}
@ -424,7 +431,8 @@
"range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,11:9:243-11:18:252",
"value": [
{
"string": "sql_table"
"string": "sql_table",
"raw_string": "sql_table"
}
]
}
@ -456,7 +464,8 @@
"range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,12:6:259-12:9:262",
"value": [
{
"string": "int"
"string": "int",
"raw_string": "int"
}
]
}
@ -522,7 +531,8 @@
"range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,13:31:294-13:42:305",
"value": [
{
"string": "foreign_key"
"string": "foreign_key",
"raw_string": "foreign_key"
}
]
}
@ -593,7 +603,8 @@
"range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,14:30:337-14:41:348",
"value": [
{
"string": "foreign_key"
"string": "foreign_key",
"raw_string": "foreign_key"
}
]
}

9
testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json generated vendored
View file

@ -253,7 +253,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143",
"value": [
{
"string": "one two three"
"string": "one two three",
"raw_string": "one two three"
}
]
}
@ -607,7 +608,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143",
"value": [
{
"string": "one two three"
"string": "one two three",
"raw_string": "one two three"
}
]
}
@ -880,7 +882,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143",
"value": [
{
"string": "one two three"
"string": "one two three",
"raw_string": "one two three"
}
]
}

3
testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,2:5:14-2:13:22",
"value": [
{
"string": "im a var"
"string": "im a var",
"raw_string": "im a var"
}
]
}

3
testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,2:5:14-2:13:22",
"value": [
{
"string": "im a var"
"string": "im a var",
"raw_string": "im a var"
}
]
}

3
testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,2:5:14-2:13:22",
"value": [
{
"string": "im a var"
"string": "im a var",
"raw_string": "im a var"
}
]
}

3
testdata/d2compiler/TestCompile2/vars/basic/label.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,2:5:14-2:13:22",
"value": [
{
"string": "im a var"
"string": "im a var",
"raw_string": "im a var"
}
]
}

3
testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json generated vendored
View file

@ -102,7 +102,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,4:14:49-4:17:52",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}

3
testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,2:5:14-2:13:22",
"value": [
{
"string": "im a var"
"string": "im a var",
"raw_string": "im a var"
}
]
}

3
testdata/d2compiler/TestCompile2/vars/basic/style.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,2:17:26-2:20:29",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}

6
testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22",
"value": [
{
"string": "im a var"
"string": "im a var",
"raw_string": "im a var"
}
]
}
@ -236,7 +237,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22",
"value": [
{
"string": "im a var"
"string": "im a var",
"raw_string": "im a var"
}
]
}

21
testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22",
"value": [
{
"string": "im x var"
"string": "im x var",
"raw_string": "im x var"
}
]
}
@ -163,7 +164,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75",
"value": [
{
"string": "im y var"
"string": "im y var",
"raw_string": "im y var"
}
]
}
@ -346,7 +348,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159",
"value": [
{
"string": "im y var"
"string": "im y var",
"raw_string": "im y var"
}
]
}
@ -512,7 +515,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22",
"value": [
{
"string": "im x var"
"string": "im x var",
"raw_string": "im x var"
}
]
}
@ -543,7 +547,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159",
"value": [
{
"string": "im y var"
"string": "im y var",
"raw_string": "im y var"
}
]
}
@ -791,7 +796,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22",
"value": [
{
"string": "im x var"
"string": "im x var",
"raw_string": "im x var"
}
]
}
@ -822,7 +828,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75",
"value": [
{
"string": "im y var"
"string": "im y var",
"raw_string": "im y var"
}
]
}

9
testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,2:5:14-2:13:22",
"value": [
{
"string": "im x var"
"string": "im x var",
"raw_string": "im x var"
}
]
}
@ -163,7 +164,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84",
"value": [
{
"string": "im replaced x var"
"string": "im replaced x var",
"raw_string": "im replaced x var"
}
]
}
@ -297,7 +299,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84",
"value": [
{
"string": "im replaced x var"
"string": "im replaced x var",
"raw_string": "im replaced x var"
}
]
}

6
testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22",
"value": [
{
"string": "im a var"
"string": "im a var",
"raw_string": "im a var"
}
]
}
@ -236,7 +237,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22",
"value": [
{
"string": "im a var"
"string": "im a var",
"raw_string": "im a var"
}
]
}

6
testdata/d2compiler/TestCompile2/vars/override/label.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,2:5:14-2:13:22",
"value": [
{
"string": "im a var"
"string": "im a var",
"raw_string": "im a var"
}
]
}
@ -123,7 +124,8 @@
"range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,5:4:38-5:13:47",
"value": [
{
"string": "not a var"
"string": "not a var",
"raw_string": "not a var"
}
]
}

15
testdata/d2ir/TestCompile/classes/basic.exp.json generated vendored
View file

@ -75,7 +75,8 @@
"range": "TestCompile/classes/basic.d2,3:16:40-3:22:46",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -155,7 +156,8 @@
"range": "TestCompile/classes/basic.d2,3:16:40-3:22:46",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -243,7 +245,8 @@
"range": "TestCompile/classes/basic.d2,3:16:40-3:22:46",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -344,7 +347,8 @@
"range": "TestCompile/classes/basic.d2,3:16:40-3:22:46",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -474,7 +478,8 @@
"range": "TestCompile/classes/basic.d2,3:16:40-3:22:46",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}

240
testdata/d2ir/TestCompile/classes/inherited.exp.json generated vendored
View file

@ -19,7 +19,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -99,7 +100,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -187,7 +189,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -288,7 +291,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -418,7 +422,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -465,7 +470,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -545,7 +551,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -633,7 +640,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -734,7 +742,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -864,7 +873,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -911,7 +921,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -991,7 +1002,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -1079,7 +1091,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -1180,7 +1193,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -1210,7 +1224,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -1290,7 +1305,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -1378,7 +1394,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -1479,7 +1496,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -1609,7 +1627,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -1738,7 +1757,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -1953,7 +1973,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -2024,7 +2045,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -2104,7 +2126,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -2192,7 +2215,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -2293,7 +2317,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -2323,7 +2348,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -2403,7 +2429,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -2491,7 +2518,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -2592,7 +2620,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -2722,7 +2751,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -2851,7 +2881,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -3092,7 +3123,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -3172,7 +3204,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -3260,7 +3293,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -3361,7 +3395,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -3391,7 +3426,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -3471,7 +3507,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -3553,7 +3590,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -3641,7 +3679,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -3723,7 +3762,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -3824,7 +3864,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -3924,7 +3965,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -4054,7 +4096,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -4183,7 +4226,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -4312,7 +4356,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -4634,7 +4679,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -4705,7 +4751,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -4785,7 +4832,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -4873,7 +4921,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -4974,7 +5023,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -5004,7 +5054,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -5084,7 +5135,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -5166,7 +5218,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -5254,7 +5307,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -5336,7 +5390,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -5437,7 +5492,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -5537,7 +5593,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -5667,7 +5724,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -5796,7 +5854,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -5925,7 +5984,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -6242,7 +6302,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -6322,7 +6383,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -6410,7 +6472,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -6511,7 +6574,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -6541,7 +6605,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -6621,7 +6686,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -6703,7 +6769,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -6791,7 +6858,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -6873,7 +6941,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -6974,7 +7043,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -7074,7 +7144,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -7204,7 +7275,8 @@
"range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -7333,7 +7405,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -7462,7 +7535,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -8013,7 +8087,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -8218,7 +8293,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -8591,7 +8667,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -8796,7 +8873,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}
@ -9198,7 +9276,8 @@
"range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -9403,7 +9482,8 @@
"range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
"value": [
{
"string": "blue"
"string": "blue",
"raw_string": "blue"
}
]
}

48
testdata/d2ir/TestCompile/classes/layer-modify.exp.json generated vendored
View file

@ -19,7 +19,8 @@
"range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
"value": [
{
"string": "yellow"
"string": "yellow",
"raw_string": "yellow"
}
]
}
@ -99,7 +100,8 @@
"range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
"value": [
{
"string": "yellow"
"string": "yellow",
"raw_string": "yellow"
}
]
}
@ -187,7 +189,8 @@
"range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
"value": [
{
"string": "yellow"
"string": "yellow",
"raw_string": "yellow"
}
]
}
@ -288,7 +291,8 @@
"range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
"value": [
{
"string": "yellow"
"string": "yellow",
"raw_string": "yellow"
}
]
}
@ -418,7 +422,8 @@
"range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
"value": [
{
"string": "yellow"
"string": "yellow",
"raw_string": "yellow"
}
]
}
@ -465,7 +470,8 @@
"range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
"value": [
{
"string": "yellow"
"string": "yellow",
"raw_string": "yellow"
}
]
}
@ -545,7 +551,8 @@
"range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
"value": [
{
"string": "yellow"
"string": "yellow",
"raw_string": "yellow"
}
]
}
@ -562,7 +569,8 @@
"range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -686,7 +694,8 @@
"range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -774,7 +783,8 @@
"range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
"value": [
{
"string": "yellow"
"string": "yellow",
"raw_string": "yellow"
}
]
}
@ -900,7 +910,8 @@
"range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -1001,7 +1012,8 @@
"range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
"value": [
{
"string": "yellow"
"string": "yellow",
"raw_string": "yellow"
}
]
}
@ -1132,7 +1144,8 @@
"range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -1257,7 +1270,8 @@
"range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
"value": [
{
"string": "yellow"
"string": "yellow",
"raw_string": "yellow"
}
]
}
@ -1390,7 +1404,8 @@
"range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}
@ -1542,7 +1557,8 @@
"range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
"value": [
{
"string": "red"
"string": "red",
"raw_string": "red"
}
]
}

30
testdata/d2ir/TestCompile/classes/merge.exp.json generated vendored
View file

@ -19,7 +19,8 @@
"range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -99,7 +100,8 @@
"range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -187,7 +189,8 @@
"range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -357,7 +360,8 @@
"range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -516,7 +520,8 @@
"range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -592,7 +597,8 @@
"range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -672,7 +678,8 @@
"range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -760,7 +767,8 @@
"range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -987,7 +995,8 @@
"range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -1232,7 +1241,8 @@
"range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}

45
testdata/d2ir/TestCompile/classes/nested.exp.json generated vendored
View file

@ -19,7 +19,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -99,7 +100,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -187,7 +189,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -288,7 +291,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -418,7 +422,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -529,7 +534,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -609,7 +615,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -697,7 +704,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -798,7 +806,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -928,7 +937,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -1168,7 +1178,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -1248,7 +1259,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -1336,7 +1348,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -1437,7 +1450,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}
@ -1567,7 +1581,8 @@
"range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
"value": [
{
"string": "orange"
"string": "orange",
"raw_string": "orange"
}
]
}

6
testdata/d2ir/TestCompile/fields/label.exp.json generated vendored
View file

@ -7,7 +7,8 @@
"range": "TestCompile/fields/label.d2,0:3:3-0:6:6",
"value": [
{
"string": "yes"
"string": "yes",
"raw_string": "yes"
}
]
}
@ -65,7 +66,8 @@
"range": "TestCompile/fields/label.d2,0:3:3-0:6:6",
"value": [
{
"string": "yes"
"string": "yes",
"raw_string": "yes"
}
]
}

9
testdata/d2ir/TestCompile/fields/nested.exp.json generated vendored
View file

@ -11,7 +11,8 @@
"range": "TestCompile/fields/nested.d2,0:5:5-0:8:8",
"value": [
{
"string": "yes"
"string": "yes",
"raw_string": "yes"
}
]
}
@ -91,7 +92,8 @@
"range": "TestCompile/fields/nested.d2,0:5:5-0:8:8",
"value": [
{
"string": "yes"
"string": "yes",
"raw_string": "yes"
}
]
}
@ -179,7 +181,8 @@
"range": "TestCompile/fields/nested.d2,0:5:5-0:8:8",
"value": [
{
"string": "yes"
"string": "yes",
"raw_string": "yes"
}
]
}

12
testdata/d2ir/TestCompile/imports/nested/map.exp.json generated vendored
View file

@ -11,7 +11,8 @@
"range": "x.d2,1:8:13-1:14:19",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}
@ -69,7 +70,8 @@
"range": "x.d2,1:8:13-1:14:19",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}
@ -86,7 +88,8 @@
"range": "x.d2,2:8:28-2:12:32",
"value": [
{
"string": "meow"
"string": "meow",
"raw_string": "meow"
}
]
}
@ -144,7 +147,8 @@
"range": "x.d2,2:8:28-2:12:32",
"value": [
{
"string": "meow"
"string": "meow",
"raw_string": "meow"
}
]
}

3
testdata/d2ir/TestCompile/imports/nested/scalar.exp.json generated vendored
View file

@ -7,7 +7,8 @@
"range": "x.d2,0:3:3-0:7:7",
"value": [
{
"string": "meow"
"string": "meow",
"raw_string": "meow"
}
]
}

6
testdata/d2ir/TestCompile/imports/spread.exp.json generated vendored
View file

@ -7,7 +7,8 @@
"range": "x.d2,0:3:3-0:7:7",
"value": [
{
"string": "wowa"
"string": "wowa",
"raw_string": "wowa"
}
]
}
@ -65,7 +66,8 @@
"range": "x.d2,0:3:3-0:7:7",
"value": [
{
"string": "wowa"
"string": "wowa",
"raw_string": "wowa"
}
]
}

12
testdata/d2ir/TestCompile/imports/value.exp.json generated vendored
View file

@ -11,7 +11,8 @@
"range": "x.d2,0:7:7-0:13:13",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}
@ -69,7 +70,8 @@
"range": "x.d2,0:7:7-0:13:13",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}
@ -86,7 +88,8 @@
"range": "x.d2,1:7:21-1:11:25",
"value": [
{
"string": "meow"
"string": "meow",
"raw_string": "meow"
}
]
}
@ -144,7 +147,8 @@
"range": "x.d2,1:7:21-1:11:25",
"value": [
{
"string": "meow"
"string": "meow",
"raw_string": "meow"
}
]
}

9
testdata/d2ir/TestCompile/imports/vars/1.exp.json generated vendored
View file

@ -11,7 +11,8 @@
"range": "x.d2,0:6:6-0:18:18",
"value": [
{
"string": "var replaced"
"string": "var replaced",
"raw_string": "var replaced"
}
]
}
@ -69,7 +70,8 @@
"range": "x.d2,0:6:6-0:18:18",
"value": [
{
"string": "var replaced"
"string": "var replaced",
"raw_string": "var replaced"
}
]
}
@ -129,7 +131,8 @@
"range": "x.d2,0:6:6-0:18:18",
"value": [
{
"string": "var replaced"
"string": "var replaced",
"raw_string": "var replaced"
}
]
}

3
testdata/d2oracle/TestCreate/make_scope_multiline.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline.d2,1:9:17-1:15:23",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}

3
testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json generated vendored
View file

@ -77,7 +77,8 @@
"range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.d2,2:9:24-2:15:30",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}

3
testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json generated vendored
View file

@ -77,7 +77,8 @@
"range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.d2,3:9:25-3:15:31",
"value": [
{
"string": "circle"
"string": "circle",
"raw_string": "circle"
}
]
}

3
testdata/d2oracle/TestDelete/arrowhead_label.exp.json generated vendored
View file

@ -88,7 +88,8 @@
"range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,1:26:36-1:33:43",
"value": [
{
"string": "diamond"
"string": "diamond",
"raw_string": "diamond"
}
]
}

9
testdata/d2oracle/TestDelete/chaos_1.exp.json generated vendored
View file

@ -54,7 +54,8 @@
"range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,0:12:12-0:20:20",
"value": [
{
"string": "cylinder"
"string": "cylinder",
"raw_string": "cylinder"
}
]
}
@ -149,7 +150,8 @@
"range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:36:58-1:51:73",
"value": [
{
"string": "cf-one-required"
"string": "cf-one-required",
"raw_string": "cf-one-required"
}
]
}
@ -186,7 +188,8 @@
"range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,2:4:79-2:5:80",
"value": [
{
"string": "z"
"string": "z",
"raw_string": "z"
}
]
}

3
testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json generated vendored
View file

@ -99,7 +99,8 @@
"range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,4:5:18-4:9:22",
"value": [
{
"string": "hi"
"string": "hi",
"raw_string": "hi"
}
]
}

6
testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json generated vendored
View file

@ -159,7 +159,8 @@
"range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,4:5:26-4:9:30",
"value": [
{
"string": "hi"
"string": "hi",
"raw_string": "hi"
}
]
}
@ -191,7 +192,8 @@
"range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,5:5:36-5:9:40",
"value": [
{
"string": "ey"
"string": "ey",
"raw_string": "ey"
}
]
}

3
testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json generated vendored
View file

@ -76,7 +76,8 @@
"range": "d2/testdata/d2oracle/TestDelete/children_flat_conflicts.d2,3:5:12-3:9:16",
"value": [
{
"string": "hi"
"string": "hi",
"raw_string": "hi"
}
]
}

Some files were not shown because too many files have changed in this diff Show more