From e03e19b28bf6923124b1eb0119f67fa2ca0a7fab Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Fri, 5 May 2023 09:11:46 -0700 Subject: [PATCH] ta=1 --- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 79993 -> 79993 bytes .../TestCompile/array-classes.exp.json | 8 +- .../d2compiler/TestCompile/classes.exp.json | 8 +- .../TestCompile/constraint_label.exp.json | 4 +- testdata/d2compiler/TestCompile/edge.exp.json | 8 +- .../edge_arrowhead_fields.exp.json | 8 +- .../edge_arrowhead_primary.exp.json | 8 +- .../TestCompile/edge_chain.exp.json | 20 +- .../TestCompile/edge_chain_map.exp.json | 20 +- .../TestCompile/edge_column_index.exp.json | 8 +- .../TestCompile/edge_exclusive_style.exp.json | 8 +- .../TestCompile/edge_flat_arrowhead.exp.json | 16 +- .../edge_flat_label_arrowhead.exp.json | 8 +- .../TestCompile/edge_index.exp.json | 16 +- .../TestCompile/edge_index_map.exp.json | 16 +- .../TestCompile/edge_index_nested.exp.json | 16 +- .../edge_index_nested_cross_scope.exp.json | 20 +- .../edge_key_group_flat_nested.exp.json | 20 +- ..._key_group_flat_nested_underscore.exp.json | 12 +- ..._group_map_flat_nested_underscore.exp.json | 12 +- ...e_key_group_map_nested_underscore.exp.json | 12 +- .../TestCompile/edge_label_map.exp.json | 8 +- .../d2compiler/TestCompile/edge_map.exp.json | 8 +- .../TestCompile/edge_map_arrowhead.exp.json | 8 +- .../TestCompile/edge_map_group_flat.exp.json | 16 +- .../edge_map_group_semiflat.exp.json | 16 +- .../TestCompile/edge_map_nested.exp.json | 8 +- .../TestCompile/edge_map_nested_flat.exp.json | 8 +- .../TestCompile/edge_mixed_arrowhead.exp.json | 16 +- .../edge_non_shape_arrowhead.exp.json | 8 +- .../edge_semiflat_arrowhead.exp.json | 16 +- .../TestCompile/link-board-mixed.exp.json | 16 +- .../TestCompile/self-referencing.exp.json | 8 +- .../TestCompile/sequence-timestamp.exp.json | 8 +- .../TestCompile/sequence_container.exp.json | 32 +-- .../TestCompile/sequence_container_2.exp.json | 16 +- .../TestCompile/sequence_scoping.exp.json | 34 +-- .../TestCompile/stroke-width.exp.json | 4 +- .../table_connection_attr.exp.json | 8 +- .../TestCompile/text-transform.exp.json | 8 +- .../underscore_connection.exp.json | 12 +- .../TestCompile/underscore_edge.exp.json | 8 +- .../underscore_edge_chain.exp.json | 20 +- .../underscore_edge_existing.exp.json | 16 +- .../underscore_edge_index.exp.json | 12 +- .../underscore_edge_nested.exp.json | 8 +- .../TestCompile/wrong_column_index.exp.json | 8 +- .../boards/scenarios_edge_index.exp.json | 28 +-- .../d2ir/TestCompile/edges/chain.exp.json | 228 +++++++++--------- .../d2ir/TestCompile/edges/nested.exp.json | 48 ++-- testdata/d2ir/TestCompile/edges/root.exp.json | 28 +-- .../TestCompile/edges/underscore.exp.json | 46 ++-- .../fields/primary/nested.exp.json | 8 +- .../TestCompile/fields/primary/root.exp.json | 6 +- .../layers/errs/4/good_edge.exp.json | 68 +++--- .../d2ir/TestCompile/layers/root.exp.json | 44 ++-- .../d2ir/TestCompile/scenarios/edge.exp.json | 108 ++++----- .../d2ir/TestCompile/scenarios/root.exp.json | 108 ++++----- .../d2ir/TestCompile/steps/recursive.exp.json | 152 ++++++------ testdata/d2ir/TestCompile/steps/root.exp.json | 120 ++++----- .../TestCreate/container_edge.exp.json | 8 +- .../TestCreate/container_edge_label.exp.json | 8 +- testdata/d2oracle/TestCreate/edge.exp.json | 8 +- .../d2oracle/TestCreate/edge_nested.exp.json | 12 +- .../d2oracle/TestCreate/edge_scope.exp.json | 8 +- .../TestCreate/edge_scope_flat.exp.json | 8 +- .../TestCreate/edge_scope_nested.exp.json | 8 +- .../d2oracle/TestCreate/edge_unique.exp.json | 44 ++-- .../d2oracle/TestDelete/arrowhead.exp.json | 8 +- .../TestDelete/arrowhead_label.exp.json | 8 +- .../TestDelete/arrowhead_map.exp.json | 8 +- .../TestDelete/arrowhead_shape.exp.json | 8 +- testdata/d2oracle/TestDelete/chaos_1.exp.json | 8 +- .../d2oracle/TestDelete/children.exp.json | 8 +- .../children_edge_conflicts.exp.json | 8 +- .../children_edges_flat_conflicts.exp.json | 20 +- .../children_multiple_conflicts.exp.json | 8 +- .../TestDelete/children_scope.exp.json | 8 +- .../delete_container_of_near.exp.json | 86 +++---- .../TestDelete/edge-only-style.exp.json | 8 +- .../edge_both_identical_childs.exp.json | 14 +- .../d2oracle/TestDelete/edge_common.exp.json | 8 +- .../TestDelete/edge_common_2.exp.json | 8 +- .../TestDelete/edge_conflict.exp.json | 12 +- .../TestDelete/edge_decrement.exp.json | 64 ++--- .../d2oracle/TestDelete/edge_first.exp.json | 20 +- .../TestDelete/edge_identical_child.exp.json | 14 +- .../TestDelete/edge_key_style.exp.json | 8 +- .../d2oracle/TestDelete/edge_last.exp.json | 30 +-- .../TestDelete/edge_map_style.exp.json | 8 +- .../d2oracle/TestDelete/edge_middle.exp.json | 28 +-- .../TestDelete/flat_reserved.exp.json | 8 +- .../TestDelete/hoist_edge_children.exp.json | 8 +- .../TestDelete/nested_edge_key_style.exp.json | 8 +- .../d2oracle/TestDelete/node_in_edge.exp.json | 16 +- .../TestDelete/node_in_edge_last.exp.json | 30 +-- .../only_delete_edge_reserved.exp.json | 8 +- .../only_delete_obj_reserved.exp.json | 8 +- testdata/d2oracle/TestDelete/order_1.exp.json | 8 +- testdata/d2oracle/TestDelete/order_5.exp.json | 16 +- .../TestDelete/shape_sql_table.exp.json | 8 +- .../TestDelete/underscore_remove.exp.json | 16 +- .../TestMove/chain_connected_nested.exp.json | 20 +- ..._connected_nested_no_extra_create.exp.json | 22 +- .../TestMove/connected_nested.exp.json | 8 +- .../TestMove/edge_across_containers.exp.json | 10 +- .../d2oracle/TestMove/edge_basic.exp.json | 8 +- .../TestMove/edge_chain_basic.exp.json | 20 +- .../TestMove/edge_chain_circular.exp.json | 20 +- .../edge_chain_into_container.exp.json | 22 +- .../edge_chain_out_container.exp.json | 20 +- .../d2oracle/TestMove/edge_conflict.exp.json | 12 +- .../TestMove/edge_into_container.exp.json | 10 +- .../TestMove/edge_nested_basic.exp.json | 8 +- .../TestMove/edge_out_of_container.exp.json | 8 +- .../TestMove/full_edge_slice.exp.json | 18 +- testdata/d2oracle/TestMove/gnarly_1.exp.json | 38 +-- ...ddle_container_generated_conflict.exp.json | 22 +- .../TestMove/move_out_of_edge.exp.json | 14 +- .../TestMove/move_out_of_nested_edge.exp.json | 14 +- .../d2oracle/TestMove/nhooyr_two.exp.json | 8 +- .../d2oracle/TestMove/parentheses.exp.json | 10 +- .../TestMove/partial_edge_slice.exp.json | 8 +- .../TestMove/underscore-connection.exp.json | 12 +- .../underscore_edge_children.exp.json | 8 +- .../underscore_edge_container_1.exp.json | 8 +- .../underscore_edge_container_2.exp.json | 10 +- .../underscore_edge_container_3.exp.json | 8 +- .../underscore_edge_container_4.exp.json | 8 +- .../underscore_edge_container_5.exp.json | 10 +- .../TestMove/underscore_edge_split.exp.json | 8 +- .../unique_name_with_references.exp.json | 10 +- testdata/d2oracle/TestRename/arrows.exp.json | 8 +- .../d2oracle/TestRename/arrows_chain.exp.json | 30 +-- .../TestRename/arrows_complex.exp.json | 14 +- .../TestRename/arrows_trim_common.exp.json | 34 +-- .../TestRename/arrows_trim_common_2.exp.json | 42 ++-- .../TestRename/complex_edge_1.exp.json | 14 +- .../TestRename/complex_edge_2.exp.json | 14 +- .../d2oracle/TestRename/container.exp.json | 116 ++++----- testdata/d2oracle/TestRename/edges.exp.json | 76 +++--- testdata/d2oracle/TestSet/edge.exp.json | 8 +- .../TestSet/edge_append_style.exp.json | 8 +- testdata/d2oracle/TestSet/edge_chain.exp.json | 28 +-- .../TestSet/edge_chain_append_style.exp.json | 28 +-- .../edge_chain_existing_style.exp.json | 36 +-- .../TestSet/edge_chain_nested_set.exp.json | 28 +-- .../edge_flat_merge_arrowhead.exp.json | 28 +-- .../d2oracle/TestSet/edge_index_case.exp.json | 16 +- .../TestSet/edge_index_merge_style.exp.json | 28 +-- .../TestSet/edge_index_nested.exp.json | 8 +- .../TestSet/edge_key_and_key.exp.json | 12 +- testdata/d2oracle/TestSet/edge_label.exp.json | 8 +- .../TestSet/edge_merge_arrowhead.exp.json | 8 +- .../TestSet/edge_merge_style.exp.json | 8 +- .../TestSet/edge_nested_label_set.exp.json | 8 +- .../TestSet/edge_nested_style_set.exp.json | 8 +- .../TestSet/edge_replace_arrowhead.exp.json | 8 +- .../edge_replace_arrowhead_indexed.exp.json | 16 +- .../TestSet/edge_set_arrowhead.exp.json | 8 +- .../d2oracle/TestSet/label_primary.exp.json | 8 +- .../d2oracle/TestSet/map_key_missing.exp.json | 8 +- .../d2oracle/TestSet/nested_alex.exp.json | 8 +- .../TestSet/replace_arrowhead.exp.json | 8 +- .../TestSet/replace_arrowhead_map.exp.json | 8 +- .../TestSet/replace_edge_style.exp.json | 8 +- .../TestSet/replace_edge_style_map.exp.json | 8 +- testdata/d2parser/TestParse/()_keys.exp.json | 18 +- testdata/d2parser/TestParse/edge.exp.json | 4 +- .../TestParse/edge_group_value.exp.json | 6 +- testdata/d2parser/TestParse/edge_key.exp.json | 2 +- .../TestParse/edge_line_continuation.exp.json | 4 +- .../edge_line_continuation_2.exp.json | 4 +- testdata/d2parser/TestParse/errs.exp.json | 6 +- .../d2parser/TestParse/key_with_edge.exp.json | 2 +- .../TestParse/less_than_edge#955.exp.json | 2 +- .../TestParse/merged_shapes_#322.exp.json | 6 +- .../TestParse/multiple_edges.exp.json | 12 +- testdata/d2parser/TestParse/primary.exp.json | 4 +- testdata/d2parser/TestParse/subst.exp.json | 4 +- .../TestParse/table_and_class.exp.json | 20 +- 181 files changed, 1704 insertions(+), 1704 deletions(-) diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 8a90ed7e04d732b4e12f6219639f44f1e9fede66..f1cacfcac3a1d6d4364f31e45c288233a0fe208b 100644 GIT binary patch delta 53 zcmezQf#v51mWC~i)uzg(29`i*pvk50o1fy6Sdyxs;bLWEU}S7y3WQ*}?ek0-Z!-Y^ D>$?y; delta 53 zcmezQf#v51mWC~i)uzgZhQ_9bCgz%4`o8%oE{P?n3K}j}Mg~U42Brp3x$W~z8E-QI E0P8^zIRF3v diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json index 5b8f0f4d7..4dfed8f49 100644 --- a/testdata/d2compiler/TestCompile/array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/array-classes.exp.json @@ -506,7 +506,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:0:264-17:15:279", "src": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:0:264-17:7:271", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:0:264-17:6:270", "path": [ { "unquoted_string": { @@ -523,7 +523,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:9:273-17:15:279", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:10:274-17:15:279", "path": [ { "unquoted_string": { @@ -694,7 +694,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:0:264-17:7:271", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:0:264-17:6:270", "path": [ { "unquoted_string": { @@ -768,7 +768,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:9:273-17:15:279", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:10:274-17:15:279", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json index dc7045842..a96e1034f 100644 --- a/testdata/d2compiler/TestCompile/classes.exp.json +++ b/testdata/d2compiler/TestCompile/classes.exp.json @@ -550,7 +550,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:0:273-15:15:288", "src": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:0:273-15:7:280", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:0:273-15:6:279", "path": [ { "unquoted_string": { @@ -567,7 +567,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:9:282-15:15:288", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:10:283-15:15:288", "path": [ { "unquoted_string": { @@ -723,7 +723,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:0:273-15:7:280", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:0:273-15:6:279", "path": [ { "unquoted_string": { @@ -797,7 +797,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:9:282-15:15:288", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:10:283-15:15:288", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json index f85092e4c..9441a3351 100644 --- a/testdata/d2compiler/TestCompile/constraint_label.exp.json +++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json @@ -9,7 +9,7 @@ "map_key": { "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-3:1:38", "key": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -135,7 +135,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index f888ec849..dec4dc8ec 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index b5b40590e..4ad934650 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -342,7 +342,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -389,7 +389,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json index 8d8ed8127..80b30f4a5 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -178,7 +178,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -225,7 +225,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index 539f25157..529cfb405 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:55:56", "edges": [ { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:7:8", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:4:5-1:7:8", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -47,9 +47,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:4:5-1:11:12", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:5:6-1:11:12", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:4:5-1:7:8", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -66,7 +66,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:9:10-1:11:12", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:10:11-1:11:12", "path": [ { "unquoted_string": { @@ -198,7 +198,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -245,7 +245,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:4:5-1:7:8", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -265,7 +265,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:4:5-1:7:8", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -312,7 +312,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:9:10-1:11:12", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:10:11-1:11:12", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index 79bb97959..d0140ae67 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-3:1:106", "edges": [ { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:7:8", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:4:5-1:7:8", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -47,9 +47,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:4:5-1:11:12", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:5:6-1:11:12", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:4:5-1:7:8", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -66,7 +66,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:9:10-1:11:12", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:10:11-1:11:12", "path": [ { "unquoted_string": { @@ -227,7 +227,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -274,7 +274,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:4:5-1:7:8", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -294,7 +294,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:4:5-1:7:8", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -341,7 +341,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:9:10-1:11:12", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:10:11-1:11:12", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index 1921eab2b..4d9b52f8f 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -268,7 +268,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:21:122", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:7:108", + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:6:107", "path": [ { "unquoted_string": { @@ -296,7 +296,7 @@ }, "src_arrow": "<", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:10:111-12:21:122", + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:11:112-12:21:122", "path": [ { "unquoted_string": { @@ -419,7 +419,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:10:111-12:21:122", + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:11:112-12:21:122", "path": [ { "unquoted_string": { @@ -557,7 +557,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:7:108", + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:6:107", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index 7a53845c0..bd1d26af7 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -168,7 +168,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -215,7 +215,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index 650bd2797..a5a83a569 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -58,7 +58,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:1:8-1:7:14", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:1:8-1:3:10", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:1:8-1:2:9", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:5:12-1:7:14", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:6:13-1:7:14", "path": [ { "unquoted_string": { @@ -230,7 +230,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -250,7 +250,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:1:8-1:3:10", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:1:8-1:2:9", "path": [ { "unquoted_string": { @@ -297,7 +297,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -317,7 +317,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:5:12-1:7:14", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:6:13-1:7:14", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index ad7c1b473..702e516fe 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -195,7 +195,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -242,7 +242,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index ca945bea7..aeb34ecb9 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -68,7 +68,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:1:14-2:7:20", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:1:14-2:3:16", + "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:1:14-2:2:15", "path": [ { "unquoted_string": { @@ -85,7 +85,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:5:18-2:7:20", + "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:6:19-2:7:20", "path": [ { "unquoted_string": { @@ -193,7 +193,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -213,7 +213,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:1:14-2:3:16", + "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:1:14-2:2:15", "path": [ { "unquoted_string": { @@ -260,7 +260,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -280,7 +280,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:5:18-2:7:20", + "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:6:19-2:7:20", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 0cafc323b..9416b5b07 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -58,7 +58,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:1:9-2:7:15", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:1:9-2:3:11", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:1:9-2:2:10", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:5:13-2:7:15", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:6:14-2:7:15", "path": [ { "unquoted_string": { @@ -212,7 +212,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -232,7 +232,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:1:9-2:3:11", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:1:9-2:2:10", "path": [ { "unquoted_string": { @@ -279,7 +279,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -299,7 +299,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:5:13-2:7:15", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:6:14-2:7:15", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index d0c580715..c279ce0a2 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:1:7-2:7:13", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:1:7-2:3:9", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:1:7-2:2:8", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:5:11-2:7:13", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:6:12-2:7:13", "path": [ { "unquoted_string": { @@ -92,7 +92,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:2:21-3:8:27", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:2:21-3:4:23", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:2:21-3:3:22", "path": [ { "unquoted_string": { @@ -109,7 +109,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:6:25-3:8:27", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:7:26-3:8:27", "path": [ { "unquoted_string": { @@ -269,7 +269,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:1:7-2:3:9", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:1:7-2:2:8", "path": [ { "unquoted_string": { @@ -289,7 +289,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:2:21-3:4:23", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:2:21-3:3:22", "path": [ { "unquoted_string": { @@ -336,7 +336,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:5:11-2:7:13", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:6:12-2:7:13", "path": [ { "unquoted_string": { @@ -356,7 +356,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:6:25-3:8:27", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:7:26-3:8:27", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index 312d38e8d..be517f33a 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:1:7-2:7:13", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:1:7-2:3:9", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:1:7-2:2:8", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:5:11-2:7:13", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:6:12-2:7:13", "path": [ { "unquoted_string": { @@ -94,7 +94,7 @@ "map_key": { "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:0:21-4:18:39", "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:0:21-4:2:23", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:0:21-4:1:22", "path": [ { "unquoted_string": { @@ -113,7 +113,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:3:24-4:9:30", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:3:24-4:5:26", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:3:24-4:4:25", "path": [ { "unquoted_string": { @@ -130,7 +130,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:7:28-4:9:30", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:8:29-4:9:30", "path": [ { "unquoted_string": { @@ -258,7 +258,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:0:21-4:2:23", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:0:21-4:1:22", "path": [ { "unquoted_string": { @@ -305,7 +305,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:1:7-2:3:9", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:1:7-2:2:8", "path": [ { "unquoted_string": { @@ -325,7 +325,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:3:24-4:5:26", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:3:24-4:4:25", "path": [ { "unquoted_string": { @@ -372,7 +372,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:5:11-2:7:13", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:6:12-2:7:13", "path": [ { "unquoted_string": { @@ -392,7 +392,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:7:28-4:9:30", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:8:29-4:9:30", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index bcad40145..37936ebcd 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:2:8-2:8:14", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:2:8-2:4:10", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:2:8-2:3:9", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:6:12-2:8:14", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:7:13-2:8:14", "path": [ { "unquoted_string": { @@ -84,7 +84,7 @@ "map_key": { "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:0:17-4:32:49", "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:0:17-4:2:19", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:0:17-4:1:18", "path": [ { "unquoted_string": { @@ -103,7 +103,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:3:20-4:9:26", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:3:20-4:5:22", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:3:20-4:4:21", "path": [ { "unquoted_string": { @@ -120,7 +120,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:7:24-4:9:26", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:8:25-4:9:26", "path": [ { "unquoted_string": { @@ -275,7 +275,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:0:17-4:2:19", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:0:17-4:1:18", "path": [ { "unquoted_string": { @@ -322,7 +322,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:2:8-2:4:10", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:2:8-2:3:9", "path": [ { "unquoted_string": { @@ -342,7 +342,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:3:20-4:5:22", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:3:20-4:4:21", "path": [ { "unquoted_string": { @@ -389,7 +389,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:6:12-2:8:14", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:7:13-2:8:14", "path": [ { "unquoted_string": { @@ -409,7 +409,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:7:24-4:9:26", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:8:25-4:9:26", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index d3c7ca6ed..ef5091d56 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -82,7 +82,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,3:2:15-3:12:25", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,3:2:15-3:6:19", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,3:2:15-3:5:18", "path": [ { "unquoted_string": { @@ -110,7 +110,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,3:8:21-3:12:25", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,3:9:22-3:12:25", "path": [ { "unquoted_string": { @@ -261,7 +261,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -308,7 +308,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index 63647e828..a8a8a8b04 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -82,7 +82,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:2:15-3:12:25", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:2:15-3:6:19", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:2:15-3:5:18", "path": [ { "unquoted_string": { @@ -110,7 +110,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:8:21-3:12:25", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:9:22-3:12:25", "path": [ { "unquoted_string": { @@ -274,7 +274,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -321,7 +321,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index 7da55f2d6..893b3ec82 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -82,7 +82,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:2:15-3:12:25", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:2:15-3:6:19", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:2:15-3:5:18", "path": [ { "unquoted_string": { @@ -110,7 +110,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:8:21-3:12:25", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:9:22-3:12:25", "path": [ { "unquoted_string": { @@ -292,7 +292,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -339,7 +339,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index 4be3fe8c2..07d7b8c0c 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-0:14:14", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-0:7:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-0:6:6", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:9:9-0:14:14", + "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:10:10-0:14:14", "path": [ { "unquoted_string": { @@ -179,7 +179,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-0:7:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-0:6:6", "path": [ { "unquoted_string": { @@ -226,7 +226,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:9:9-0:14:14", + "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:10:10-0:14:14", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index a5431b793..89c09dbfb 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -158,7 +158,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -205,7 +205,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 88a53d3d2..592d3f381 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -207,7 +207,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -254,7 +254,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index a3524f7da..1741fcde2 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -58,7 +58,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:1:9-2:7:15", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:1:9-2:3:11", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:1:9-2:2:10", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:5:13-2:7:15", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:6:14-2:7:15", "path": [ { "unquoted_string": { @@ -210,7 +210,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -230,7 +230,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:1:9-2:3:11", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:1:9-2:2:10", "path": [ { "unquoted_string": { @@ -277,7 +277,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -297,7 +297,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:5:13-2:7:15", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:6:14-2:7:15", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index 630447498..d33c5a281 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -58,7 +58,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:1:8-1:7:14", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:1:8-1:3:10", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:1:8-1:2:9", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:5:12-1:7:14", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:6:13-1:7:14", "path": [ { "unquoted_string": { @@ -228,7 +228,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -248,7 +248,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:1:8-1:3:10", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:1:8-1:2:9", "path": [ { "unquoted_string": { @@ -295,7 +295,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -315,7 +315,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:5:12-1:7:14", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:6:13-1:7:14", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index ef5f4f2e8..861726cd5 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -187,7 +187,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -234,7 +234,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 11f5a9a8e..b59517440 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -169,7 +169,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -216,7 +216,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 100752bf7..8ae05a29c 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -108,7 +108,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:1:47-3:7:53", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:1:47-3:3:49", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:1:47-3:2:48", "path": [ { "unquoted_string": { @@ -125,7 +125,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:5:51-3:7:53", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:6:52-3:7:53", "path": [ { "unquoted_string": { @@ -318,7 +318,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -338,7 +338,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:1:47-3:3:49", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:1:47-3:2:48", "path": [ { "unquoted_string": { @@ -385,7 +385,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -405,7 +405,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:5:51-3:7:53", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:6:52-3:7:53", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 9684e7d9b..762bf710a 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -189,7 +189,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -236,7 +236,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index e1998a59b..cb3102c6c 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -58,7 +58,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:1:8-1:7:14", "src": { - "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:1:8-1:3:10", + "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:1:8-1:2:9", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:5:12-1:7:14", + "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:6:13-1:7:14", "path": [ { "unquoted_string": { @@ -248,7 +248,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -268,7 +268,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:1:8-1:3:10", + "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:1:8-1:2:9", "path": [ { "unquoted_string": { @@ -315,7 +315,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -335,7 +335,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:5:12-1:7:14", + "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:6:13-1:7:14", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 5026294ec..3130fecd5 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -136,7 +136,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101", "src": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", "path": [ { "unquoted_string": { @@ -153,7 +153,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", "path": [ { "unquoted_string": { @@ -557,7 +557,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101", "src": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", "path": [ { "unquoted_string": { @@ -574,7 +574,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", "path": [ { "unquoted_string": { @@ -797,7 +797,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", "path": [ { "unquoted_string": { @@ -844,7 +844,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", "path": [ { "unquoted_string": { @@ -1026,7 +1026,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101", "src": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", "path": [ { "unquoted_string": { @@ -1043,7 +1043,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json index 4529e7133..88f3bf8f3 100644 --- a/testdata/d2compiler/TestCompile/self-referencing.exp.json +++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -139,7 +139,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json index b72c145c3..ec9e1b268 100644 --- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json @@ -173,7 +173,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:4:124-7:10:130", "src": { - "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:4:124-7:6:126", + "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:4:124-7:5:125", "path": [ { "unquoted_string": { @@ -190,7 +190,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:8:128-7:10:130", + "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:9:129-7:10:130", "path": [ { "unquoted_string": { @@ -341,7 +341,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:4:124-7:6:126", + "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:4:124-7:5:125", "path": [ { "unquoted_string": { @@ -408,7 +408,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:8:128-7:10:130", + "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:9:129-7:10:130", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json index e99e98406..7397f55e3 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -45,7 +45,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:14:38", "src": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:6:30", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:5:29", "path": [ { "unquoted_string": { @@ -84,7 +84,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:8:32-1:14:38", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:9:33-1:14:38", "path": [ { "unquoted_string": { @@ -159,7 +159,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:15:60", "src": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:7:52", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:6:51", "path": [ { "unquoted_string": { @@ -198,7 +198,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:9:54-3:15:60", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:10:55-3:15:60", "path": [ { "unquoted_string": { @@ -347,7 +347,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:6:30", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:5:29", "path": [ { "unquoted_string": { @@ -389,7 +389,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:7:52", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:6:51", "path": [ { "unquoted_string": { @@ -458,7 +458,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:6:30", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:5:29", "path": [ { "unquoted_string": { @@ -500,7 +500,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:7:52", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:6:51", "path": [ { "unquoted_string": { @@ -569,7 +569,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:6:30", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:5:29", "path": [ { "unquoted_string": { @@ -611,7 +611,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:7:52", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:6:51", "path": [ { "unquoted_string": { @@ -680,7 +680,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:8:32-1:14:38", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:9:33-1:14:38", "path": [ { "unquoted_string": { @@ -722,7 +722,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:9:54-3:15:60", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:10:55-3:15:60", "path": [ { "unquoted_string": { @@ -791,7 +791,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:8:32-1:14:38", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:9:33-1:14:38", "path": [ { "unquoted_string": { @@ -833,7 +833,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:9:54-3:15:60", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:10:55-3:15:60", "path": [ { "unquoted_string": { @@ -902,7 +902,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:8:32-1:14:38", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:9:33-1:14:38", "path": [ { "unquoted_string": { @@ -944,7 +944,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:9:54-3:15:60", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:10:55-3:15:60", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json index d243d21d7..5a23fa225 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -114,7 +114,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:15:51", "src": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:7:43", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:6:42", "path": [ { "unquoted_string": { @@ -153,7 +153,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:9:45-3:15:51", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:10:46-3:15:51", "path": [ { "unquoted_string": { @@ -335,7 +335,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:7:43", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:6:42", "path": [ { "unquoted_string": { @@ -446,7 +446,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:7:43", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:6:42", "path": [ { "unquoted_string": { @@ -557,7 +557,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:7:43", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:6:42", "path": [ { "unquoted_string": { @@ -673,7 +673,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:9:45-3:15:51", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:10:46-3:15:51", "path": [ { "unquoted_string": { @@ -742,7 +742,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:9:45-3:15:51", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:10:46-3:15:51", "path": [ { "unquoted_string": { @@ -811,7 +811,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:9:45-3:15:51", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:10:46-3:15:51", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json index a16a4da10..e539e5d0f 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -139,7 +139,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:10:57", "src": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:6:53", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:5:52", "path": [ { "unquoted_string": { @@ -156,7 +156,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:8:55-4:10:57", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:9:56-4:10:57", "path": [ { "unquoted_string": { @@ -185,7 +185,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:16:74", "src": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:9:67", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:8:66", "path": [ { "unquoted_string": { @@ -213,7 +213,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:11:69-5:16:74", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:12:70-5:16:74", "path": [ { "unquoted_string": { @@ -253,7 +253,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:19:94", "src": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:11:86", "path": [ { "unquoted_string": { @@ -292,7 +292,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:14:89-6:19:94", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:15:90-6:19:94", "path": [ { "unquoted_string": { @@ -534,7 +534,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:6:53", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:5:52", "path": [ { "unquoted_string": { @@ -554,7 +554,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:9:67", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:8:66", "path": [ { "unquoted_string": { @@ -632,7 +632,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:8:55-4:10:57", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:9:56-4:10:57", "path": [ { "unquoted_string": { @@ -652,7 +652,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:11:69-5:16:74", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:12:70-5:16:74", "path": [ { "unquoted_string": { @@ -683,7 +683,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:11:86", "path": [ { "unquoted_string": { @@ -725,7 +725,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:14:89-6:19:94", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:15:90-6:19:94", "path": [ { "unquoted_string": { @@ -830,7 +830,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:9:67", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:8:66", "path": [ { "unquoted_string": { @@ -888,7 +888,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:11:69-5:16:74", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:12:70-5:16:74", "path": [ { "unquoted_string": { @@ -919,7 +919,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:11:86", "path": [ { "unquoted_string": { @@ -961,7 +961,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:14:89-6:19:94", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:15:90-6:19:94", "path": [ { "unquoted_string": { @@ -1019,7 +1019,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:11:86", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index 4f6868c69..4d6854ed7 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -9,7 +9,7 @@ "map_key": { "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-2:1:31", "key": { - "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -109,7 +109,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json index 32b14aa78..ce190463d 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -182,7 +182,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:0:60-8:10:70", "src": { - "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:0:60-8:4:64", + "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:0:60-8:3:63", "path": [ { "unquoted_string": { @@ -210,7 +210,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:6:66-8:10:70", + "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:7:67-8:10:70", "path": [ { "unquoted_string": { @@ -382,7 +382,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:0:60-8:4:64", + "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:0:60-8:3:63", "path": [ { "unquoted_string": { @@ -492,7 +492,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:6:66-8:10:70", + "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:7:67-8:10:70", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json index 7a15df912..19be4223d 100644 --- a/testdata/d2compiler/TestCompile/text-transform.exp.json +++ b/testdata/d2compiler/TestCompile/text-transform.exp.json @@ -45,7 +45,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:0:17-1:6:23", "src": { - "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:0:17-1:2:19", + "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:0:17-1:1:18", "path": [ { "unquoted_string": { @@ -62,7 +62,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:4:21-1:6:23", + "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:5:22-1:6:23", "path": [ { "unquoted_string": { @@ -344,7 +344,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:0:17-1:2:19", + "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:0:17-1:1:18", "path": [ { "unquoted_string": { @@ -437,7 +437,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:4:21-1:6:23", + "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:5:22-1:6:23", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json index 0ede3dff7..5aa625846 100644 --- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:16:21", "src": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:10:15-1:16:21", + "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:11:16-1:16:21", "path": [ { "unquoted_string": { @@ -239,7 +239,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { @@ -281,7 +281,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:10:15-1:16:21", + "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:11:16-1:16:21", "path": [ { "unquoted_string": { @@ -350,7 +350,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { @@ -419,7 +419,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:10:15-1:16:21", + "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:11:16-1:16:21", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index e2e362d3e..09d2123ac 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:2:8-2:12:18", "src": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:2:8-2:6:12", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:2:8-2:5:11", "path": [ { "unquoted_string": { @@ -64,7 +64,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:8:14-2:12:18", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:9:15-2:12:18", "path": [ { "unquoted_string": { @@ -190,7 +190,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:8:14-2:12:18", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:9:15-2:12:18", "path": [ { "unquoted_string": { @@ -248,7 +248,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:2:8-2:6:12", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:2:8-2:5:11", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index b172abb7c..67ed11d4f 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -34,9 +34,9 @@ "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:19:25", "edges": [ { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:13:19", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:12:18", "src": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:6:12", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:5:11", "path": [ { "unquoted_string": { @@ -64,7 +64,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:8:14-2:13:19", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:9:15-2:12:18", "path": [ { "unquoted_string": { @@ -93,9 +93,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:8:14-2:19:25", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:9:15-2:19:25", "src": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:8:14-2:13:19", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:9:15-2:12:18", "path": [ { "unquoted_string": { @@ -123,7 +123,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:15:21-2:19:25", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:16:22-2:19:25", "path": [ { "unquoted_string": { @@ -281,7 +281,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:8:14-2:13:19", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:9:15-2:12:18", "path": [ { "unquoted_string": { @@ -312,7 +312,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:8:14-2:13:19", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:9:15-2:12:18", "path": [ { "unquoted_string": { @@ -370,7 +370,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:6:12", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:5:11", "path": [ { "unquoted_string": { @@ -428,7 +428,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:15:21-2:19:25", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:16:22-2:19:25", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index 45d5e9c44..b74d8611b 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -92,7 +92,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:1:85-3:11:95", "src": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:1:85-3:5:89", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:1:85-3:4:88", "path": [ { "unquoted_string": { @@ -120,7 +120,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:7:91-3:11:95", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:8:92-3:11:95", "path": [ { "unquoted_string": { @@ -268,7 +268,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -288,7 +288,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:1:85-3:5:89", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:1:85-3:4:88", "path": [ { "unquoted_string": { @@ -346,7 +346,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -366,7 +366,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:7:91-3:11:95", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:8:92-3:11:95", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index cfc16dc74..f164aee76 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -92,7 +92,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:2:86-3:12:96", "src": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:2:86-3:6:90", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:2:86-3:5:89", "path": [ { "unquoted_string": { @@ -120,7 +120,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:8:92-3:12:96", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:9:93-3:12:96", "path": [ { "unquoted_string": { @@ -244,7 +244,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -291,7 +291,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 436f040f2..7c462ae53 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -60,7 +60,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:2:14-3:14:26", "src": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:2:14-3:8:20", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:2:14-3:7:19", "path": [ { "unquoted_string": { @@ -99,7 +99,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:10:22-3:14:26", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:11:23-3:14:26", "path": [ { "unquoted_string": { @@ -277,7 +277,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:10:22-3:14:26", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:11:23-3:14:26", "path": [ { "unquoted_string": { @@ -335,7 +335,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:2:14-3:8:20", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:2:14-3:7:19", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json index 1d80ecd54..af890238e 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -628,7 +628,7 @@ { "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:0:353-17:53:406", "src": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:0:353-17:36:389", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:0:353-17:35:388", "path": [ { "unquoted_string": { @@ -656,7 +656,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:38:391-17:53:406", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:39:392-17:53:406", "path": [ { "unquoted_string": { @@ -779,7 +779,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:38:391-17:53:406", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:39:392-17:53:406", "path": [ { "unquoted_string": { @@ -1029,7 +1029,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:0:353-17:36:389", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:0:353-17:35:388", "path": [ { "unquoted_string": { diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index 1ae53eaf1..6e3e364fc 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -106,7 +106,7 @@ { "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:11:39", "src": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:7:35", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:6:34", "path": [ { "unquoted_string": { @@ -123,7 +123,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:9:37-4:11:39", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:10:38-4:11:39", "path": [ { "unquoted_string": { @@ -261,7 +261,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -308,7 +308,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -364,7 +364,7 @@ { "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -381,7 +381,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -458,7 +458,7 @@ { "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:11:39", "src": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:7:35", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:6:34", "path": [ { "unquoted_string": { @@ -475,7 +475,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:9:37-4:11:39", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:10:38-4:11:39", "path": [ { "unquoted_string": { @@ -620,7 +620,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -640,7 +640,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:7:35", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:6:34", "path": [ { "unquoted_string": { @@ -687,7 +687,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -707,7 +707,7 @@ }, { "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:9:37-4:11:39", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:10:38-4:11:39", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/edges/chain.exp.json b/testdata/d2ir/TestCompile/edges/chain.exp.json index bc664a60b..ea4624895 100644 --- a/testdata/d2ir/TestCompile/edges/chain.exp.json +++ b/testdata/d2ir/TestCompile/edges/chain.exp.json @@ -14,7 +14,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -31,9 +31,9 @@ }, "context": { "edge": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -50,7 +50,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -71,9 +71,9 @@ "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", "edges": [ { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -90,7 +90,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -108,9 +108,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -127,7 +127,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -145,9 +145,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -164,7 +164,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -203,7 +203,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -220,9 +220,9 @@ }, "context": { "edge": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -239,7 +239,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -260,9 +260,9 @@ "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", "edges": [ { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -279,7 +279,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -297,9 +297,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -316,7 +316,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -334,9 +334,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -353,7 +353,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -387,7 +387,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -404,9 +404,9 @@ }, "context": { "edge": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -423,7 +423,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -444,9 +444,9 @@ "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", "edges": [ { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -463,7 +463,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -481,9 +481,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -500,7 +500,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -518,9 +518,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -537,7 +537,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -576,7 +576,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -593,9 +593,9 @@ }, "context": { "edge": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -612,7 +612,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -633,9 +633,9 @@ "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", "edges": [ { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -652,7 +652,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -670,9 +670,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -689,7 +689,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -707,9 +707,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -726,7 +726,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -760,7 +760,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -777,9 +777,9 @@ }, "context": { "edge": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -796,7 +796,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -817,9 +817,9 @@ "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", "edges": [ { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -836,7 +836,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -854,9 +854,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -873,7 +873,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -891,9 +891,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -910,7 +910,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -949,7 +949,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -966,9 +966,9 @@ }, "context": { "edge": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -985,7 +985,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -1006,9 +1006,9 @@ "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", "edges": [ { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1025,7 +1025,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1043,9 +1043,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1062,7 +1062,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -1080,9 +1080,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -1099,7 +1099,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -1142,9 +1142,9 @@ { "context": { "edge": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1161,7 +1161,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1182,9 +1182,9 @@ "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", "edges": [ { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1201,7 +1201,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1219,9 +1219,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1238,7 +1238,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -1256,9 +1256,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -1275,7 +1275,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -1316,9 +1316,9 @@ { "context": { "edge": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1335,7 +1335,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -1356,9 +1356,9 @@ "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", "edges": [ { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1375,7 +1375,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1393,9 +1393,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1412,7 +1412,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -1430,9 +1430,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -1449,7 +1449,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -1490,9 +1490,9 @@ { "context": { "edge": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -1509,7 +1509,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -1530,9 +1530,9 @@ "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", "edges": [ { - "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7", + "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1549,7 +1549,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1567,9 +1567,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12", + "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", "src": { - "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7", + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1586,7 +1586,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -1604,9 +1604,9 @@ "dst_arrow": ">" }, { - "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16", + "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", "src": { - "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12", + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -1623,7 +1623,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16", + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/edges/nested.exp.json b/testdata/d2ir/TestCompile/edges/nested.exp.json index 437b37474..06d098b77 100644 --- a/testdata/d2ir/TestCompile/edges/nested.exp.json +++ b/testdata/d2ir/TestCompile/edges/nested.exp.json @@ -18,7 +18,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -48,7 +48,7 @@ "edge": { "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -76,7 +76,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -110,7 +110,7 @@ { "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -138,7 +138,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -189,7 +189,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -219,7 +219,7 @@ "edge": { "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -247,7 +247,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -281,7 +281,7 @@ { "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -309,7 +309,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -363,7 +363,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -393,7 +393,7 @@ "edge": { "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -421,7 +421,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -455,7 +455,7 @@ { "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -483,7 +483,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -534,7 +534,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -564,7 +564,7 @@ "edge": { "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -592,7 +592,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -626,7 +626,7 @@ { "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -654,7 +654,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -712,7 +712,7 @@ "edge": { "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -740,7 +740,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -774,7 +774,7 @@ { "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4", + "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -802,7 +802,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10", + "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/edges/root.exp.json b/testdata/d2ir/TestCompile/edges/root.exp.json index 853ee12d2..a94dd5651 100644 --- a/testdata/d2ir/TestCompile/edges/root.exp.json +++ b/testdata/d2ir/TestCompile/edges/root.exp.json @@ -14,7 +14,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/root.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -33,7 +33,7 @@ "edge": { "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -50,7 +50,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/root.d2,0:4:4-0:6:6", + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -73,7 +73,7 @@ { "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -90,7 +90,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/root.d2,0:4:4-0:6:6", + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -129,7 +129,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/root.d2,0:4:4-0:6:6", + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -148,7 +148,7 @@ "edge": { "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -165,7 +165,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/root.d2,0:4:4-0:6:6", + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -188,7 +188,7 @@ { "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -205,7 +205,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/root.d2,0:4:4-0:6:6", + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -250,7 +250,7 @@ "edge": { "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -267,7 +267,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/root.d2,0:4:4-0:6:6", + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -290,7 +290,7 @@ { "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:2:2", + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -307,7 +307,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/root.d2,0:4:4-0:6:6", + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/edges/underscore.exp.json b/testdata/d2ir/TestCompile/edges/underscore.exp.json index 8305e55de..fc2b7b1bf 100644 --- a/testdata/d2ir/TestCompile/edges/underscore.exp.json +++ b/testdata/d2ir/TestCompile/edges/underscore.exp.json @@ -18,7 +18,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { @@ -35,9 +35,9 @@ }, "context": { "edge": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", "path": [ { "unquoted_string": { @@ -65,7 +65,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { @@ -86,9 +86,9 @@ "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", "edges": [ { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", "path": [ { "unquoted_string": { @@ -116,7 +116,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { @@ -201,9 +201,9 @@ "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", "edges": [ { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", "path": [ { "unquoted_string": { @@ -231,7 +231,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { @@ -275,7 +275,7 @@ ] }, "key_path": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", "path": [ { "unquoted_string": { @@ -303,9 +303,9 @@ }, "context": { "edge": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", "path": [ { "unquoted_string": { @@ -333,7 +333,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { @@ -354,9 +354,9 @@ "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", "edges": [ { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", "path": [ { "unquoted_string": { @@ -384,7 +384,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { @@ -428,9 +428,9 @@ { "context": { "edge": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", "path": [ { "unquoted_string": { @@ -458,7 +458,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { @@ -479,9 +479,9 @@ "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", "edges": [ { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9", + "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", "path": [ { "unquoted_string": { @@ -509,7 +509,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json index 3c8d3fbde..273034225 100644 --- a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json @@ -33,7 +33,7 @@ ] }, "key_path": { - "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16", + "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:15:15", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ "key": { "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16", "key": { - "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16", + "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:15:15", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "map_key": { "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16", "key": { - "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16", + "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:15:15", "path": [ { "unquoted_string": { @@ -284,7 +284,7 @@ "map_key": { "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16", "key": { - "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16", + "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:15:15", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/fields/primary/root.exp.json b/testdata/d2ir/TestCompile/fields/primary/root.exp.json index 59d3f11bb..91b910a6e 100644 --- a/testdata/d2ir/TestCompile/fields/primary/root.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/root.exp.json @@ -29,7 +29,7 @@ ] }, "key_path": { - "range": "TestCompile/fields/primary/root.d2,0:9:9-0:14:14", + "range": "TestCompile/fields/primary/root.d2,0:9:9-0:13:13", "path": [ { "unquoted_string": { @@ -49,7 +49,7 @@ "key": { "range": "TestCompile/fields/primary/root.d2,0:9:9-0:14:14", "key": { - "range": "TestCompile/fields/primary/root.d2,0:9:9-0:14:14", + "range": "TestCompile/fields/primary/root.d2,0:9:9-0:13:13", "path": [ { "unquoted_string": { @@ -140,7 +140,7 @@ "map_key": { "range": "TestCompile/fields/primary/root.d2,0:9:9-0:14:14", "key": { - "range": "TestCompile/fields/primary/root.d2,0:9:9-0:14:14", + "range": "TestCompile/fields/primary/root.d2,0:9:9-0:13:13", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json index 2a2fbc66b..7a7f1e434 100644 --- a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json +++ b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json @@ -22,7 +22,7 @@ ] }, "key_path": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -63,7 +63,7 @@ "edge": { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -102,7 +102,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -147,7 +147,7 @@ { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -186,7 +186,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -242,7 +242,7 @@ ] }, "key_path": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -283,7 +283,7 @@ "edge": { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -322,7 +322,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -367,7 +367,7 @@ { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -406,7 +406,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -473,7 +473,7 @@ "edge": { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -512,7 +512,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -557,7 +557,7 @@ { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -596,7 +596,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -657,7 +657,7 @@ ] }, "key_path": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -698,7 +698,7 @@ "edge": { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -737,7 +737,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -782,7 +782,7 @@ { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -821,7 +821,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -877,7 +877,7 @@ ] }, "key_path": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -918,7 +918,7 @@ "edge": { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -957,7 +957,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -1002,7 +1002,7 @@ { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -1041,7 +1041,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -1103,7 +1103,7 @@ ] }, "key_path": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -1144,7 +1144,7 @@ "edge": { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -1183,7 +1183,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -1228,7 +1228,7 @@ { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -1267,7 +1267,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -1323,7 +1323,7 @@ ] }, "key_path": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -1364,7 +1364,7 @@ "edge": { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -1403,7 +1403,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { @@ -1448,7 +1448,7 @@ { "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", "path": [ { "unquoted_string": { @@ -1487,7 +1487,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24", + "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/layers/root.exp.json b/testdata/d2ir/TestCompile/layers/root.exp.json index f1ecc780d..7cf8bf4b1 100644 --- a/testdata/d2ir/TestCompile/layers/root.exp.json +++ b/testdata/d2ir/TestCompile/layers/root.exp.json @@ -14,7 +14,7 @@ ] }, "key_path": { - "range": "TestCompile/layers/root.d2,0:0:0-0:2:2", + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -33,7 +33,7 @@ "edge": { "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:2:2", + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -50,7 +50,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/root.d2,0:4:4-0:6:6", + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -73,7 +73,7 @@ { "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:2:2", + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -90,7 +90,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/root.d2,0:4:4-0:6:6", + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -129,7 +129,7 @@ ] }, "key_path": { - "range": "TestCompile/layers/root.d2,0:4:4-0:6:6", + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -148,7 +148,7 @@ "edge": { "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:2:2", + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -165,7 +165,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/root.d2,0:4:4-0:6:6", + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -188,7 +188,7 @@ { "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:2:2", + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -205,7 +205,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/root.d2,0:4:4-0:6:6", + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -260,7 +260,7 @@ ] }, "key_path": { - "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", + "range": "TestCompile/layers/root.d2,2:10:27-2:15:32", "path": [ { "unquoted_string": { @@ -302,7 +302,7 @@ "key": { "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", "key": { - "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", + "range": "TestCompile/layers/root.d2,2:10:27-2:15:32", "path": [ { "unquoted_string": { @@ -361,7 +361,7 @@ ] }, "key_path": { - "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", + "range": "TestCompile/layers/root.d2,2:10:27-2:15:32", "path": [ { "unquoted_string": { @@ -403,7 +403,7 @@ "key": { "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", "key": { - "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", + "range": "TestCompile/layers/root.d2,2:10:27-2:15:32", "path": [ { "unquoted_string": { @@ -462,7 +462,7 @@ ] }, "key_path": { - "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", + "range": "TestCompile/layers/root.d2,2:10:27-2:15:32", "path": [ { "unquoted_string": { @@ -504,7 +504,7 @@ "key": { "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", "key": { - "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", + "range": "TestCompile/layers/root.d2,2:10:27-2:15:32", "path": [ { "unquoted_string": { @@ -607,7 +607,7 @@ "map_key": { "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", "key": { - "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", + "range": "TestCompile/layers/root.d2,2:10:27-2:15:32", "path": [ { "unquoted_string": { @@ -739,7 +739,7 @@ "map_key": { "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", "key": { - "range": "TestCompile/layers/root.d2,2:10:27-2:16:33", + "range": "TestCompile/layers/root.d2,2:10:27-2:15:32", "path": [ { "unquoted_string": { @@ -813,7 +813,7 @@ "edge": { "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:2:2", + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -830,7 +830,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/root.d2,0:4:4-0:6:6", + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -853,7 +853,7 @@ { "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:2:2", + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -870,7 +870,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/layers/root.d2,0:4:4-0:6:6", + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/scenarios/edge.exp.json b/testdata/d2ir/TestCompile/scenarios/edge.exp.json index e73a9415b..45d6ef21a 100644 --- a/testdata/d2ir/TestCompile/scenarios/edge.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/edge.exp.json @@ -14,7 +14,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -33,7 +33,7 @@ "edge": { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -50,7 +50,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -73,7 +73,7 @@ { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -90,7 +90,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -129,7 +129,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -148,7 +148,7 @@ "edge": { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -165,7 +165,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -188,7 +188,7 @@ { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -205,7 +205,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -252,7 +252,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -271,7 +271,7 @@ "edge": { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -288,7 +288,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -311,7 +311,7 @@ { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -328,7 +328,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -362,7 +362,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -381,7 +381,7 @@ "edge": { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -398,7 +398,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -421,7 +421,7 @@ { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -438,7 +438,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -515,7 +515,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -534,7 +534,7 @@ "edge": { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -551,7 +551,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -574,7 +574,7 @@ { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -591,7 +591,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -625,7 +625,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -644,7 +644,7 @@ "edge": { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -661,7 +661,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -684,7 +684,7 @@ { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -701,7 +701,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -835,7 +835,7 @@ "edge": { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -852,7 +852,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -875,7 +875,7 @@ { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -892,7 +892,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -1000,7 +1000,7 @@ "edge": { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -1017,7 +1017,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -1040,7 +1040,7 @@ { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -1057,7 +1057,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -1129,7 +1129,7 @@ "edge": { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1146,7 +1146,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1169,7 +1169,7 @@ { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1186,7 +1186,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1214,7 +1214,7 @@ "edge": { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -1231,7 +1231,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -1254,7 +1254,7 @@ { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -1271,7 +1271,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -1395,7 +1395,7 @@ { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -1412,7 +1412,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -1566,7 +1566,7 @@ { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38", "src": { - "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34", + "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", "path": [ { "unquoted_string": { @@ -1583,7 +1583,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38", + "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", "path": [ { "unquoted_string": { @@ -1676,7 +1676,7 @@ "edge": { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1693,7 +1693,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1716,7 +1716,7 @@ { "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1733,7 +1733,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/scenarios/root.exp.json b/testdata/d2ir/TestCompile/scenarios/root.exp.json index a07597eab..9b077fb06 100644 --- a/testdata/d2ir/TestCompile/scenarios/root.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/root.exp.json @@ -14,7 +14,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -33,7 +33,7 @@ "edge": { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -50,7 +50,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -73,7 +73,7 @@ { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -90,7 +90,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -129,7 +129,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -148,7 +148,7 @@ "edge": { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -165,7 +165,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -188,7 +188,7 @@ { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -205,7 +205,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -252,7 +252,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -271,7 +271,7 @@ "edge": { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -288,7 +288,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -311,7 +311,7 @@ { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -328,7 +328,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -367,7 +367,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -386,7 +386,7 @@ "edge": { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -403,7 +403,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -426,7 +426,7 @@ { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -443,7 +443,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -490,7 +490,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35", "path": [ { "unquoted_string": { @@ -532,7 +532,7 @@ "key": { "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", "key": { - "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35", "path": [ { "unquoted_string": { @@ -591,7 +591,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35", "path": [ { "unquoted_string": { @@ -633,7 +633,7 @@ "key": { "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", "key": { - "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35", "path": [ { "unquoted_string": { @@ -692,7 +692,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35", "path": [ { "unquoted_string": { @@ -734,7 +734,7 @@ "key": { "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", "key": { - "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35", "path": [ { "unquoted_string": { @@ -798,7 +798,7 @@ "edge": { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -815,7 +815,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -838,7 +838,7 @@ { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -855,7 +855,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -938,7 +938,7 @@ "map_key": { "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", "key": { - "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35", "path": [ { "unquoted_string": { @@ -1005,7 +1005,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1024,7 +1024,7 @@ "edge": { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1041,7 +1041,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1064,7 +1064,7 @@ { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1081,7 +1081,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1120,7 +1120,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1139,7 +1139,7 @@ "edge": { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1156,7 +1156,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1179,7 +1179,7 @@ { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1196,7 +1196,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1235,7 +1235,7 @@ ] }, "key_path": { - "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57", + "range": "TestCompile/scenarios/root.d2,3:12:50-3:18:56", "path": [ { "unquoted_string": { @@ -1255,7 +1255,7 @@ "key": { "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57", "key": { - "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57", + "range": "TestCompile/scenarios/root.d2,3:12:50-3:18:56", "path": [ { "unquoted_string": { @@ -1297,7 +1297,7 @@ "edge": { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1314,7 +1314,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1337,7 +1337,7 @@ { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1354,7 +1354,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1437,7 +1437,7 @@ "map_key": { "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57", "key": { - "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57", + "range": "TestCompile/scenarios/root.d2,3:12:50-3:18:56", "path": [ { "unquoted_string": { @@ -1547,7 +1547,7 @@ "map_key": { "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", "key": { - "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35", "path": [ { "unquoted_string": { @@ -1621,7 +1621,7 @@ "map_key": { "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57", "key": { - "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57", + "range": "TestCompile/scenarios/root.d2,3:12:50-3:18:56", "path": [ { "unquoted_string": { @@ -1673,7 +1673,7 @@ "edge": { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1690,7 +1690,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1713,7 +1713,7 @@ { "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2", + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1730,7 +1730,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6", + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/steps/recursive.exp.json b/testdata/d2ir/TestCompile/steps/recursive.exp.json index 775a78b24..01c07121f 100644 --- a/testdata/d2ir/TestCompile/steps/recursive.exp.json +++ b/testdata/d2ir/TestCompile/steps/recursive.exp.json @@ -14,7 +14,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -33,7 +33,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -50,7 +50,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -73,7 +73,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -90,7 +90,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -129,7 +129,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -148,7 +148,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -165,7 +165,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -188,7 +188,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -205,7 +205,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -252,7 +252,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -271,7 +271,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -288,7 +288,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -311,7 +311,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -328,7 +328,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -367,7 +367,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -386,7 +386,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -403,7 +403,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -426,7 +426,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -443,7 +443,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -490,7 +490,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -532,7 +532,7 @@ "key": { "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -591,7 +591,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -633,7 +633,7 @@ "key": { "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -692,7 +692,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -734,7 +734,7 @@ "key": { "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -798,7 +798,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -815,7 +815,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -838,7 +838,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -855,7 +855,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -938,7 +938,7 @@ "map_key": { "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1005,7 +1005,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1024,7 +1024,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1041,7 +1041,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1064,7 +1064,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1081,7 +1081,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1120,7 +1120,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1139,7 +1139,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1156,7 +1156,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1179,7 +1179,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1196,7 +1196,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1243,7 +1243,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1285,7 +1285,7 @@ "key": { "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1344,7 +1344,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1386,7 +1386,7 @@ "key": { "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1445,7 +1445,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1487,7 +1487,7 @@ "key": { "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1609,7 +1609,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1628,7 +1628,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1645,7 +1645,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1668,7 +1668,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1685,7 +1685,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1724,7 +1724,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1743,7 +1743,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1760,7 +1760,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1783,7 +1783,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1800,7 +1800,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1847,7 +1847,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1889,7 +1889,7 @@ "key": { "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1948,7 +1948,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1990,7 +1990,7 @@ "key": { "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -2049,7 +2049,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -2091,7 +2091,7 @@ "key": { "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -2267,7 +2267,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -2284,7 +2284,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -2307,7 +2307,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -2324,7 +2324,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -2569,7 +2569,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -2586,7 +2586,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -2609,7 +2609,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -2626,7 +2626,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -2900,7 +2900,7 @@ "map_key": { "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -3107,7 +3107,7 @@ "edge": { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -3124,7 +3124,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -3147,7 +3147,7 @@ { "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -3164,7 +3164,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2ir/TestCompile/steps/root.exp.json b/testdata/d2ir/TestCompile/steps/root.exp.json index 697555a40..a4357ba31 100644 --- a/testdata/d2ir/TestCompile/steps/root.exp.json +++ b/testdata/d2ir/TestCompile/steps/root.exp.json @@ -14,7 +14,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -33,7 +33,7 @@ "edge": { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -50,7 +50,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -73,7 +73,7 @@ { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -90,7 +90,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -129,7 +129,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -148,7 +148,7 @@ "edge": { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -165,7 +165,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -188,7 +188,7 @@ { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -205,7 +205,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -252,7 +252,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -271,7 +271,7 @@ "edge": { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -288,7 +288,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -311,7 +311,7 @@ { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -328,7 +328,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -367,7 +367,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -386,7 +386,7 @@ "edge": { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -403,7 +403,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -426,7 +426,7 @@ { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -443,7 +443,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -490,7 +490,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -532,7 +532,7 @@ "key": { "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -591,7 +591,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -633,7 +633,7 @@ "key": { "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -692,7 +692,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -734,7 +734,7 @@ "key": { "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -798,7 +798,7 @@ "edge": { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -815,7 +815,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -838,7 +838,7 @@ { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -855,7 +855,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -938,7 +938,7 @@ "map_key": { "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1005,7 +1005,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1024,7 +1024,7 @@ "edge": { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1041,7 +1041,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1064,7 +1064,7 @@ { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1081,7 +1081,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1120,7 +1120,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1139,7 +1139,7 @@ "edge": { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1156,7 +1156,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1179,7 +1179,7 @@ { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1196,7 +1196,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1243,7 +1243,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1285,7 +1285,7 @@ "key": { "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1344,7 +1344,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1386,7 +1386,7 @@ "key": { "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1445,7 +1445,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1487,7 +1487,7 @@ "key": { "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1545,7 +1545,7 @@ ] }, "key_path": { - "range": "TestCompile/steps/root.d2,3:12:46-3:19:53", + "range": "TestCompile/steps/root.d2,3:12:46-3:18:52", "path": [ { "unquoted_string": { @@ -1565,7 +1565,7 @@ "key": { "range": "TestCompile/steps/root.d2,3:12:46-3:19:53", "key": { - "range": "TestCompile/steps/root.d2,3:12:46-3:19:53", + "range": "TestCompile/steps/root.d2,3:12:46-3:18:52", "path": [ { "unquoted_string": { @@ -1607,7 +1607,7 @@ "edge": { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1624,7 +1624,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1647,7 +1647,7 @@ { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -1664,7 +1664,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -1747,7 +1747,7 @@ "map_key": { "range": "TestCompile/steps/root.d2,3:12:46-3:19:53", "key": { - "range": "TestCompile/steps/root.d2,3:12:46-3:19:53", + "range": "TestCompile/steps/root.d2,3:12:46-3:18:52", "path": [ { "unquoted_string": { @@ -1857,7 +1857,7 @@ "map_key": { "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", "key": { - "range": "TestCompile/steps/root.d2,2:10:26-2:16:32", + "range": "TestCompile/steps/root.d2,2:10:26-2:15:31", "path": [ { "unquoted_string": { @@ -1931,7 +1931,7 @@ "map_key": { "range": "TestCompile/steps/root.d2,3:12:46-3:19:53", "key": { - "range": "TestCompile/steps/root.d2,3:12:46-3:19:53", + "range": "TestCompile/steps/root.d2,3:12:46-3:18:52", "path": [ { "unquoted_string": { @@ -1983,7 +1983,7 @@ "edge": { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -2000,7 +2000,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -2023,7 +2023,7 @@ { "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:2:2", + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -2040,7 +2040,7 @@ }, "src_arrow": "", "dst": { - "range": "TestCompile/steps/root.d2,0:4:4-0:6:6", + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index a27ba3057..67de3a5ee 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:2:7-1:8:13", "src": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { @@ -195,7 +195,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -242,7 +242,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 0a36050a2..dd86c4758 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -46,7 +46,7 @@ { "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:2:12-1:8:18", "src": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:2:12-1:4:14", + "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:2:12-1:3:13", "path": [ { "unquoted_string": { @@ -63,7 +63,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:6:16-1:8:18", + "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:7:17-1:8:18", "path": [ { "unquoted_string": { @@ -205,7 +205,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:2:12-1:4:14", + "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:2:12-1:3:13", "path": [ { "unquoted_string": { @@ -252,7 +252,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:6:16-1:8:18", + "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:7:17-1:8:18", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index 15e79deed..bd65e7873 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index f67e5d529..811197336 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -9,7 +9,7 @@ "map_key": { "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-0:18:18", "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-0:10:10", + "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-0:9:9", "path": [ { "unquoted_string": { @@ -28,7 +28,7 @@ { "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:11:11-0:17:17", "src": { - "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:11:11-0:13:13", + "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:11:11-0:12:12", "path": [ { "unquoted_string": { @@ -45,7 +45,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:15:15-0:17:17", + "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:16:16-0:17:17", "path": [ { "unquoted_string": { @@ -135,7 +135,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-0:10:10", + "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-0:9:9", "path": [ { "unquoted_string": { @@ -182,7 +182,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:11:11-0:13:13", + "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:11:11-0:12:12", "path": [ { "unquoted_string": { @@ -229,7 +229,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:15:15-0:17:17", + "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:16:16-0:17:17", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index d6026c51c..1ae389403 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:2:15-1:8:21", "src": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:2:15-1:4:17", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:2:15-1:3:16", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:6:19-1:8:21", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:7:20-1:8:21", "path": [ { "unquoted_string": { @@ -195,7 +195,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:2:15-1:4:17", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:2:15-1:3:16", "path": [ { "unquoted_string": { @@ -242,7 +242,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:6:19-1:8:21", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:7:20-1:8:21", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index c35a7b9bb..ace2f2ebe 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:2:15-1:8:21", "src": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:2:15-1:4:17", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:2:15-1:3:16", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:6:19-1:8:21", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:7:20-1:8:21", "path": [ { "unquoted_string": { @@ -195,7 +195,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:2:15-1:4:17", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:2:15-1:3:16", "path": [ { "unquoted_string": { @@ -242,7 +242,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:6:19-1:8:21", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:7:20-1:8:21", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index 580de558b..966bef34f 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -47,7 +47,7 @@ { "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:2:9-1:8:15", "src": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:2:9-1:4:11", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:2:9-1:3:10", "path": [ { "unquoted_string": { @@ -64,7 +64,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:6:13-1:8:15", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:7:14-1:8:15", "path": [ { "unquoted_string": { @@ -275,7 +275,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:2:9-1:4:11", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:2:9-1:3:10", "path": [ { "unquoted_string": { @@ -322,7 +322,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:6:13-1:8:15", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:7:14-1:8:15", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index d24660ebe..87e16b21a 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -55,7 +55,7 @@ "map_key": { "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:0:7-1:14:21", "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:0:7-1:6:13", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:0:7-1:5:12", "path": [ { "unquoted_string": { @@ -74,7 +74,7 @@ { "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:7:14-1:13:20", "src": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:7:14-1:9:16", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:7:14-1:8:15", "path": [ { "unquoted_string": { @@ -91,7 +91,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:11:18-1:13:20", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:12:19-1:13:20", "path": [ { "unquoted_string": { @@ -117,7 +117,7 @@ "map_key": { "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:0:22-2:14:36", "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:0:22-2:6:28", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:0:22-2:5:27", "path": [ { "unquoted_string": { @@ -136,7 +136,7 @@ { "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:7:29-2:13:35", "src": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:7:29-2:9:31", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:7:29-2:8:30", "path": [ { "unquoted_string": { @@ -153,7 +153,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:11:33-2:13:35", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:12:34-2:13:35", "path": [ { "unquoted_string": { @@ -179,7 +179,7 @@ "map_key": { "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:0:37-3:14:51", "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:0:37-3:6:43", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:0:37-3:5:42", "path": [ { "unquoted_string": { @@ -198,7 +198,7 @@ { "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:7:44-3:13:50", "src": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:7:44-3:9:46", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:7:44-3:8:45", "path": [ { "unquoted_string": { @@ -215,7 +215,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:11:48-3:13:50", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:12:49-3:13:50", "path": [ { "unquoted_string": { @@ -401,7 +401,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -448,7 +448,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -495,7 +495,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:0:7-1:6:13", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:0:7-1:5:12", "path": [ { "unquoted_string": { @@ -515,7 +515,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:0:22-2:6:28", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:0:22-2:5:27", "path": [ { "unquoted_string": { @@ -535,7 +535,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:0:37-3:6:43", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:0:37-3:5:42", "path": [ { "unquoted_string": { @@ -582,7 +582,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:7:14-1:9:16", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:7:14-1:8:15", "path": [ { "unquoted_string": { @@ -602,7 +602,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:7:29-2:9:31", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:7:29-2:8:30", "path": [ { "unquoted_string": { @@ -622,7 +622,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:7:44-3:9:46", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:7:44-3:8:45", "path": [ { "unquoted_string": { @@ -669,7 +669,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:11:18-1:13:20", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:12:19-1:13:20", "path": [ { "unquoted_string": { @@ -689,7 +689,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:11:33-2:13:35", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:12:34-2:13:35", "path": [ { "unquoted_string": { @@ -709,7 +709,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:11:48-3:13:50", + "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:12:49-3:13:50", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json index e9c991074..55ca77da0 100644 --- a/testdata/d2oracle/TestDelete/arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json index ee16c6be0..cae034940 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -189,7 +189,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -236,7 +236,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json index 148b37cf2..22c22b4e1 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json index 748dc7359..6b3c4f832 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json index 281f52204..37e9a36c1 100644 --- a/testdata/d2oracle/TestDelete/chaos_1.exp.json +++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json @@ -74,7 +74,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:0:22-1:9:31", "src": { - "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:0:22-1:3:25", + "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:0:22-1:2:24", "path": [ { "unquoted_string": { @@ -91,7 +91,7 @@ }, "src_arrow": "<", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:6:28-1:9:31", + "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:7:29-1:9:31", "path": [ { "unquoted_string": { @@ -350,7 +350,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:0:22-1:3:25", + "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:0:22-1:2:24", "path": [ { "unquoted_string": { @@ -370,7 +370,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:6:28-1:9:31", + "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:7:29-1:9:31", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index 59151d5ca..1c006a1ac 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -35,7 +35,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:0:10-1:6:16", "src": { - "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:0:10-1:2:12", + "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:0:10-1:1:11", "path": [ { "unquoted_string": { @@ -52,7 +52,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:4:14-1:6:16", + "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:5:15-1:6:16", "path": [ { "unquoted_string": { @@ -189,7 +189,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:0:10-1:2:12", + "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:0:10-1:1:11", "path": [ { "unquoted_string": { @@ -236,7 +236,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:4:14-1:6:16", + "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:5:15-1:6:16", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 577ecc875..c761202f4 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-0:8:8", "src": { - "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:6:6-0:8:8", + "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -175,7 +175,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -242,7 +242,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:6:6-0:8:8", + "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index c04e1106e..13ca0d7c8 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:15:15", "edges": [ { - "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:9:9", + "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:8:8", "src": { - "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -47,9 +47,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:6:6-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:7:7-0:15:15", "src": { - "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -66,7 +66,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:11:11-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:12:12-0:15:15", "path": [ { "unquoted_string": { @@ -300,7 +300,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -367,7 +367,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -387,7 +387,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -434,7 +434,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:11:11-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:12:12-0:15:15", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index f1dda9f2b..e71f7802c 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-0:10:10", "src": { - "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:6:6-0:10:10", + "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { @@ -244,7 +244,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -331,7 +331,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:6:6-0:10:10", + "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:7:7-0:10:10", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 7557b9508..630970e3d 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -70,7 +70,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:2:21-2:8:27", "src": { - "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:2:21-2:4:23", + "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:2:21-2:3:22", "path": [ { "unquoted_string": { @@ -87,7 +87,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:6:25-2:8:27", + "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:7:26-2:8:27", "path": [ { "unquoted_string": { @@ -345,7 +345,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:2:21-2:4:23", + "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:2:21-2:3:22", "path": [ { "unquoted_string": { @@ -392,7 +392,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:6:25-2:8:27", + "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:7:26-2:8:27", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json index f070f1b82..fcf34e63f 100644 --- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json @@ -45,7 +45,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:0:16-1:25:41", "src": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:0:16-1:12:28", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:0:16-1:11:27", "path": [ { "unquoted_string": { @@ -62,7 +62,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:14:30-1:25:41", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:15:31-1:25:41", "path": [ { "unquoted_string": { @@ -91,7 +91,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:0:43-3:35:78", "src": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:0:43-3:6:49", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:0:43-3:5:48", "path": [ { "unquoted_string": { @@ -108,7 +108,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:8:51-3:35:78", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:9:52-3:35:78", "path": [ { "unquoted_string": { @@ -135,9 +135,9 @@ "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:33:113", "edges": [ { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:24:104", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:23:103", "src": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:10:90", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:9:89", "path": [ { "unquoted_string": { @@ -154,7 +154,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:12:92-5:24:104", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:13:93-5:23:103", "path": [ { "unquoted_string": { @@ -172,9 +172,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:12:92-5:33:113", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:13:93-5:33:113", "src": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:12:92-5:24:104", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:13:93-5:23:103", "path": [ { "unquoted_string": { @@ -191,7 +191,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:26:106-5:33:113", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:27:107-5:33:113", "path": [ { "unquoted_string": { @@ -218,9 +218,9 @@ "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:59:174", "edges": [ { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:23:138", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:22:137", "src": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:7:122", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:6:121", "path": [ { "unquoted_string": { @@ -237,7 +237,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:9:124-7:23:138", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:10:125-7:22:137", "path": [ { "unquoted_string": { @@ -255,9 +255,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:9:124-7:47:162", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:10:125-7:46:161", "src": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:9:124-7:23:138", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:10:125-7:22:137", "path": [ { "unquoted_string": { @@ -274,7 +274,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:25:140-7:47:162", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:26:141-7:46:161", "path": [ { "unquoted_string": { @@ -292,9 +292,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:25:140-7:59:174", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:26:141-7:59:174", "src": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:25:140-7:47:162", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:26:141-7:46:161", "path": [ { "unquoted_string": { @@ -311,7 +311,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:49:164-7:59:174", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:50:165-7:59:174", "path": [ { "unquoted_string": { @@ -338,9 +338,9 @@ "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:41:216", "edges": [ { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:29:204", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:28:203", "src": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:7:182", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:6:181", "path": [ { "unquoted_string": { @@ -357,7 +357,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:9:184-8:29:204", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:10:185-8:28:203", "path": [ { "unquoted_string": { @@ -375,9 +375,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:9:184-8:41:216", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:10:185-8:41:216", "src": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:9:184-8:29:204", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:10:185-8:28:203", "path": [ { "unquoted_string": { @@ -394,7 +394,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:31:206-8:41:216", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:32:207-8:41:216", "path": [ { "unquoted_string": { @@ -784,7 +784,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:0:16-1:12:28", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:0:16-1:11:27", "path": [ { "unquoted_string": { @@ -831,7 +831,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:14:30-1:25:41", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:15:31-1:25:41", "path": [ { "unquoted_string": { @@ -878,7 +878,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:0:43-3:6:49", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:0:43-3:5:48", "path": [ { "unquoted_string": { @@ -925,7 +925,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:8:51-3:35:78", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:9:52-3:35:78", "path": [ { "unquoted_string": { @@ -972,7 +972,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:10:90", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:9:89", "path": [ { "unquoted_string": { @@ -992,7 +992,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:49:164-7:59:174", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:50:165-7:59:174", "path": [ { "unquoted_string": { @@ -1039,7 +1039,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:12:92-5:24:104", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:13:93-5:23:103", "path": [ { "unquoted_string": { @@ -1059,7 +1059,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:12:92-5:24:104", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:13:93-5:23:103", "path": [ { "unquoted_string": { @@ -1106,7 +1106,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:26:106-5:33:113", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:27:107-5:33:113", "path": [ { "unquoted_string": { @@ -1126,7 +1126,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:7:122", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:6:121", "path": [ { "unquoted_string": { @@ -1146,7 +1146,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:7:182", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:6:181", "path": [ { "unquoted_string": { @@ -1193,7 +1193,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:9:124-7:23:138", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:10:125-7:22:137", "path": [ { "unquoted_string": { @@ -1213,7 +1213,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:9:124-7:23:138", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:10:125-7:22:137", "path": [ { "unquoted_string": { @@ -1306,7 +1306,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:25:140-7:47:162", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:26:141-7:46:161", "path": [ { "unquoted_string": { @@ -1326,7 +1326,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:25:140-7:47:162", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:26:141-7:46:161", "path": [ { "unquoted_string": { @@ -1373,7 +1373,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:9:184-8:29:204", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:10:185-8:28:203", "path": [ { "unquoted_string": { @@ -1393,7 +1393,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:9:184-8:29:204", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:10:185-8:28:203", "path": [ { "unquoted_string": { @@ -1440,7 +1440,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:31:206-8:41:216", + "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:32:207-8:41:216", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json index d933367e3..3ed8aed31 100644 --- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json +++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index 6742da8ec..a93ec9cbe 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:12:12", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -51,7 +51,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:8:8-0:12:12", + "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { @@ -152,7 +152,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -194,7 +194,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:8:8-0:12:12", + "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { @@ -252,7 +252,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -321,7 +321,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -390,7 +390,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:8:8-0:12:12", + "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index ac36a9a41..09f4f71c8 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index 0577b3292..b59e40e5b 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 8a1b3829f..7a57da3ae 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:14:14", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -40,7 +40,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:8:8-0:14:14", + "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:9:9-0:14:14", "path": [ { "unquoted_string": { @@ -164,7 +164,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -195,7 +195,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:8:8-0:14:14", + "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:9:9-0:14:14", "path": [ { "unquoted_string": { @@ -253,7 +253,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -311,7 +311,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:8:8-0:14:14", + "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:9:9-0:14:14", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 1eaab9e89..0244a8b63 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -58,7 +58,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:0:7-1:6:13", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:0:7-1:2:9", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:0:7-1:1:8", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:4:11-1:6:13", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:5:12-1:6:13", "path": [ { "unquoted_string": { @@ -104,7 +104,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:0:15-3:6:21", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:0:15-3:2:17", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:0:15-3:1:16", "path": [ { "unquoted_string": { @@ -121,7 +121,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:4:19-3:6:21", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:5:20-3:6:21", "path": [ { "unquoted_string": { @@ -150,7 +150,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:0:22-4:6:28", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:0:22-4:2:24", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:0:22-4:1:23", "path": [ { "unquoted_string": { @@ -167,7 +167,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:4:26-4:6:28", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:5:27-4:6:28", "path": [ { "unquoted_string": { @@ -196,7 +196,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:1:30-5:7:36", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:1:30-5:3:32", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:1:30-5:2:31", "path": [ { "unquoted_string": { @@ -213,7 +213,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:5:34-5:7:36", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:6:35-5:7:36", "path": [ { "unquoted_string": { @@ -257,7 +257,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:1:48-6:7:54", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:1:48-6:3:50", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:1:48-6:2:49", "path": [ { "unquoted_string": { @@ -274,7 +274,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:5:52-6:7:54", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:6:53-6:7:54", "path": [ { "unquoted_string": { @@ -318,7 +318,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:1:66-8:7:72", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:1:66-8:3:68", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:1:66-8:2:67", "path": [ { "unquoted_string": { @@ -335,7 +335,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:5:70-8:7:72", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:6:71-8:7:72", "path": [ { "unquoted_string": { @@ -379,7 +379,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:1:85-9:7:91", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:1:85-9:3:87", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:1:85-9:2:86", "path": [ { "unquoted_string": { @@ -396,7 +396,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:5:89-9:7:91", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:6:90-9:7:91", "path": [ { "unquoted_string": { @@ -609,7 +609,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -629,7 +629,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:0:7-1:2:9", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:0:7-1:1:8", "path": [ { "unquoted_string": { @@ -649,7 +649,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:0:15-3:2:17", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:0:15-3:1:16", "path": [ { "unquoted_string": { @@ -669,7 +669,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:0:22-4:2:24", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:0:22-4:1:23", "path": [ { "unquoted_string": { @@ -689,7 +689,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:1:30-5:3:32", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:1:30-5:2:31", "path": [ { "unquoted_string": { @@ -709,7 +709,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:1:48-6:3:50", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:1:48-6:2:49", "path": [ { "unquoted_string": { @@ -729,7 +729,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:1:66-8:3:68", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:1:66-8:2:67", "path": [ { "unquoted_string": { @@ -749,7 +749,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:1:85-9:3:87", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:1:85-9:2:86", "path": [ { "unquoted_string": { @@ -796,7 +796,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -816,7 +816,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:4:11-1:6:13", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:5:12-1:6:13", "path": [ { "unquoted_string": { @@ -836,7 +836,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:4:19-3:6:21", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:5:20-3:6:21", "path": [ { "unquoted_string": { @@ -856,7 +856,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:4:26-4:6:28", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:5:27-4:6:28", "path": [ { "unquoted_string": { @@ -876,7 +876,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:5:34-5:7:36", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:6:35-5:7:36", "path": [ { "unquoted_string": { @@ -896,7 +896,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:5:52-6:7:54", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:6:53-6:7:54", "path": [ { "unquoted_string": { @@ -916,7 +916,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:5:70-8:7:72", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:6:71-8:7:72", "path": [ { "unquoted_string": { @@ -936,7 +936,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:5:89-9:7:91", + "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:6:90-9:7:91", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 2d55e252c..72ea2342f 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -79,9 +79,9 @@ "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:22:22", "edges": [ { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:18:18", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:17:17", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:13:13", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:12:12", "path": [ { "unquoted_string": { @@ -98,7 +98,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:15:15-0:18:18", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:16:16-0:17:17", "path": [ { "unquoted_string": { @@ -116,9 +116,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:15:15-0:22:22", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:16:16-0:22:22", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:15:15-0:18:18", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:16:16-0:17:17", "path": [ { "unquoted_string": { @@ -135,7 +135,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:20:20-0:22:22", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:21:21-0:22:22", "path": [ { "unquoted_string": { @@ -516,7 +516,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:13:13", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:12:12", "path": [ { "unquoted_string": { @@ -563,7 +563,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:15:15-0:18:18", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:16:16-0:17:17", "path": [ { "unquoted_string": { @@ -583,7 +583,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:15:15-0:18:18", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:16:16-0:17:17", "path": [ { "unquoted_string": { @@ -630,7 +630,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:20:20-0:22:22", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:21:21-0:22:22", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 64b346930..05ab2e21b 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:12:12", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -51,7 +51,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:8:8-0:12:12", + "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { @@ -152,7 +152,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -221,7 +221,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -290,7 +290,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -359,7 +359,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:8:8-0:12:12", + "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { @@ -417,7 +417,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:8:8-0:12:12", + "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index b0339c5b1..3d0d0f277 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 116cd398e..38149e7d9 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -56,9 +56,9 @@ "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:24:24", "edges": [ { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:14:14", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:10:10", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:9:9", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:12:12-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:13:13-0:14:14", "path": [ { "unquoted_string": { @@ -93,9 +93,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:12:12-0:20:20", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:13:13-0:19:19", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:12:12-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:13:13-0:14:14", "path": [ { "unquoted_string": { @@ -112,7 +112,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:17:17-0:20:20", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:18:18-0:19:19", "path": [ { "unquoted_string": { @@ -130,9 +130,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:17:17-0:24:24", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:18:18-0:24:24", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:17:17-0:20:20", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:18:18-0:19:19", "path": [ { "unquoted_string": { @@ -149,7 +149,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:22:22-0:24:24", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:23:23-0:24:24", "path": [ { "unquoted_string": { @@ -538,7 +538,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:10:10", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:9:9", "path": [ { "unquoted_string": { @@ -585,7 +585,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:12:12-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:13:13-0:14:14", "path": [ { "unquoted_string": { @@ -605,7 +605,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:12:12-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:13:13-0:14:14", "path": [ { "unquoted_string": { @@ -652,7 +652,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:17:17-0:20:20", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:18:18-0:19:19", "path": [ { "unquoted_string": { @@ -672,7 +672,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:17:17-0:20:20", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:18:18-0:19:19", "path": [ { "unquoted_string": { @@ -719,7 +719,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:22:22-0:24:24", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:23:23-0:24:24", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index b34908eab..777eb0db8 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 5b25a1b51..5684d997c 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -56,9 +56,9 @@ "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:19:19", "edges": [ { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:14:14", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:10:10", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:9:9", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:12:12-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:13:13-0:14:14", "path": [ { "unquoted_string": { @@ -93,9 +93,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:12:12-0:19:19", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:13:13-0:19:19", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:12:12-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:13:13-0:14:14", "path": [ { "unquoted_string": { @@ -112,7 +112,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:17:17-0:19:19", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:18:18-0:19:19", "path": [ { "unquoted_string": { @@ -141,7 +141,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:21:21-0:27:27", "src": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:21:21-0:23:23", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:21:21-0:22:22", "path": [ { "unquoted_string": { @@ -158,7 +158,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:25:25-0:27:27", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:26:26-0:27:27", "path": [ { "unquoted_string": { @@ -524,7 +524,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:10:10", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:9:9", "path": [ { "unquoted_string": { @@ -571,7 +571,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:12:12-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:13:13-0:14:14", "path": [ { "unquoted_string": { @@ -591,7 +591,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:12:12-0:15:15", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:13:13-0:14:14", "path": [ { "unquoted_string": { @@ -638,7 +638,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:17:17-0:19:19", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:18:18-0:19:19", "path": [ { "unquoted_string": { @@ -685,7 +685,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:21:21-0:23:23", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:21:21-0:22:22", "path": [ { "unquoted_string": { @@ -732,7 +732,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:25:25-0:27:27", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:26:26-0:27:27", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 08ee89d3d..294f462a7 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index 20fbe284e..790c640a3 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -35,7 +35,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:0:2-1:6:8", "src": { - "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:0:2-1:2:4", + "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:0:2-1:1:3", "path": [ { "unquoted_string": { @@ -52,7 +52,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:4:6-1:6:8", + "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:5:7-1:6:8", "path": [ { "unquoted_string": { @@ -189,7 +189,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:0:2-1:2:4", + "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:0:2-1:1:3", "path": [ { "unquoted_string": { @@ -236,7 +236,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:4:6-1:6:8", + "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:5:7-1:6:8", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index d19aea41f..d9e60c63c 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:2:7-1:8:13", "src": { - "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { @@ -195,7 +195,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -242,7 +242,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index 691e5ab52..96becc9d0 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -58,7 +58,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:0:7-1:6:13", "src": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:0:7-1:2:9", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:0:7-1:1:8", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:4:11-1:6:13", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:5:12-1:6:13", "path": [ { "unquoted_string": { @@ -249,7 +249,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -296,7 +296,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -343,7 +343,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:0:7-1:2:9", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:0:7-1:1:8", "path": [ { "unquoted_string": { @@ -390,7 +390,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:4:11-1:6:13", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:5:12-1:6:13", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 8dc6bd161..92bb37fcc 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:16:16", "edges": [ { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:7:7", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -47,9 +47,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:4:4-0:12:12", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:5:5-0:11:11", "src": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -66,7 +66,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:9:9-0:12:12", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -84,9 +84,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:9:9-0:16:16", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:10:10-0:16:16", "src": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:9:9-0:12:12", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -103,7 +103,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:14:14-0:16:16", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { @@ -320,7 +320,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -367,7 +367,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -387,7 +387,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -434,7 +434,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:9:9-0:12:12", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -454,7 +454,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:9:9-0:12:12", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -501,7 +501,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:14:14-0:16:16", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:15:15-0:16:16", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index fdbb6c2d5..42e4680c7 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -108,7 +108,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:0:31-2:6:37", "src": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:0:31-2:2:33", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:0:31-2:1:32", "path": [ { "unquoted_string": { @@ -125,7 +125,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:4:35-2:6:37", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:5:36-2:6:37", "path": [ { "unquoted_string": { @@ -235,7 +235,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:0:31-2:2:33", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:0:31-2:1:32", "path": [ { "unquoted_string": { @@ -306,7 +306,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:4:35-2:6:37", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:5:36-2:6:37", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 34ac25510..47aec3c7c 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -58,7 +58,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:0:4-2:6:10", "src": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:0:4-2:2:6", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:0:4-2:1:5", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:4:8-2:6:10", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:5:9-2:6:10", "path": [ { "unquoted_string": { @@ -239,7 +239,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:0:4-2:2:6", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:0:4-2:1:5", "path": [ { "unquoted_string": { @@ -306,7 +306,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:4:8-2:6:10", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:5:9-2:6:10", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index 11726eded..88dbcf13d 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -35,7 +35,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:0:2-1:6:8", "src": { - "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:0:2-1:2:4", + "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:0:2-1:1:3", "path": [ { "unquoted_string": { @@ -52,7 +52,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:4:6-1:6:8", + "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:5:7-1:6:8", "path": [ { "unquoted_string": { @@ -189,7 +189,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:0:2-1:2:4", + "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:0:2-1:1:3", "path": [ { "unquoted_string": { @@ -236,7 +236,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:4:6-1:6:8", + "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:5:7-1:6:8", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index 144fd9070..c9e2dbffd 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:2:7-1:8:13", "src": { - "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { @@ -82,7 +82,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:2:16-2:8:22", "src": { - "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:2:16-2:4:18", + "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:2:16-2:3:17", "path": [ { "unquoted_string": { @@ -99,7 +99,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:6:20-2:8:22", + "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:7:21-2:8:22", "path": [ { "unquoted_string": { @@ -273,7 +273,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -320,7 +320,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { @@ -367,7 +367,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:2:16-2:4:18", + "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:2:16-2:3:17", "path": [ { "unquoted_string": { @@ -414,7 +414,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:6:20-2:8:22", + "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:7:21-2:8:22", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 7b51e91f9..6d1681ec5 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -204,7 +204,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:2:97-7:27:122", "src": { - "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:2:97-7:19:114", + "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:2:97-7:18:113", "path": [ { "unquoted_string": { @@ -221,7 +221,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:21:116-7:27:122", + "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:22:117-7:27:122", "path": [ { "unquoted_string": { @@ -414,7 +414,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:21:116-7:27:122", + "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:22:117-7:27:122", "path": [ { "unquoted_string": { @@ -493,7 +493,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:2:97-7:19:114", + "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:2:97-7:18:113", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index d05524d74..942865d1e 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -35,7 +35,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:0:2-1:6:8", "src": { - "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:0:2-1:2:4", + "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:0:2-1:1:3", "path": [ { "unquoted_string": { @@ -52,7 +52,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:4:6-1:6:8", + "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:5:7-1:6:8", "path": [ { "unquoted_string": { @@ -81,7 +81,7 @@ { "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:0:9-2:6:15", "src": { - "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:0:9-2:2:11", + "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:0:9-2:1:10", "path": [ { "unquoted_string": { @@ -98,7 +98,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:4:13-2:6:15", + "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:5:14-2:6:15", "path": [ { "unquoted_string": { @@ -267,7 +267,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:0:2-1:2:4", + "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:0:2-1:1:3", "path": [ { "unquoted_string": { @@ -314,7 +314,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:4:6-1:6:8", + "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:5:7-1:6:8", "path": [ { "unquoted_string": { @@ -361,7 +361,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:0:9-2:2:11", + "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:0:9-2:1:10", "path": [ { "unquoted_string": { @@ -408,7 +408,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:4:13-2:6:15", + "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:5:14-2:6:15", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index 031cbc070..b9f6efb5c 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:11:11", "edges": [ { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:7:7", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -47,9 +47,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:4:4-0:11:11", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:5:5-0:11:11", "src": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -66,7 +66,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -211,7 +211,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -231,7 +231,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -278,7 +278,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -298,7 +298,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index 5810e288e..7cc0e336c 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:13:13", "edges": [ { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:8:8", "src": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -40,7 +40,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -58,9 +58,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:6:6-0:13:13", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:7:7-0:13:13", "src": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -77,7 +77,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:11:11-0:13:13", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { @@ -199,7 +199,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -257,7 +257,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -315,7 +315,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -335,7 +335,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -382,7 +382,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:11:11-0:13:13", + "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index de374c82f..586175cd4 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -142,7 +142,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -189,7 +189,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index bc9126e8a..beb4e5634 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:12:17", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:10:15-1:12:17", + "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:11:16-1:12:17", "path": [ { "unquoted_string": { @@ -240,7 +240,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { @@ -329,7 +329,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { @@ -398,7 +398,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:10:15-1:12:17", + "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:11:16-1:12:17", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index c8b153273..03f9339cf 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index ce721c308..dcc512ba0 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:11:11", "edges": [ { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:7:7", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -47,9 +47,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:4:4-0:11:11", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:5:5-0:11:11", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -66,7 +66,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -188,7 +188,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -235,7 +235,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -255,7 +255,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -302,7 +302,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index 653ab7d08..df87ea83e 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -34,9 +34,9 @@ "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:17:22", "edges": [ { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:10:15", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:6:11", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:5:10", "path": [ { "unquoted_string": { @@ -64,7 +64,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:8:13-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { @@ -82,9 +82,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:8:13-1:17:22", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:9:14-1:17:22", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:8:13-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { @@ -101,7 +101,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:13:18-1:17:22", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:14:19-1:17:22", "path": [ { "unquoted_string": { @@ -286,7 +286,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:6:11", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:5:10", "path": [ { "unquoted_string": { @@ -317,7 +317,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:13:18-1:17:22", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:14:19-1:17:22", "path": [ { "unquoted_string": { @@ -375,7 +375,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:8:13-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { @@ -395,7 +395,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:8:13-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index d49f6a447..2cae2052f 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:13:13", "edges": [ { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:8:8", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -40,7 +40,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -58,9 +58,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:6:6-0:13:13", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:7:7-0:13:13", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -77,7 +77,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:11:11-0:13:13", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { @@ -222,7 +222,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -300,7 +300,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -358,7 +358,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -378,7 +378,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:6:6-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -425,7 +425,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:11:11-0:13:13", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index 575675351..1b5d9b69f 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -34,9 +34,9 @@ "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:15:20", "edges": [ { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:10:15", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:6:11-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:7:12-1:10:15", "path": [ { "unquoted_string": { @@ -82,9 +82,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:6:11-1:15:20", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:7:12-1:15:20", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:6:11-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:7:12-1:10:15", "path": [ { "unquoted_string": { @@ -112,7 +112,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:13:18-1:15:20", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:14:19-1:15:20", "path": [ { "unquoted_string": { @@ -286,7 +286,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -333,7 +333,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:6:11-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:7:12-1:10:15", "path": [ { "unquoted_string": { @@ -364,7 +364,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:6:11-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:7:12-1:10:15", "path": [ { "unquoted_string": { @@ -422,7 +422,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:13:18-1:15:20", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:14:19-1:15:20", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index a908608d3..cc2aab88b 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:14:14", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -40,7 +40,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:8:8-0:14:14", + "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:9:9-0:14:14", "path": [ { "unquoted_string": { @@ -193,7 +193,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -224,7 +224,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:8:8-0:14:14", + "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:9:9-0:14:14", "path": [ { "unquoted_string": { @@ -282,7 +282,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -340,7 +340,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:8:8-0:14:14", + "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:9:9-0:14:14", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 8c1cfb37a..943587e97 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -64,7 +64,7 @@ { "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:8:19", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:4:15", + "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:3:14", "path": [ { "unquoted_string": { @@ -92,7 +92,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:6:17-3:8:19", + "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:7:18-3:8:19", "path": [ { "unquoted_string": { @@ -202,7 +202,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:4:15", + "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:3:14", "path": [ { "unquoted_string": { @@ -307,7 +307,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:4:15", + "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:3:14", "path": [ { "unquoted_string": { @@ -365,7 +365,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:6:17-3:8:19", + "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:7:18-3:8:19", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index 24a4ba70e..fbe8d3aeb 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:2:7-1:8:13", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { @@ -195,7 +195,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -242,7 +242,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index fbf01a18f..76f20e41e 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:2:7-1:10:15", "src": { - "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:2:7-1:6:11", + "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:2:7-1:5:10", "path": [ { "unquoted_string": { @@ -64,7 +64,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:8:13-1:10:15", + "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { @@ -206,7 +206,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:2:7-1:6:11", + "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:2:7-1:5:10", "path": [ { "unquoted_string": { @@ -264,7 +264,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:8:13-1:10:15", + "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index 9ae346bc4..dca6fdaa0 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -59,7 +59,7 @@ { "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:2:11-2:10:19", "src": { - "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:2:11-2:6:15", + "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:2:11-2:5:14", "path": [ { "unquoted_string": { @@ -87,7 +87,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:8:17-2:10:19", + "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:9:18-2:10:19", "path": [ { "unquoted_string": { @@ -121,7 +121,7 @@ { "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:0:22-4:8:30", "src": { - "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:0:22-4:2:24", + "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:0:22-4:1:23", "path": [ { "unquoted_string": { @@ -138,7 +138,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:4:26-4:8:30", + "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:5:27-4:8:30", "path": [ { "unquoted_string": { @@ -314,7 +314,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:4:26-4:8:30", + "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:5:27-4:8:30", "path": [ { "unquoted_string": { @@ -419,7 +419,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:2:11-2:6:15", + "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:2:11-2:5:14", "path": [ { "unquoted_string": { @@ -450,7 +450,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:0:22-4:2:24", + "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:0:22-4:1:23", "path": [ { "unquoted_string": { @@ -517,7 +517,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:8:17-2:10:19", + "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:9:18-2:10:19", "path": [ { "unquoted_string": { @@ -537,7 +537,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:4:26-4:8:30", + "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:5:27-4:8:30", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index 7f572e447..f0eeecdc3 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:14:14", "src": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -51,7 +51,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:8:8-0:14:14", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:9:9-0:14:14", "path": [ { "unquoted_string": { @@ -220,7 +220,7 @@ { "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:10:53", "src": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:4:47", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:3:46", "path": [ { "unquoted_string": { @@ -248,7 +248,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:6:49-6:10:53", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:7:50-6:10:53", "path": [ { "unquoted_string": { @@ -288,7 +288,7 @@ { "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:8:63", "src": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:4:59", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:3:58", "path": [ { "unquoted_string": { @@ -316,7 +316,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:6:61-8:8:63", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:7:62-8:8:63", "path": [ { "unquoted_string": { @@ -470,7 +470,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -539,7 +539,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -608,7 +608,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -677,7 +677,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:8:8-0:14:14", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:9:9-0:14:14", "path": [ { "unquoted_string": { @@ -739,7 +739,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:6:61-8:8:63", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:7:62-8:8:63", "path": [ { "unquoted_string": { @@ -786,7 +786,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:8:8-0:14:14", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:9:9-0:14:14", "path": [ { "unquoted_string": { @@ -855,7 +855,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:8:8-0:14:14", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:9:9-0:14:14", "path": [ { "unquoted_string": { @@ -991,7 +991,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:4:47", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:3:46", "path": [ { "unquoted_string": { @@ -1022,7 +1022,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:4:59", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:3:58", "path": [ { "unquoted_string": { @@ -1100,7 +1100,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:6:49-6:10:53", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:7:50-6:10:53", "path": [ { "unquoted_string": { @@ -1158,7 +1158,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:4:47", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:3:46", "path": [ { "unquoted_string": { @@ -1216,7 +1216,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:6:49-6:10:53", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:7:50-6:10:53", "path": [ { "unquoted_string": { @@ -1274,7 +1274,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:4:59", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:3:58", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json index a309e0c34..518469ce4 100644 --- a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json +++ b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:20:20", "src": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:8:8", "path": [ { "unquoted_string": { @@ -40,7 +40,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:11:11-0:20:20", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:12:12-0:20:20", "path": [ { "unquoted_string": { @@ -80,7 +80,7 @@ { "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:0:22-2:16:38", "src": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:0:22-2:7:29", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:0:22-2:6:28", "path": [ { "unquoted_string": { @@ -97,7 +97,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:9:31-2:16:38", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:10:32-2:16:38", "path": [ { "unquoted_string": { @@ -374,7 +374,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:8:8", "path": [ { "unquoted_string": { @@ -405,7 +405,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:11:11-0:20:20", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:12:12-0:20:20", "path": [ { "unquoted_string": { @@ -436,7 +436,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:9:31-2:16:38", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:10:32-2:16:38", "path": [ { "unquoted_string": { @@ -514,7 +514,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:9:9", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:8:8", "path": [ { "unquoted_string": { @@ -592,7 +592,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:11:11-0:20:20", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:12:12-0:20:20", "path": [ { "unquoted_string": { @@ -670,7 +670,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:0:22-2:7:29", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:0:22-2:6:28", "path": [ { "unquoted_string": { @@ -737,7 +737,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:9:31-2:16:38", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:10:32-2:16:38", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index a8f68bf18..c0bc0b3a8 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:12:12", "src": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -40,7 +40,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:6:6-0:12:12", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:7:7-0:12:12", "path": [ { "unquoted_string": { @@ -175,7 +175,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -233,7 +233,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -291,7 +291,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:6:6-0:12:12", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:7:7-0:12:12", "path": [ { "unquoted_string": { @@ -360,7 +360,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:6:6-0:12:12", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:7:7-0:12:12", "path": [ { "unquoted_string": { @@ -429,7 +429,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:6:6-0:12:12", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:7:7-0:12:12", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index 45411b8f5..42428a39a 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:12:12", "src": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -40,7 +40,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:6:6-0:12:12", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:7:7-0:12:12", "path": [ { "unquoted_string": { @@ -215,7 +215,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -273,7 +273,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -331,7 +331,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:6:6-0:12:12", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:7:7-0:12:12", "path": [ { "unquoted_string": { @@ -431,7 +431,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:6:6-0:12:12", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:7:7-0:12:12", "path": [ { "unquoted_string": { @@ -531,7 +531,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:6:6-0:12:12", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:7:7-0:12:12", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index 3faa27f08..4cb5a41cc 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:2:7-1:11:16", "src": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:6:11-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:7:12-1:11:16", "path": [ { "unquoted_string": { @@ -270,7 +270,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -317,7 +317,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:6:11-1:11:16", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:7:12-1:11:16", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index d59d54b5f..f24b66fa8 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-0:12:12", "src": { - "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:4:4-0:12:12", + "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:5:5-0:12:12", "path": [ { "unquoted_string": { @@ -158,7 +158,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -205,7 +205,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:4:4-0:12:12", + "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:5:5-0:12:12", "path": [ { "unquoted_string": { @@ -283,7 +283,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:4:4-0:12:12", + "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:5:5-0:12:12", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index aee09a349..581b66537 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -35,7 +35,7 @@ { "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:0:2-1:6:8", "src": { - "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:0:2-1:2:4", + "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:0:2-1:1:3", "path": [ { "unquoted_string": { @@ -52,7 +52,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:4:6-1:6:8", + "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:5:7-1:6:8", "path": [ { "unquoted_string": { @@ -212,7 +212,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:0:2-1:2:4", + "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:0:2-1:1:3", "path": [ { "unquoted_string": { @@ -279,7 +279,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:4:6-1:6:8", + "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:5:7-1:6:8", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json index 45a2ba38c..2fb89411a 100644 --- a/testdata/d2oracle/TestMove/underscore-connection.exp.json +++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:16:21", "src": { - "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:10:15-1:16:21", + "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:11:16-1:16:21", "path": [ { "unquoted_string": { @@ -314,7 +314,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { @@ -356,7 +356,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:10:15-1:16:21", + "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:11:16-1:16:21", "path": [ { "unquoted_string": { @@ -445,7 +445,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { @@ -534,7 +534,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:10:15-1:16:21", + "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:11:16-1:16:21", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index 720b01ae2..eaa941d03 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:2:7-1:10:15", "src": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:2:7-1:6:11", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:2:7-1:5:10", "path": [ { "unquoted_string": { @@ -64,7 +64,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:8:13-1:10:15", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { @@ -229,7 +229,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:2:7-1:6:11", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:2:7-1:5:10", "path": [ { "unquoted_string": { @@ -307,7 +307,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:8:13-1:10:15", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 7c6bb7452..2deaee517 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:2:7-1:8:13", "src": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { @@ -195,7 +195,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -242,7 +242,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 6c97bcbec..502a6ae7f 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:10:15", "src": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:6:11", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:5:10", "path": [ { "unquoted_string": { @@ -64,7 +64,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:8:13-1:10:15", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { @@ -206,7 +206,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:6:11", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:5:10", "path": [ { "unquoted_string": { @@ -237,7 +237,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:8:13-1:10:15", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { @@ -284,7 +284,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:6:11", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:5:10", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index daa84062c..c9d972e26 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:2:7-1:10:15", "src": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:2:7-1:6:11", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:2:7-1:5:10", "path": [ { "unquoted_string": { @@ -64,7 +64,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:8:13-1:10:15", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { @@ -206,7 +206,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:2:7-1:6:11", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:2:7-1:5:10", "path": [ { "unquoted_string": { @@ -264,7 +264,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:8:13-1:10:15", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:9:14-1:10:15", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index 66b9b06c8..c90c19765 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:2:7-1:8:13", "src": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { @@ -195,7 +195,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:2:7-1:4:9", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:2:7-1:3:8", "path": [ { "unquoted_string": { @@ -242,7 +242,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:6:11-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:7:12-1:8:13", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 7b1a4901d..14a1fee58 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:14:19", "src": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:10:15-1:14:19", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:11:16-1:14:19", "path": [ { "unquoted_string": { @@ -228,7 +228,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { @@ -270,7 +270,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:10:15-1:14:19", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:11:16-1:14:19", "path": [ { "unquoted_string": { @@ -328,7 +328,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:8:13", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:7:12", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 777d6ba3e..99b9b1abe 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -60,7 +60,7 @@ { "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:4:16-2:13:25", "src": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:4:16-2:8:20", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:4:16-2:7:19", "path": [ { "unquoted_string": { @@ -88,7 +88,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:10:22-2:13:25", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:11:23-2:13:25", "path": [ { "unquoted_string": { @@ -305,7 +305,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:4:16-2:8:20", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:4:16-2:7:19", "path": [ { "unquoted_string": { @@ -363,7 +363,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:10:22-2:13:25", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:11:23-2:13:25", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index 504797987..37085ae05 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -87,7 +87,7 @@ { "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:0:17-4:10:27", "src": { - "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:0:17-4:2:19", + "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:0:17-4:1:18", "path": [ { "unquoted_string": { @@ -104,7 +104,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:4:21-4:10:27", + "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:5:22-4:10:27", "path": [ { "unquoted_string": { @@ -248,7 +248,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:4:21-4:10:27", + "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:5:22-4:10:27", "path": [ { "unquoted_string": { @@ -373,7 +373,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:4:21-4:10:27", + "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:5:22-4:10:27", "path": [ { "unquoted_string": { @@ -431,7 +431,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:0:17-4:2:19", + "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:0:17-4:1:18", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index 65601ceb2..067a3c7c0 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "<", "dst": { - "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -166,7 +166,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index ebbc0754c..379f15249 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:17:17", "edges": [ { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:8:8", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:7:7", "src": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "<", "dst": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:5:5-0:8:8", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:6:6-0:7:7", "path": [ { "unquoted_string": { @@ -47,9 +47,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:5:5-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:6:6-0:12:12", "src": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:5:5-0:8:8", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:6:6-0:7:7", "path": [ { "unquoted_string": { @@ -66,7 +66,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:10:10-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:11:11-0:12:12", "path": [ { "unquoted_string": { @@ -84,9 +84,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:10:10-0:17:17", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:11:11-0:17:17", "src": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:10:10-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:11:11-0:12:12", "path": [ { "unquoted_string": { @@ -103,7 +103,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:15:15-0:17:17", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:16:16-0:17:17", "path": [ { "unquoted_string": { @@ -257,7 +257,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -304,7 +304,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:5:5-0:8:8", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:6:6-0:7:7", "path": [ { "unquoted_string": { @@ -324,7 +324,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:5:5-0:8:8", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:6:6-0:7:7", "path": [ { "unquoted_string": { @@ -371,7 +371,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:10:10-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:11:11-0:12:12", "path": [ { "unquoted_string": { @@ -391,7 +391,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:10:10-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:11:11-0:12:12", "path": [ { "unquoted_string": { @@ -438,7 +438,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:15:15-0:17:17", + "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:16:16-0:17:17", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index 92260d221..6cca60a8d 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -9,7 +9,7 @@ "map_key": { "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:28:28", "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -39,7 +39,7 @@ { "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:5:5-0:12:12", "src": { - "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:5:5-0:7:7", + "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -56,7 +56,7 @@ }, "src_arrow": "<", "dst": { - "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:10:10-0:12:12", + "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:11:11-0:12:12", "path": [ { "unquoted_string": { @@ -173,7 +173,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -231,7 +231,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -289,7 +289,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:5:5-0:7:7", + "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -336,7 +336,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:10:10-0:12:12", + "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:11:11-0:12:12", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index bda0cfb12..29de1a2e5 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -9,7 +9,7 @@ "map_key": { "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-0:21:21", "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -26,9 +26,9 @@ }, "edges": [ { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:11:11", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:10:10", "src": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:5:5", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:4:4", "path": [ { "unquoted_string": { @@ -45,7 +45,7 @@ }, "src_arrow": "<", "dst": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:8:8-0:11:11", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:9:9-0:10:10", "path": [ { "unquoted_string": { @@ -63,9 +63,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:8:8-0:16:16", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:9:9-0:15:15", "src": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:8:8-0:11:11", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:9:9-0:10:10", "path": [ { "unquoted_string": { @@ -82,7 +82,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:13:13-0:16:16", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:14:14-0:15:15", "path": [ { "unquoted_string": { @@ -100,9 +100,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:13:13-0:20:20", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:14:14-0:20:20", "src": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:13:13-0:16:16", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:14:14-0:15:15", "path": [ { "unquoted_string": { @@ -119,7 +119,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:18:18-0:20:20", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:19:19-0:20:20", "path": [ { "unquoted_string": { @@ -273,7 +273,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -320,7 +320,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:5:5", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:4:4", "path": [ { "unquoted_string": { @@ -367,7 +367,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:8:8-0:11:11", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:9:9-0:10:10", "path": [ { "unquoted_string": { @@ -387,7 +387,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:8:8-0:11:11", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:9:9-0:10:10", "path": [ { "unquoted_string": { @@ -434,7 +434,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:13:13-0:16:16", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:14:14-0:15:15", "path": [ { "unquoted_string": { @@ -454,7 +454,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:13:13-0:16:16", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:14:14-0:15:15", "path": [ { "unquoted_string": { @@ -501,7 +501,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:18:18-0:20:20", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:19:19-0:20:20", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index d5603eef6..66322ba2c 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:26:26", "edges": [ { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:12:12", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:11:11", "src": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -40,7 +40,7 @@ }, "src_arrow": "<", "dst": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11", "path": [ { "unquoted_string": { @@ -69,9 +69,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:19:19", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:18:18", "src": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11", "path": [ { "unquoted_string": { @@ -99,7 +99,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18", "path": [ { "unquoted_string": { @@ -128,9 +128,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:26:26", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:26:26", "src": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18", "path": [ { "unquoted_string": { @@ -158,7 +158,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:21:21-0:26:26", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:22:22-0:26:26", "path": [ { "unquoted_string": { @@ -323,7 +323,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -354,7 +354,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11", "path": [ { "unquoted_string": { @@ -385,7 +385,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11", "path": [ { "unquoted_string": { @@ -416,7 +416,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18", "path": [ { "unquoted_string": { @@ -447,7 +447,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18", "path": [ { "unquoted_string": { @@ -478,7 +478,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:21:21-0:26:26", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:22:22-0:26:26", "path": [ { "unquoted_string": { @@ -536,7 +536,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -594,7 +594,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11", "path": [ { "unquoted_string": { @@ -625,7 +625,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11", "path": [ { "unquoted_string": { @@ -683,7 +683,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18", "path": [ { "unquoted_string": { @@ -714,7 +714,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18", "path": [ { "unquoted_string": { @@ -772,7 +772,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:21:21-0:26:26", + "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:22:22-0:26:26", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index 1fb5764c4..d86bd9aa6 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -9,7 +9,7 @@ "map_key": { "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:29:29", "key": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -39,7 +39,7 @@ { "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:7:7-0:13:13", "src": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:7:7-0:9:9", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -56,7 +56,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:11:11-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { @@ -173,7 +173,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -231,7 +231,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -289,7 +289,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:7:7-0:9:9", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:7:7-0:8:8", "path": [ { "unquoted_string": { @@ -336,7 +336,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:11:11-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:12:12-0:13:13", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index d060f7c14..214be7198 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -9,7 +9,7 @@ "map_key": { "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:30:30", "key": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -39,7 +39,7 @@ { "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:5:5-0:14:14", "src": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:5:5-0:10:10", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:5:5-0:9:9", "path": [ { "unquoted_string": { @@ -56,7 +56,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:12:12-0:14:14", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:13:13-0:14:14", "path": [ { "unquoted_string": { @@ -173,7 +173,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -231,7 +231,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:4:4", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:3:3", "path": [ { "unquoted_string": { @@ -289,7 +289,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:5:5-0:10:10", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:5:5-0:9:9", "path": [ { "unquoted_string": { @@ -336,7 +336,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:12:12-0:14:14", + "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:13:13-0:14:14", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 830fb8025..9b29a3155 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:70:70", "edges": [ { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:24:24", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:23:23", "src": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:17:17", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:16:16", "path": [ { "unquoted_string": { @@ -51,7 +51,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23", "path": [ { "unquoted_string": { @@ -80,9 +80,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:44:44", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:43:43", "src": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23", "path": [ { "unquoted_string": { @@ -110,7 +110,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43", "path": [ { "unquoted_string": { @@ -150,9 +150,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:51:51", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:50:50", "src": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43", "path": [ { "unquoted_string": { @@ -191,7 +191,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50", "path": [ { "unquoted_string": { @@ -220,9 +220,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:70:70", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:70:70", "src": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50", "path": [ { "unquoted_string": { @@ -250,7 +250,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:53:53-0:70:70", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:54:54-0:70:70", "path": [ { "unquoted_string": { @@ -334,9 +334,9 @@ "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:13:102", "edges": [ { - "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:9:98", + "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:8:97", "src": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:4:93", + "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:3:92", "path": [ { "unquoted_string": { @@ -353,7 +353,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,2:6:95-2:9:98", + "range": "d2/testdata/d2oracle/TestRename/container.d2,2:7:96-2:8:97", "path": [ { "unquoted_string": { @@ -371,9 +371,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/container.d2,2:6:95-2:13:102", + "range": "d2/testdata/d2oracle/TestRename/container.d2,2:7:96-2:13:102", "src": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,2:6:95-2:9:98", + "range": "d2/testdata/d2oracle/TestRename/container.d2,2:7:96-2:8:97", "path": [ { "unquoted_string": { @@ -390,7 +390,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,2:11:100-2:13:102", + "range": "d2/testdata/d2oracle/TestRename/container.d2,2:12:101-2:13:102", "path": [ { "unquoted_string": { @@ -538,7 +538,7 @@ { "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:24:175", "src": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:18:169", + "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:17:168", "path": [ { "unquoted_string": { @@ -577,7 +577,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,10:20:171-10:24:175", + "range": "d2/testdata/d2oracle/TestRename/container.d2,10:21:172-10:24:175", "path": [ { "unquoted_string": { @@ -629,7 +629,7 @@ "map_key": { "range": "d2/testdata/d2oracle/TestRename/container.d2,11:0:197-11:37:234", "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,11:0:197-11:5:202", + "range": "d2/testdata/d2oracle/TestRename/container.d2,11:0:197-11:4:201", "path": [ { "unquoted_string": { @@ -648,7 +648,7 @@ { "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:19:216", "src": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:13:210", + "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:12:209", "path": [ { "unquoted_string": { @@ -687,7 +687,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,11:15:212-11:19:216", + "range": "d2/testdata/d2oracle/TestRename/container.d2,11:16:213-11:19:216", "path": [ { "unquoted_string": { @@ -993,7 +993,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:17:17", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:16:16", "path": [ { "unquoted_string": { @@ -1035,7 +1035,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43", "path": [ { "unquoted_string": { @@ -1077,7 +1077,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43", "path": [ { "unquoted_string": { @@ -1119,7 +1119,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:53:53-0:70:70", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:54:54-0:70:70", "path": [ { "unquoted_string": { @@ -1212,7 +1212,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:18:169", + "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:17:168", "path": [ { "unquoted_string": { @@ -1281,7 +1281,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:17:17", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:16:16", "path": [ { "unquoted_string": { @@ -1323,7 +1323,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43", "path": [ { "unquoted_string": { @@ -1365,7 +1365,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43", "path": [ { "unquoted_string": { @@ -1407,7 +1407,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:53:53-0:70:70", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:54:54-0:70:70", "path": [ { "unquoted_string": { @@ -1500,7 +1500,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:18:169", + "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:17:168", "path": [ { "unquoted_string": { @@ -1569,7 +1569,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:17:17", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:16:16", "path": [ { "unquoted_string": { @@ -1611,7 +1611,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43", "path": [ { "unquoted_string": { @@ -1653,7 +1653,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43", "path": [ { "unquoted_string": { @@ -1695,7 +1695,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:53:53-0:70:70", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:54:54-0:70:70", "path": [ { "unquoted_string": { @@ -1737,7 +1737,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,2:11:100-2:13:102", + "range": "d2/testdata/d2oracle/TestRename/container.d2,2:12:101-2:13:102", "path": [ { "unquoted_string": { @@ -1777,7 +1777,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:18:169", + "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:17:168", "path": [ { "unquoted_string": { @@ -1846,7 +1846,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23", "path": [ { "unquoted_string": { @@ -1877,7 +1877,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23", "path": [ { "unquoted_string": { @@ -1908,7 +1908,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,10:20:171-10:24:175", + "range": "d2/testdata/d2oracle/TestRename/container.d2,10:21:172-10:24:175", "path": [ { "unquoted_string": { @@ -1966,7 +1966,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23", "path": [ { "unquoted_string": { @@ -1997,7 +1997,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23", "path": [ { "unquoted_string": { @@ -2028,7 +2028,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,10:20:171-10:24:175", + "range": "d2/testdata/d2oracle/TestRename/container.d2,10:21:172-10:24:175", "path": [ { "unquoted_string": { @@ -2086,7 +2086,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50", "path": [ { "unquoted_string": { @@ -2117,7 +2117,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50", "path": [ { "unquoted_string": { @@ -2175,7 +2175,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50", "path": [ { "unquoted_string": { @@ -2206,7 +2206,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51", + "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50", "path": [ { "unquoted_string": { @@ -2264,7 +2264,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:4:93", + "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:3:92", "path": [ { "unquoted_string": { @@ -2311,7 +2311,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,2:6:95-2:9:98", + "range": "d2/testdata/d2oracle/TestRename/container.d2,2:7:96-2:8:97", "path": [ { "unquoted_string": { @@ -2331,7 +2331,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,2:6:95-2:9:98", + "range": "d2/testdata/d2oracle/TestRename/container.d2,2:7:96-2:8:97", "path": [ { "unquoted_string": { @@ -2425,7 +2425,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,11:0:197-11:5:202", + "range": "d2/testdata/d2oracle/TestRename/container.d2,11:0:197-11:4:201", "path": [ { "unquoted_string": { @@ -2472,7 +2472,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:13:210", + "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:12:209", "path": [ { "unquoted_string": { @@ -2541,7 +2541,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:13:210", + "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:12:209", "path": [ { "unquoted_string": { @@ -2610,7 +2610,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:13:210", + "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:12:209", "path": [ { "unquoted_string": { @@ -2679,7 +2679,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,11:15:212-11:19:216", + "range": "d2/testdata/d2oracle/TestRename/container.d2,11:16:213-11:19:216", "path": [ { "unquoted_string": { @@ -2737,7 +2737,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,11:15:212-11:19:216", + "range": "d2/testdata/d2oracle/TestRename/container.d2,11:16:213-11:19:216", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 678a43a46..40be42dcf 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:37:37", "edges": [ { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:12:12", "src": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -40,7 +40,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { @@ -69,9 +69,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:22:22", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:21:21", "src": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { @@ -99,7 +99,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21", "path": [ { "unquoted_string": { @@ -128,9 +128,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:29:29", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:28:28", "src": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21", "path": [ { "unquoted_string": { @@ -158,7 +158,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28", "path": [ { "unquoted_string": { @@ -187,9 +187,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:37:37", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:37:37", "src": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28", "path": [ { "unquoted_string": { @@ -217,7 +217,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:31:31-0:37:37", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:32:32-0:37:37", "path": [ { "unquoted_string": { @@ -279,9 +279,9 @@ "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:15:58", "edges": [ { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:9:52", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:8:51", "src": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:4:47", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:3:46", "path": [ { "unquoted_string": { @@ -298,7 +298,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:6:49-2:9:52", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:7:50-2:8:51", "path": [ { "unquoted_string": { @@ -316,9 +316,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:6:49-2:15:58", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:7:50-2:15:58", "src": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:6:49-2:9:52", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:7:50-2:8:51", "path": [ { "unquoted_string": { @@ -335,7 +335,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:11:54-2:15:58", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:12:55-2:15:58", "path": [ { "unquoted_string": { @@ -623,7 +623,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -654,7 +654,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21", "path": [ { "unquoted_string": { @@ -685,7 +685,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21", "path": [ { "unquoted_string": { @@ -716,7 +716,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:31:31-0:37:37", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:32:32-0:37:37", "path": [ { "unquoted_string": { @@ -794,7 +794,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:6:6", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:5:5", "path": [ { "unquoted_string": { @@ -825,7 +825,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21", "path": [ { "unquoted_string": { @@ -856,7 +856,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21", "path": [ { "unquoted_string": { @@ -887,7 +887,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:31:31-0:37:37", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:32:32-0:37:37", "path": [ { "unquoted_string": { @@ -918,7 +918,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:11:54-2:15:58", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:12:55-2:15:58", "path": [ { "unquoted_string": { @@ -985,7 +985,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { @@ -1016,7 +1016,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { @@ -1074,7 +1074,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { @@ -1105,7 +1105,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12", "path": [ { "unquoted_string": { @@ -1163,7 +1163,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28", "path": [ { "unquoted_string": { @@ -1194,7 +1194,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28", "path": [ { "unquoted_string": { @@ -1252,7 +1252,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28", "path": [ { "unquoted_string": { @@ -1283,7 +1283,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28", "path": [ { "unquoted_string": { @@ -1341,7 +1341,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:4:47", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:3:46", "path": [ { "unquoted_string": { @@ -1388,7 +1388,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:6:49-2:9:52", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:7:50-2:8:51", "path": [ { "unquoted_string": { @@ -1408,7 +1408,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:6:49-2:9:52", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:7:50-2:8:51", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index 2c76cca83..8df095e63 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -129,7 +129,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -176,7 +176,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index c8f216c65..9c0be60cd 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -168,7 +168,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -215,7 +215,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index 51b4137c9..106987b19 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -34,9 +34,9 @@ "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:19:27", "edges": [ { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:9:17", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:8:16", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:4:12", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:3:11", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:6:14-1:9:17", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { @@ -71,9 +71,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:6:14-1:13:21", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:7:15-1:13:21", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:6:14-1:9:17", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { @@ -90,7 +90,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:11:19-1:13:21", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:12:20-1:13:21", "path": [ { "unquoted_string": { @@ -129,7 +129,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:3:31-2:9:37", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:3:31-2:5:33", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:3:31-2:4:32", "path": [ { "unquoted_string": { @@ -146,7 +146,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:7:35-2:9:37", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:8:36-2:9:37", "path": [ { "unquoted_string": { @@ -338,7 +338,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:4:12", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:3:11", "path": [ { "unquoted_string": { @@ -358,7 +358,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:3:31-2:5:33", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:3:31-2:4:32", "path": [ { "unquoted_string": { @@ -405,7 +405,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:6:14-1:9:17", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { @@ -425,7 +425,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:6:14-1:9:17", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { @@ -445,7 +445,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:7:35-2:9:37", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:8:36-2:9:37", "path": [ { "unquoted_string": { @@ -492,7 +492,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:11:19-1:13:21", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:12:20-1:13:21", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index 301659aa6..c4288de67 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:11:11", "edges": [ { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -47,9 +47,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:4:4-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:5:5-0:11:11", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -66,7 +66,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -95,7 +95,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:1:13-1:7:19", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:1:13-1:3:15", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:1:13-1:2:14", "path": [ { "unquoted_string": { @@ -112,7 +112,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:5:17-1:7:19", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:6:18-1:7:19", "path": [ { "unquoted_string": { @@ -278,7 +278,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -298,7 +298,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:1:13-1:3:15", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:1:13-1:2:14", "path": [ { "unquoted_string": { @@ -345,7 +345,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -365,7 +365,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -385,7 +385,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:5:17-1:7:19", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:6:18-1:7:19", "path": [ { "unquoted_string": { @@ -432,7 +432,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index 7e2d1bd9e..a4ddf5104 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:11:11", "edges": [ { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -47,9 +47,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:4:4-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:5:5-0:11:11", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -66,7 +66,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -95,7 +95,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:1:13-1:7:19", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:1:13-1:3:15", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:1:13-1:2:14", "path": [ { "unquoted_string": { @@ -112,7 +112,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:5:17-1:7:19", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:6:18-1:7:19", "path": [ { "unquoted_string": { @@ -179,7 +179,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:1:44-2:7:50", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:1:44-2:3:46", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:1:44-2:2:45", "path": [ { "unquoted_string": { @@ -196,7 +196,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:5:48-2:7:50", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:6:49-2:7:50", "path": [ { "unquoted_string": { @@ -368,7 +368,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -415,7 +415,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -435,7 +435,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -455,7 +455,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:1:13-1:3:15", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:1:13-1:2:14", "path": [ { "unquoted_string": { @@ -475,7 +475,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:1:44-2:3:46", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:1:44-2:2:45", "path": [ { "unquoted_string": { @@ -522,7 +522,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -542,7 +542,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:5:17-1:7:19", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:6:18-1:7:19", "path": [ { "unquoted_string": { @@ -562,7 +562,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:5:48-2:7:50", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:6:49-2:7:50", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 672a3f564..77f29a89f 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -34,9 +34,9 @@ "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:19:27", "edges": [ { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:9:17", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:8:16", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:4:12", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:3:11", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:6:14-1:9:17", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { @@ -71,9 +71,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:6:14-1:13:21", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:7:15-1:13:21", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:6:14-1:9:17", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { @@ -90,7 +90,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:11:19-1:13:21", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:12:20-1:13:21", "path": [ { "unquoted_string": { @@ -129,7 +129,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:3:31-2:9:37", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:3:31-2:5:33", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:3:31-2:4:32", "path": [ { "unquoted_string": { @@ -146,7 +146,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:7:35-2:9:37", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:8:36-2:9:37", "path": [ { "unquoted_string": { @@ -365,7 +365,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:4:12", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:3:11", "path": [ { "unquoted_string": { @@ -385,7 +385,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:3:31-2:5:33", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:3:31-2:4:32", "path": [ { "unquoted_string": { @@ -432,7 +432,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:6:14-1:9:17", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { @@ -452,7 +452,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:6:14-1:9:17", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { @@ -472,7 +472,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:7:35-2:9:37", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:8:36-2:9:37", "path": [ { "unquoted_string": { @@ -519,7 +519,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:11:19-1:13:21", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:12:20-1:13:21", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json index ded67e709..982c8f52f 100644 --- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:11:11", "edges": [ { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -47,9 +47,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:4:4-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:5:5-0:11:11", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -66,7 +66,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -95,7 +95,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:1:13-1:7:19", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:1:13-1:3:15", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:1:13-1:2:14", "path": [ { "unquoted_string": { @@ -112,7 +112,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:5:17-1:7:19", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:6:18-1:7:19", "path": [ { "unquoted_string": { @@ -299,7 +299,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -319,7 +319,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:1:13-1:3:15", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:1:13-1:2:14", "path": [ { "unquoted_string": { @@ -366,7 +366,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -386,7 +386,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -406,7 +406,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:5:17-1:7:19", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:6:18-1:7:19", "path": [ { "unquoted_string": { @@ -453,7 +453,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index f0ae94d5d..0ac79eff4 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:2:12-1:20:30", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:2:12-1:9:19", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:2:12-1:8:18", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:11:21-1:20:30", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:12:22-1:20:30", "path": [ { "unquoted_string": { @@ -121,7 +121,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:2:45-4:8:51", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:2:45-4:4:47", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:2:45-4:3:46", "path": [ { "unquoted_string": { @@ -138,7 +138,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:6:49-4:8:51", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:7:50-4:8:51", "path": [ { "unquoted_string": { @@ -312,7 +312,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:2:12-1:9:19", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:2:12-1:8:18", "path": [ { "unquoted_string": { @@ -359,7 +359,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:11:21-1:20:30", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:12:22-1:20:30", "path": [ { "unquoted_string": { @@ -453,7 +453,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:2:45-4:4:47", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:2:45-4:3:46", "path": [ { "unquoted_string": { @@ -500,7 +500,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:6:49-4:8:51", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:7:50-4:8:51", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json index c1c983fad..1cb85fb45 100644 --- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json @@ -10,9 +10,9 @@ "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:11:11", "edges": [ { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -47,9 +47,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:4:4-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:5:5-0:11:11", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -66,7 +66,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { @@ -95,7 +95,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:1:13-1:7:19", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:1:13-1:3:15", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:1:13-1:2:14", "path": [ { "unquoted_string": { @@ -112,7 +112,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:5:17-1:7:19", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:6:18-1:7:19", "path": [ { "unquoted_string": { @@ -279,7 +279,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -299,7 +299,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:1:13-1:3:15", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:1:13-1:2:14", "path": [ { "unquoted_string": { @@ -346,7 +346,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -366,7 +366,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:4:4-0:7:7", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -386,7 +386,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:5:17-1:7:19", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:6:18-1:7:19", "path": [ { "unquoted_string": { @@ -433,7 +433,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:9:9-0:11:11", + "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:10:10-0:11:11", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index be7387a8d..f1aa1ad6c 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:2:10-1:8:16", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:2:10-1:4:12", + "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:2:10-1:3:11", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:6:14-1:8:16", + "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { @@ -205,7 +205,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:2:10-1:4:12", + "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:2:10-1:3:11", "path": [ { "unquoted_string": { @@ -252,7 +252,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:6:14-1:8:16", + "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index ab67c717c..dcc248bb9 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -35,7 +35,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:10:12", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:4:6", + "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:3:5", "path": [ { "unquoted_string": { @@ -63,7 +63,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:6:8-1:10:12", + "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:7:9-1:10:12", "path": [ { "unquoted_string": { @@ -233,7 +233,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:4:6", + "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:3:5", "path": [ { "unquoted_string": { @@ -264,7 +264,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:6:8-1:10:12", + "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:7:9-1:10:12", "path": [ { "unquoted_string": { @@ -322,7 +322,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:4:6", + "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:3:5", "path": [ { "unquoted_string": { @@ -380,7 +380,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:6:8-1:10:12", + "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:7:9-1:10:12", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index a55c91c0a..e7649247a 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -178,7 +178,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -225,7 +225,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json index 124ccee33..0fbdc6921 100644 --- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -236,7 +236,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -283,7 +283,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index cc5c9b6eb..d74f7c436 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -218,7 +218,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -265,7 +265,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 73a1c5b79..19305fea6 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:2:10-1:8:16", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:2:10-1:4:12", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:2:10-1:3:11", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:6:14-1:8:16", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { @@ -205,7 +205,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:2:10-1:4:12", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:2:10-1:3:11", "path": [ { "unquoted_string": { @@ -252,7 +252,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:6:14-1:8:16", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index 4781ea1c7..848b41a6b 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -36,7 +36,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:2:10-1:8:16", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:2:10-1:4:12", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:2:10-1:3:11", "path": [ { "unquoted_string": { @@ -53,7 +53,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:6:14-1:8:16", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { @@ -255,7 +255,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:2:10-1:4:12", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:2:10-1:3:11", "path": [ { "unquoted_string": { @@ -302,7 +302,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:6:14-1:8:16", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:7:15-1:8:16", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json index ed0a6baff..07bc4b429 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -189,7 +189,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -236,7 +236,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json index da49006e5..b08a28eb2 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -58,7 +58,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:1:8-1:7:14", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:1:8-1:3:10", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:1:8-1:2:9", "path": [ { "unquoted_string": { @@ -75,7 +75,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:5:12-1:7:14", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:6:13-1:7:14", "path": [ { "unquoted_string": { @@ -230,7 +230,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -250,7 +250,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:1:8-1:3:10", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:1:8-1:2:9", "path": [ { "unquoted_string": { @@ -297,7 +297,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -317,7 +317,7 @@ }, { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:5:12-1:7:14", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:6:13-1:7:14", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json index e3c6f6c31..628da4b0d 100644 --- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -189,7 +189,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -236,7 +236,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index 5d048c690..a43045369 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -42,7 +42,7 @@ { "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:2:54-1:8:60", "src": { - "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:2:54-1:4:56", + "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:2:54-1:3:55", "path": [ { "unquoted_string": { @@ -59,7 +59,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:6:58-1:8:60", + "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:7:59-1:8:60", "path": [ { "unquoted_string": { @@ -201,7 +201,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:2:54-1:4:56", + "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:2:54-1:3:55", "path": [ { "unquoted_string": { @@ -248,7 +248,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:6:58-1:8:60", + "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:7:59-1:8:60", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 03123bb2c..99d831ce6 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -152,7 +152,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -219,7 +219,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index da163d796..a022a2076 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -69,7 +69,7 @@ { "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:2:22-2:14:34", "src": { - "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:2:22-2:7:27", + "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:2:22-2:6:26", "path": [ { "unquoted_string": { @@ -86,7 +86,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:9:29-2:14:34", + "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:10:30-2:14:34", "path": [ { "unquoted_string": { @@ -271,7 +271,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:2:22-2:7:27", + "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:2:22-2:6:26", "path": [ { "unquoted_string": { @@ -318,7 +318,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:9:29-2:14:34", + "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:10:30-2:14:34", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json index 248870e77..eba63f5ee 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -189,7 +189,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -236,7 +236,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json index 3de2bb5bc..466375933 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -207,7 +207,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -254,7 +254,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json index f5ce4d7f6..a4de62e89 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -212,7 +212,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -259,7 +259,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json index 4499d37b8..aefa1e8f2 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json @@ -12,7 +12,7 @@ { "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-0:6:6", "src": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { @@ -187,7 +187,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-0:2:2", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-0:1:1", "path": [ { "unquoted_string": { @@ -234,7 +234,7 @@ "references": [ { "key": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:4:4-0:6:6", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:5:5-0:6:6", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/()_keys.exp.json b/testdata/d2parser/TestParse/()_keys.exp.json index 5326c814c..4853db83a 100644 --- a/testdata/d2parser/TestParse/()_keys.exp.json +++ b/testdata/d2parser/TestParse/()_keys.exp.json @@ -9,7 +9,7 @@ { "range": "d2/testdata/d2parser/TestParse/()_keys.d2,1:0:1-1:17:18", "src": { - "range": "d2/testdata/d2parser/TestParse/()_keys.d2,1:0:1-1:8:9", + "range": "d2/testdata/d2parser/TestParse/()_keys.d2,1:0:1-1:7:8", "path": [ { "unquoted_string": { @@ -26,7 +26,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/()_keys.d2,1:10:11-1:17:18", + "range": "d2/testdata/d2parser/TestParse/()_keys.d2,1:11:12-1:17:18", "path": [ { "unquoted_string": { @@ -52,7 +52,7 @@ "map_key": { "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:0:19-2:44:63", "key": { - "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:0:19-2:5:24", + "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:0:19-2:4:23", "path": [ { "unquoted_string": { @@ -69,9 +69,9 @@ }, "edges": [ { - "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:6:25-2:13:32", + "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:6:25-2:12:31", "src": { - "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:6:25-2:8:27", + "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:6:25-2:7:26", "path": [ { "unquoted_string": { @@ -88,7 +88,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:10:29-2:13:32", + "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:11:30-2:12:31", "path": [ { "unquoted_string": { @@ -106,9 +106,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:10:29-2:17:36", + "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:11:30-2:17:36", "src": { - "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:10:29-2:13:32", + "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:11:30-2:12:31", "path": [ { "unquoted_string": { @@ -125,7 +125,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:15:34-2:17:36", + "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:16:35-2:17:36", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/edge.exp.json b/testdata/d2parser/TestParse/edge.exp.json index a2fabcc7a..6fe93bd79 100644 --- a/testdata/d2parser/TestParse/edge.exp.json +++ b/testdata/d2parser/TestParse/edge.exp.json @@ -9,7 +9,7 @@ { "range": "d2/testdata/d2parser/TestParse/edge.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2parser/TestParse/edge.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2parser/TestParse/edge.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -26,7 +26,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/edge.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2parser/TestParse/edge.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/edge_group_value.exp.json b/testdata/d2parser/TestParse/edge_group_value.exp.json index 6192c2f73..c9d4df1c4 100644 --- a/testdata/d2parser/TestParse/edge_group_value.exp.json +++ b/testdata/d2parser/TestParse/edge_group_value.exp.json @@ -6,7 +6,7 @@ "map_key": { "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:0:1-1:20:21", "key": { - "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -25,7 +25,7 @@ { "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:3:4-1:9:10", "src": { - "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:3:4-1:5:6", + "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:3:4-1:4:5", "path": [ { "unquoted_string": { @@ -42,7 +42,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:7:8-1:9:10", + "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:8:9-1:9:10", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/edge_key.exp.json b/testdata/d2parser/TestParse/edge_key.exp.json index 21f56445e..54507bf64 100644 --- a/testdata/d2parser/TestParse/edge_key.exp.json +++ b/testdata/d2parser/TestParse/edge_key.exp.json @@ -6,7 +6,7 @@ "map_key": { "range": "d2/testdata/d2parser/TestParse/edge_key.d2,1:0:1-1:25:26", "key": { - "range": "d2/testdata/d2parser/TestParse/edge_key.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2parser/TestParse/edge_key.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/edge_line_continuation.exp.json b/testdata/d2parser/TestParse/edge_line_continuation.exp.json index f6444a5dc..f6aadbe75 100644 --- a/testdata/d2parser/TestParse/edge_line_continuation.exp.json +++ b/testdata/d2parser/TestParse/edge_line_continuation.exp.json @@ -9,7 +9,7 @@ { "range": "d2/testdata/d2parser/TestParse/edge_line_continuation.d2,1:0:1-2:41:71", "src": { - "range": "d2/testdata/d2parser/TestParse/edge_line_continuation.d2,1:0:1-1:25:26", + "range": "d2/testdata/d2parser/TestParse/edge_line_continuation.d2,1:0:1-1:24:25", "path": [ { "unquoted_string": { @@ -26,7 +26,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/edge_line_continuation.d2,2:4:34-2:41:71", + "range": "d2/testdata/d2parser/TestParse/edge_line_continuation.d2,2:5:35-2:41:71", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/edge_line_continuation_2.exp.json b/testdata/d2parser/TestParse/edge_line_continuation_2.exp.json index 1e5f4b296..45aa5857d 100644 --- a/testdata/d2parser/TestParse/edge_line_continuation_2.exp.json +++ b/testdata/d2parser/TestParse/edge_line_continuation_2.exp.json @@ -9,7 +9,7 @@ { "range": "d2/testdata/d2parser/TestParse/edge_line_continuation_2.d2,1:0:1-2:38:68", "src": { - "range": "d2/testdata/d2parser/TestParse/edge_line_continuation_2.d2,1:0:1-1:25:26", + "range": "d2/testdata/d2parser/TestParse/edge_line_continuation_2.d2,1:0:1-1:24:25", "path": [ { "unquoted_string": { @@ -26,7 +26,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/edge_line_continuation_2.d2,2:1:31-2:38:68", + "range": "d2/testdata/d2parser/TestParse/edge_line_continuation_2.d2,2:2:32-2:38:68", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/errs.exp.json b/testdata/d2parser/TestParse/errs.exp.json index 5136c50a2..fd23802c4 100644 --- a/testdata/d2parser/TestParse/errs.exp.json +++ b/testdata/d2parser/TestParse/errs.exp.json @@ -272,7 +272,7 @@ "map_key": { "range": "d2/testdata/d2parser/TestParse/errs.d2,23:0:167-23:12:179", "key": { - "range": "d2/testdata/d2parser/TestParse/errs.d2,23:0:167-23:5:172", + "range": "d2/testdata/d2parser/TestParse/errs.d2,23:0:167-23:4:171", "path": [ { "unquoted_string": { @@ -327,7 +327,7 @@ { "range": "d2/testdata/d2parser/TestParse/errs.d2,24:0:180-24:6:186", "src": { - "range": "d2/testdata/d2parser/TestParse/errs.d2,24:0:180-24:2:182", + "range": "d2/testdata/d2parser/TestParse/errs.d2,24:0:180-24:1:181", "path": [ { "unquoted_string": { @@ -344,7 +344,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/errs.d2,24:4:184-24:6:186", + "range": "d2/testdata/d2parser/TestParse/errs.d2,24:5:185-24:6:186", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/key_with_edge.exp.json b/testdata/d2parser/TestParse/key_with_edge.exp.json index 43687d963..bae57af5d 100644 --- a/testdata/d2parser/TestParse/key_with_edge.exp.json +++ b/testdata/d2parser/TestParse/key_with_edge.exp.json @@ -6,7 +6,7 @@ "map_key": { "range": "d2/testdata/d2parser/TestParse/key_with_edge.d2,1:0:1-1:8:9", "key": { - "range": "d2/testdata/d2parser/TestParse/key_with_edge.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2parser/TestParse/key_with_edge.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/less_than_edge#955.exp.json b/testdata/d2parser/TestParse/less_than_edge#955.exp.json index 210a80f52..607206c78 100644 --- a/testdata/d2parser/TestParse/less_than_edge#955.exp.json +++ b/testdata/d2parser/TestParse/less_than_edge#955.exp.json @@ -9,7 +9,7 @@ { "range": "d2/testdata/d2parser/TestParse/less_than_edge#955.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2parser/TestParse/less_than_edge#955.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2parser/TestParse/less_than_edge#955.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/merged_shapes_#322.exp.json b/testdata/d2parser/TestParse/merged_shapes_#322.exp.json index bab9e488b..5d3c0c527 100644 --- a/testdata/d2parser/TestParse/merged_shapes_#322.exp.json +++ b/testdata/d2parser/TestParse/merged_shapes_#322.exp.json @@ -6,7 +6,7 @@ "map_key": { "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,1:0:1-1:2:3", "key": { - "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -29,7 +29,7 @@ "map_key": { "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,2:0:4-2:2:6", "key": { - "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,2:0:4-2:2:6", + "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,2:0:4-2:1:5", "path": [ { "unquoted_string": { @@ -52,7 +52,7 @@ "map_key": { "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,3:0:7-3:2:9", "key": { - "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,3:0:7-3:2:9", + "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,3:0:7-3:1:8", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/multiple_edges.exp.json b/testdata/d2parser/TestParse/multiple_edges.exp.json index 4fa6cf36c..57ef51f6d 100644 --- a/testdata/d2parser/TestParse/multiple_edges.exp.json +++ b/testdata/d2parser/TestParse/multiple_edges.exp.json @@ -7,9 +7,9 @@ "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:0:1-1:11:12", "edges": [ { - "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:0:1-1:7:8", + "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -26,7 +26,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:4:5-1:7:8", + "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -44,9 +44,9 @@ "dst_arrow": ">" }, { - "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:4:5-1:11:12", + "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:5:6-1:11:12", "src": { - "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:4:5-1:7:8", + "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { @@ -63,7 +63,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:9:10-1:11:12", + "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:10:11-1:11:12", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/primary.exp.json b/testdata/d2parser/TestParse/primary.exp.json index c247a96ce..da623705c 100644 --- a/testdata/d2parser/TestParse/primary.exp.json +++ b/testdata/d2parser/TestParse/primary.exp.json @@ -9,7 +9,7 @@ { "range": "d2/testdata/d2parser/TestParse/primary.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2parser/TestParse/primary.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2parser/TestParse/primary.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -26,7 +26,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/primary.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2parser/TestParse/primary.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/subst.exp.json b/testdata/d2parser/TestParse/subst.exp.json index 6dd9d488c..4c486d24d 100644 --- a/testdata/d2parser/TestParse/subst.exp.json +++ b/testdata/d2parser/TestParse/subst.exp.json @@ -9,7 +9,7 @@ { "range": "d2/testdata/d2parser/TestParse/subst.d2,1:0:1-1:6:7", "src": { - "range": "d2/testdata/d2parser/TestParse/subst.d2,1:0:1-1:2:3", + "range": "d2/testdata/d2parser/TestParse/subst.d2,1:0:1-1:1:2", "path": [ { "unquoted_string": { @@ -26,7 +26,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/subst.d2,1:4:5-1:6:7", + "range": "d2/testdata/d2parser/TestParse/subst.d2,1:5:6-1:6:7", "path": [ { "unquoted_string": { diff --git a/testdata/d2parser/TestParse/table_and_class.exp.json b/testdata/d2parser/TestParse/table_and_class.exp.json index 14df29b66..b44e38f25 100644 --- a/testdata/d2parser/TestParse/table_and_class.exp.json +++ b/testdata/d2parser/TestParse/table_and_class.exp.json @@ -459,7 +459,7 @@ { "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,14:2:327-14:30:355", "src": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,14:2:327-14:16:341", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,14:2:327-14:15:340", "path": [ { "unquoted_string": { @@ -487,7 +487,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,14:18:343-14:30:355", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,14:19:344-14:30:355", "path": [ { "unquoted_string": { @@ -533,7 +533,7 @@ { "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,17:2:381-17:40:419", "src": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,17:2:381-17:14:393", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,17:2:381-17:13:392", "path": [ { "unquoted_string": { @@ -561,7 +561,7 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,17:16:395-17:40:419", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,17:17:396-17:40:419", "path": [ { "unquoted_string": { @@ -607,7 +607,7 @@ { "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,20:2:442-20:30:470", "src": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,20:2:442-20:14:454", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,20:2:442-20:13:453", "path": [ { "unquoted_string": { @@ -635,7 +635,7 @@ }, "src_arrow": "<", "dst": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,20:16:456-20:30:470", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,20:17:457-20:30:470", "path": [ { "unquoted_string": { @@ -675,7 +675,7 @@ { "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,21:2:473-21:31:502", "src": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,21:2:473-21:14:485", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,21:2:473-21:13:484", "path": [ { "unquoted_string": { @@ -703,7 +703,7 @@ }, "src_arrow": "<", "dst": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,21:17:488-21:31:502", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,21:18:489-21:31:502", "path": [ { "unquoted_string": { @@ -1193,7 +1193,7 @@ { "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,43:2:986-43:21:1005", "src": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,43:2:986-43:7:991", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,43:2:986-43:6:990", "path": [ { "unquoted_string": { @@ -1210,7 +1210,7 @@ }, "src_arrow": "<", "dst": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,43:9:993-43:21:1005", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,43:10:994-43:21:1005", "path": [ { "unquoted_string": {