diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 9ffdcd76e..76f3375ea 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -180,6 +180,10 @@ func (p Position) String() string { return fmt.Sprintf("%d:%d", p.Line+1, p.Column+1) } +func (p Position) Debug() string { + return fmt.Sprintf("%d:%d:%d", p.Line, p.Column, p.Byte) +} + // See docs on Range. func (p Position) MarshalText() ([]byte, error) { return []byte(fmt.Sprintf("%d:%d:%d", p.Line, p.Column, p.Byte)), nil diff --git a/d2parser/parse.go b/d2parser/parse.go index 53286665a..c30a65621 100644 --- a/d2parser/parse.go +++ b/d2parser/parse.go @@ -361,7 +361,7 @@ func (p *parser) parseMap(isFileMap bool) *d2ast.Map { Start: p.pos, }, } - defer m.Range.End.From(&p.readerPos) + defer m.Range.End.From(&p.pos) if !isFileMap { m.Range.Start = m.Range.Start.Subtract('{', p.utf16) @@ -967,7 +967,7 @@ func (p *parser) parseKey() (k *d2ast.KeyPath) { if s == nil { return k } - if strings.HasPrefix(s.ScalarString(), "@") { + if sb.UnquotedString != nil && strings.HasPrefix(s.ScalarString(), "@") { p.errorf(s.GetRange().Start, s.GetRange().End, "%s is not a valid import, did you mean ...%[2]s?", s.ScalarString()) } @@ -1050,7 +1050,7 @@ func (p *parser) parseUnquotedString(inKey bool) (s *d2ast.UnquotedString) { p.rewind() if !eof { if _s == "...@" { - p.errorf(p.readerPos, p.pos.AdvanceString("...@", p.utf16), "unquoted strings cannot begin with ...@ as that's import spread syntax") + p.errorf(p.pos, p.pos.AdvanceString("...@", p.utf16), "unquoted strings cannot begin with ...@ as that's import spread syntax") } } diff --git a/d2parser/parse_test.go b/d2parser/parse_test.go index cca249787..dc4e14186 100644 --- a/d2parser/parse_test.go +++ b/d2parser/parse_test.go @@ -466,7 +466,7 @@ func testImport(t *testing.T) { { text: "meow: ...@file", assert: func(t testing.TB, ast *d2ast.Map, err error) { - assert.ErrorString(t, err, "d2/testdata/d2parser/TestParse/import/#08.d2:1:10: unquoted strings cannot begin with ...@ as that's import spread syntax") + assert.ErrorString(t, err, "d2/testdata/d2parser/TestParse/import/#08.d2:1:7: unquoted strings cannot begin with ...@ as that's import spread syntax") }, }, } diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json index 4dfed8f49..34b6b536d 100644 --- a/testdata/d2compiler/TestCompile/array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/array-classes.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,0:9:9-13:0:184", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,0:9:9-13:1:185", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,1:15:26-5:2:85", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,1:15:26-5:3:86", "nodes": [ { "map_key": { @@ -185,7 +185,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,6:8:95-9:2:143", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,6:8:95-9:3:144", "nodes": [ { "map_key": { @@ -287,7 +287,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,10:8:153-12:1:182", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,10:8:153-12:2:183", "nodes": [ { "map_key": { @@ -361,7 +361,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,14:8:194-14:37:223", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,14:8:194-14:38:224", "nodes": [ { "map_key": { @@ -441,7 +441,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,15:7:232-15:36:261", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,15:7:232-15:37:262", "nodes": [ { "map_key": { @@ -544,7 +544,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:17:281-17:40:304", + "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:17:281-17:41:305", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index bc9297187..8b16ed57d 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -32,7 +32,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/basic_icon.d2,0:8:8-2:0:75", + "range": "d2/testdata/d2compiler/TestCompile/basic_icon.d2,0:8:8-2:1:76", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index 115675dbb..5b6fd830a 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/basic_sequence.d2,0:3:3-2:0:31", + "range": "d2/testdata/d2compiler/TestCompile/basic_sequence.d2,0:3:3-2:1:32", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index d5d26fb77..712818c78 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/basic_shape.d2,1:3:4-3:0:22", + "range": "d2/testdata/d2compiler/TestCompile/basic_shape.d2,1:3:4-3:1:23", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index cb68c4cc1..6ea3ff1b7 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/basic_style.d2,1:3:4-3:0:26", + "range": "d2/testdata/d2compiler/TestCompile/basic_style.d2,1:3:4-3:1:27", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/class-shape-class.exp.json b/testdata/d2compiler/TestCompile/class-shape-class.exp.json index a787bab08..dd3a62ba4 100644 --- a/testdata/d2compiler/TestCompile/class-shape-class.exp.json +++ b/testdata/d2compiler/TestCompile/class-shape-class.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,0:9:9-4:0:48", + "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,0:9:9-4:1:49", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,1:14:25-3:2:46", + "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,1:14:25-3:3:47", "nodes": [ { "map_key": { @@ -118,7 +118,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,6:8:59-9:0:97", + "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,6:8:59-9:1:98", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index aeaf5b5d4..fbf89fc85 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -37,7 +37,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,0:17:17-6:0:80", + "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,0:17:17-6:1:81", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index d9df3a793..a1d7f7116 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/class_style.d2,0:17:17-4:0:80", + "range": "d2/testdata/d2compiler/TestCompile/class_style.d2,0:17:17-4:1:81", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json index a96e1034f..fbc180c96 100644 --- a/testdata/d2compiler/TestCompile/classes.exp.json +++ b/testdata/d2compiler/TestCompile/classes.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,0:9:9-10:0:145", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,0:9:9-10:1:146", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,1:15:26-5:2:85", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,1:15:26-5:3:86", "nodes": [ { "map_key": { @@ -185,7 +185,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,6:8:95-9:2:143", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,6:8:95-9:3:144", "nodes": [ { "map_key": { @@ -292,7 +292,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,11:8:155-11:29:176", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,11:8:155-11:30:177", "nodes": [ { "map_key": { @@ -364,7 +364,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,12:11:189-12:49:227", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,12:11:189-12:50:228", "nodes": [ { "map_key": { @@ -470,7 +470,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,13:7:236-13:41:270", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,13:7:236-13:42:271", "nodes": [ { "map_key": { @@ -588,7 +588,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:17:290-15:31:304", + "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:17:290-15:32:305", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json index 9441a3351..6701223ef 100644 --- a/testdata/d2compiler/TestCompile/constraint_label.exp.json +++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:4:4-3:0:37", + "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:4:4-3:1:38", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json index ef03ae945..27e097fe3 100644 --- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json +++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimension_with_style.d2,0:3:3-3:0:41", + "range": "d2/testdata/d2compiler/TestCompile/dimension_with_style.d2,0:3:3-3:1:42", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json index 9cfeaf3bb..1ec0f28b8 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,1:12:13-44:0:503", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,1:12:13-44:1:504", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,2:19:34-11:1:130", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,2:19:34-11:2:131", "nodes": [ { "map_key": { @@ -137,7 +137,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,6:11:77-10:2:127", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,6:11:77-10:3:128", "nodes": [ { "map_key": { @@ -262,7 +262,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,12:20:152-21:1:247", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,12:20:152-21:2:248", "nodes": [ { "map_key": { @@ -377,7 +377,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,17:10:209-20:2:244", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,17:10:209-20:3:245", "nodes": [ { "map_key": { @@ -473,7 +473,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,22:17:266-32:1:374", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,22:17:266-32:2:375", "nodes": [ { "map_key": { @@ -588,7 +588,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,27:11:321-31:2:371", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,27:11:321-31:3:372", "nodes": [ { "map_key": { @@ -713,7 +713,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,33:20:396-43:1:501", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,33:20:396-43:2:502", "nodes": [ { "map_key": { @@ -828,7 +828,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,38:8:451-42:2:498", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,38:8:451-42:3:499", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json index 639d347d6..909b07972 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -32,7 +32,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_nonimage.d2,0:8:8-4:0:52", + "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_nonimage.d2,0:8:8-4:1:53", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 4ad934650..3e1496a33 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:8:8-8:0:166", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:8:8-8:1:167", "nodes": [ { "map_key": { @@ -84,7 +84,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,1:57:67-3:2:90", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,1:57:67-3:3:91", "nodes": [ { "map_key": { @@ -179,7 +179,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,5:20:137-7:2:164", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,5:20:137-7:3:165", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json index 80b30f4a5..50f2f04da 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:8:8-2:0:67", + "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:8:8-2:1:68", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index d0140ae67..fec443aa2 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -87,7 +87,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:13:14-3:0:105", + "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:13:14-3:1:106", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index 4d9b52f8f..749938dbd 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:5:5-4:0:47", + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:5:5-4:1:48", "nodes": [ { "map_key": { @@ -155,7 +155,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:5:55-10:0:98", + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:5:55-10:1:99", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index bd1d26af7..445d9bc7b 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:8:9-3:0:33", + "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:8:9-3:1:34", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index 702e516fe..b46ef9366 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:8:8-3:0:51", + "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:8:8-3:1:52", "nodes": [ { "comment": { diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 9416b5b07..846ab083a 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -101,7 +101,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:13:21-4:0:112", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:13:21-4:1:113", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index c279ce0a2..10df2e0aa 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,1:3:4-4:0:37", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,1:3:4-4:1:38", "nodes": [ { "map_key": { 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 be517f33a..b0a71b47e 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,1:3:4-3:0:19", + "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,1:3:4-3:1:20", "nodes": [ { "map_key": { 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 37936ebcd..515aa5f3c 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,1:3:4-3:0:15", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,1:3:4-3:1:16", "nodes": [ { "map_key": { 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 ef5091d56..72d765f4c 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 @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,2:3:11-4:0:49", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,2:3:11-4:1:50", "nodes": [ { "map_key": { 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 a8a8a8b04..06a967f42 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 @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,2:3:11-6:0:57", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,2:3:11-6:1:58", "nodes": [ { "map_key": { @@ -147,7 +147,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:18:31-5:1:55", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:18:31-5:2:56", "nodes": [ { "map_key": { 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 893b3ec82..dfa717006 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 @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,2:3:11-8:0:67", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,2:3:11-8:1:68", "nodes": [ { "map_key": { @@ -147,7 +147,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:18:31-7:1:65", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:18:31-7:2:66", "nodes": [ { "map_key": { @@ -171,7 +171,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,4:9:42-6:2:62", + "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,4:9:42-6:3:63", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index 07d7b8c0c..bf5ec0d2f 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -60,7 +60,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:21:21-0:40:40", + "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:21:21-0:41:41", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index 89c09dbfb..0b2f9fd4d 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:8:9-3:0:100", + "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:8:9-3:1:101", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 592d3f381..0c2291704 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:8:8-4:0:55", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:8:8-4:1:56", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,1:20:30-3:2:53", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,1:20:30-3:3:54", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index d33c5a281..eab55ec33 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:19:26-3:0:43", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:19:26-3:1:44", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index 861726cd5..53e80dbee 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:8:9-5:0:43", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:8:9-5:1:44", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,2:9:20-4:2:41", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,2:9:20-4:3:42", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index b59517440..4ca7a689f 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:8:9-3:0:31", + "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:8:9-3:1:32", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 8ae05a29c..46e2807ef 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:8:8-2:0:44", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:8:8-2:1:45", "nodes": [ { "map_key": { @@ -167,7 +167,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:30:76-5:0:95", + "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:30:76-5:1:96", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 762bf710a..2d0380cbd 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:8:8-0:43:43", + "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:8:8-0:44:44", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index cb3102c6c..b4d1aadd1 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:30:37-3:0:56", + "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:30:37-3:1:57", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/fill-pattern.exp.json b/testdata/d2compiler/TestCompile/fill-pattern.exp.json index 6b30f7fc0..cd107b6dc 100644 --- a/testdata/d2compiler/TestCompile/fill-pattern.exp.json +++ b/testdata/d2compiler/TestCompile/fill-pattern.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/fill-pattern.d2,0:3:3-4:0:42", + "range": "d2/testdata/d2compiler/TestCompile/fill-pattern.d2,0:3:3-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/fill-pattern.d2,1:8:13-3:2:40", + "range": "d2/testdata/d2compiler/TestCompile/fill-pattern.d2,1:8:13-3:3:41", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/grid.exp.json b/testdata/d2compiler/TestCompile/grid.exp.json index 6c45373de..f1e7bbade 100644 --- a/testdata/d2compiler/TestCompile/grid.exp.json +++ b/testdata/d2compiler/TestCompile/grid.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/grid.d2,0:5:5-3:0:42", + "range": "d2/testdata/d2compiler/TestCompile/grid.d2,0:5:5-3:1:43", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/grid_nested.exp.json b/testdata/d2compiler/TestCompile/grid_nested.exp.json index a6a72499e..8ddc377d4 100644 --- a/testdata/d2compiler/TestCompile/grid_nested.exp.json +++ b/testdata/d2compiler/TestCompile/grid_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/grid_nested.d2,0:5:5-15:0:123", + "range": "d2/testdata/d2compiler/TestCompile/grid_nested.d2,0:5:5-15:1:124", "nodes": [ { "map_key": { @@ -212,7 +212,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/grid_nested.d2,8:4:76-14:1:121", + "range": "d2/testdata/d2compiler/TestCompile/grid_nested.d2,8:4:76-14:2:122", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index deba163ae..0842c6078 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -32,7 +32,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,0:8:8-4:0:116", + "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,0:8:8-4:1:117", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index a06090d29..724803a80 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:3:3-2:0:24", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:3:3-2:1:25", "nodes": [ { "map_key": { @@ -99,7 +99,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:0:54", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:1:55", "nodes": [ { "map_key": { @@ -123,7 +123,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:5:41-6:2:52", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:5:41-6:3:53", "nodes": [ { "map_key": { @@ -325,7 +325,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:3:3-2:0:24", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:3:3-2:1:25", "nodes": [ { "map_key": { @@ -397,7 +397,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:0:54", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:1:55", "nodes": [ { "map_key": { @@ -421,7 +421,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:5:41-6:2:52", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:5:41-6:3:53", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 3130fecd5..6662705c3 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -103,7 +103,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:0:112", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:1:113", "nodes": [ { "map_key": { @@ -127,7 +127,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:2:110", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:3:111", "nodes": [ { "map_key": { @@ -217,7 +217,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:174", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:1:175", "nodes": [ { "map_key": { @@ -241,7 +241,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:172", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:3:173", "nodes": [ { "map_key": { @@ -524,7 +524,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:0:112", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:1:113", "nodes": [ { "map_key": { @@ -548,7 +548,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:2:110", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:3:111", "nodes": [ { "map_key": { @@ -638,7 +638,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:174", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:1:175", "nodes": [ { "map_key": { @@ -662,7 +662,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:172", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:3:173", "nodes": [ { "map_key": { @@ -993,7 +993,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:0:112", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:1:113", "nodes": [ { "map_key": { @@ -1017,7 +1017,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:2:110", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:3:111", "nodes": [ { "map_key": { @@ -1107,7 +1107,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:0:174", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:1:175", "nodes": [ { "map_key": { @@ -1131,7 +1131,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:2:172", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:3:173", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 79b61eb73..8a9f54bb9 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -70,7 +70,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:100", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:1:101", "nodes": [ { "map_key": { @@ -94,7 +94,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:2:98", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:3:99", "nodes": [ { "map_key": { @@ -118,7 +118,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:4:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:5:95", "nodes": [ { "map_key": { @@ -142,7 +142,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:6:88", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:7:89", "nodes": [ { "map_key": { @@ -350,7 +350,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:100", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:1:101", "nodes": [ { "map_key": { @@ -374,7 +374,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:2:98", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:3:99", "nodes": [ { "map_key": { @@ -398,7 +398,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:4:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:5:95", "nodes": [ { "map_key": { @@ -422,7 +422,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:6:88", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:7:89", "nodes": [ { "map_key": { @@ -568,7 +568,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:0:100", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:1:101", "nodes": [ { "map_key": { @@ -592,7 +592,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:2:98", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:3:99", "nodes": [ { "map_key": { @@ -616,7 +616,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:4:94", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:5:95", "nodes": [ { "map_key": { @@ -640,7 +640,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:6:88", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:7:89", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index 77fab9ab6..30f8ff5c6 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -70,7 +70,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-5:0:41", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-5:1:42", "nodes": [ { "map_key": { @@ -94,7 +94,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:4:31-4:1:39", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:4:31-4:2:40", "nodes": [ { "map_key": { @@ -292,7 +292,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-5:0:41", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-5:1:42", "nodes": [ { "map_key": { @@ -316,7 +316,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:4:31-4:1:39", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:4:31-4:2:40", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index 2fba9e04d..9cee45ad8 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:120", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:1:121", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:118", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:3:119", "nodes": [ { "map_key": { @@ -121,7 +121,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:114", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:5:115", "nodes": [ { "map_key": { @@ -145,7 +145,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:6:108", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:7:109", "nodes": [ { "map_key": { @@ -382,7 +382,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:120", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:1:121", "nodes": [ { "map_key": { @@ -406,7 +406,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:118", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:3:119", "nodes": [ { "map_key": { @@ -453,7 +453,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:114", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:5:115", "nodes": [ { "map_key": { @@ -477,7 +477,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:6:108", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:7:109", "nodes": [ { "map_key": { @@ -714,7 +714,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:0:120", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:1:121", "nodes": [ { "map_key": { @@ -738,7 +738,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:2:118", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:3:119", "nodes": [ { "map_key": { @@ -785,7 +785,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:4:114", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:5:115", "nodes": [ { "map_key": { @@ -809,7 +809,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:6:108", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:7:109", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 9c3d344c9..08025a178 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,0:7:7-7:0:83", + "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,0:7:7-7:1:84", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,1:9:18-6:2:81", + "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,1:9:18-6:3:82", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json index 92b041542..a91e667b7 100644 --- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json +++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/nil_scope_obj_regression.d2,1:3:5-3:0:13", + "range": "d2/testdata/d2compiler/TestCompile/nil_scope_obj_regression.d2,1:3:5-3:1:14", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 8d2ad1a19..d89b63e43 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,0:3:3-2:0:45", + "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,0:3:3-2:1:46", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/positions.exp.json b/testdata/d2compiler/TestCompile/positions.exp.json index f639d6d9f..66e311c94 100644 --- a/testdata/d2compiler/TestCompile/positions.exp.json +++ b/testdata/d2compiler/TestCompile/positions.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/positions.d2,0:5:5-3:0:28", + "range": "d2/testdata/d2compiler/TestCompile/positions.d2,0:5:5-3:1:29", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/reordered-classes.exp.json b/testdata/d2compiler/TestCompile/reordered-classes.exp.json index 556b25462..7fa5d529c 100644 --- a/testdata/d2compiler/TestCompile/reordered-classes.exp.json +++ b/testdata/d2compiler/TestCompile/reordered-classes.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,0:9:9-4:0:40", + "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,0:9:9-4:1:41", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,1:5:16-3:2:38", + "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,1:5:16-3:3:39", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index 3a21e6622..18169d3e7 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,0:3:3-5:0:80", + "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,0:3:3-5:1:81", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json index ec9e1b268..5843d3472 100644 --- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json @@ -106,7 +106,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,4:15:44-9:0:135", + "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,4:15:44-9:1:136", "nodes": [ { "map_key": { @@ -130,7 +130,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,5:29:75-8:2:133", + "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,5:29:75-8:3:134", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json index 7397f55e3..5538052fd 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -150,7 +150,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,2:4:43-4:0:61", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,2:4:43-4:1:62", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json index 5a23fa225..716d637aa 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -105,7 +105,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,2:4:34-5:0:58", + "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,2:4:34-5:1:59", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json index d9046aa5e..ce0b6ab62 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -106,7 +106,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,2:6:34-4:0:52", + "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,2:6:34-4:1:53", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json index e539e5d0f..777ed0693 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:3:3-8:0:99", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,0:3:3-8:1:100", "nodes": [ { "map_key": { @@ -130,7 +130,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,3:9:45-7:2:97", + "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,3:9:45-7:3:98", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json index 655ebf0ae..180e8243e 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/set_direction.d2,0:3:3-2:0:23", + "range": "d2/testdata/d2compiler/TestCompile/set_direction.d2,0:3:3-2:1:24", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json index 258a6a4a5..f2575ae6f 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -32,7 +32,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/single_dimension_on_circle.d2,0:8:8-3:0:38", + "range": "d2/testdata/d2compiler/TestCompile/single_dimension_on_circle.d2,0:8:8-3:1:39", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index 29516d953..d9dd89b60 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,0:3:3-9:0:85", + "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,0:3:3-9:1:86", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,1:9:14-3:2:41", + "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,1:9:14-3:3:42", "nodes": [ { "map_key": { @@ -113,7 +113,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,4:5:48-7:2:79", + "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,4:5:48-7:3:80", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index 4b2e0bb0a..577d7bfed 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -37,7 +37,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,0:17:17-5:0:72", + "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,0:17:17-5:1:73", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index 4d6854ed7..3b1fa2a97 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:4:4-2:0:30", + "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:4:4-2:1:31", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json index ce190463d..4db9cec83 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,0:3:3-3:0:28", + "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,0:3:3-3:1:29", "nodes": [ { "map_key": { @@ -112,7 +112,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,4:3:33-7:0:58", + "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,4:3:33-7:1:59", "nodes": [ { "map_key": { @@ -242,7 +242,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:12:72-10:0:97", + "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:12:72-10:1:98", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index 56abfa352..d2e922559 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_style.d2,0:17:17-4:0:79", + "range": "d2/testdata/d2compiler/TestCompile/table_style.d2,0:17:17-4:1:80", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index 9c2291acb..2ecdfd17b 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,0:17:17-7:0:111", + "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,0:17:17-7:1:112", "nodes": [ { "map_key": { @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,3:9:67-6:2:109", + "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,3:9:67-6:3:110", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json index 19be4223d..f9bcee35a 100644 --- a/testdata/d2compiler/TestCompile/text-transform.exp.json +++ b/testdata/d2compiler/TestCompile/text-transform.exp.json @@ -93,7 +93,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:11:28-5:0:76", + "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:11:28-5:1:77", "nodes": [ { "map_key": { @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,2:9:39-4:2:74", + "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,2:9:39-4:3:75", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json index 5aa625846..f0968f581 100644 --- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,0:3:3-2:0:22", + "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,0:3:3-2:1:23", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index 09d2123ac..4ed0d6f9c 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,1:3:4-3:0:19", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,1:3:4-3:1:20", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index 67ed11d4f..1ed795599 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,1:3:4-3:0:26", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,1:3:4-3:1:27", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index b74d8611b..85ededb4c 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -83,7 +83,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,2:3:82-4:0:165", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,2:3:82-4:1:166", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index f164aee76..d6f36f11a 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -83,7 +83,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,2:3:82-4:0:170", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,2:3:82-4:1:171", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 7c462ae53..359ed5272 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,1:3:4-5:0:30", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,1:3:4-5:1:31", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,2:4:10-4:1:28", + "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,2:4:10-4:2:29", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index 4db535bae..aeb65cc65 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_create.d2,1:3:4-3:0:11", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_create.d2,1:3:4-3:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index fc6b50a55..1cbd356c6 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_not_root.d2,1:3:4-5:0:25", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_not_root.d2,1:3:4-5:1:26", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_not_root.d2,2:5:11-4:2:23", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_not_root.d2,2:5:11-4:3:24", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 52086b6ae..90dd4ab3c 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,1:3:4-3:0:91", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,1:3:4-3:1:92", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index f3243d490..53175bb33 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -60,7 +60,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,2:3:85-4:0:172", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,2:3:85-4:1:173", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index c81350873..6d1afa8d0 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_squared.d2,1:3:4-5:0:27", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_squared.d2,1:3:4-5:1:28", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_squared.d2,2:5:11-4:2:25", + "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_squared.d2,2:5:11-4:3:26", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json index d5c56bdee..3707ce018 100644 --- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/underscore_unresolved_obj.d2,1:3:4-3:0:11", + "range": "d2/testdata/d2compiler/TestCompile/underscore_unresolved_obj.d2,1:3:4-3:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index 6bd4fe629..d04a550c8 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,0:3:3-2:0:32", + "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,0:3:3-2:1:33", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json index eef3087ba..a644e6f8f 100644 --- a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json +++ b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.d2,0:3:3-0:50:50", + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.d2,0:3:3-0:51:51", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/url_tooltip.exp.json b/testdata/d2compiler/TestCompile/url_tooltip.exp.json index 8895108bd..1ab98932f 100644 --- a/testdata/d2compiler/TestCompile/url_tooltip.exp.json +++ b/testdata/d2compiler/TestCompile/url_tooltip.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/url_tooltip.d2,0:3:3-0:31:31", + "range": "d2/testdata/d2compiler/TestCompile/url_tooltip.d2,0:3:3-0:32:32", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json index af890238e..b934f9b02 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,0:13:13-8:0:203", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,0:13:13-8:1:204", "nodes": [ { "map_key": { @@ -94,7 +94,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,2:10:44-2:34:68", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,2:10:44-2:35:69", "nodes": [ { "map_key": { @@ -265,7 +265,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,6:14:134-6:38:158", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,6:14:134-6:39:159", "nodes": [ { "map_key": { @@ -337,7 +337,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,7:17:177-7:41:201", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,7:17:177-7:42:202", "nodes": [ { "map_key": { @@ -404,7 +404,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,10:26:232-15:0:350", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,10:26:232-15:1:351", "nodes": [ { "map_key": { @@ -504,7 +504,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,13:18:281-13:42:305", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,13:18:281-13:43:306", "nodes": [ { "map_key": { @@ -576,7 +576,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,14:17:324-14:41:348", + "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,14:17:324-14:42:349", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 0a2c78652..5395e25a1 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:1:164", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:3:33", "nodes": [ { "map_key": { @@ -103,7 +103,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:3:162", "nodes": [ { "map_key": { @@ -150,7 +150,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:3:158", "nodes": [ { "map_key": { @@ -174,7 +174,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:4:88", "nodes": null } } @@ -202,7 +202,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:4:154", "nodes": [ { "map_key": { @@ -226,7 +226,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:5:149", "nodes": [ { "map_key": { @@ -344,7 +344,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:1:164", "nodes": [ { "map_key": { @@ -368,7 +368,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:3:33", "nodes": [ { "map_key": { @@ -420,7 +420,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:3:162", "nodes": [ { "map_key": { @@ -467,7 +467,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:3:158", "nodes": [ { "map_key": { @@ -491,7 +491,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:4:88", "nodes": null } } @@ -519,7 +519,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:4:154", "nodes": [ { "map_key": { @@ -543,7 +543,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:5:149", "nodes": [ { "map_key": { @@ -709,7 +709,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:1:164", "nodes": [ { "map_key": { @@ -733,7 +733,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:3:33", "nodes": [ { "map_key": { @@ -785,7 +785,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:3:162", "nodes": [ { "map_key": { @@ -832,7 +832,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:3:158", "nodes": [ { "map_key": { @@ -856,7 +856,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:4:88", "nodes": null } } @@ -884,7 +884,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:4:154", "nodes": [ { "map_key": { @@ -908,7 +908,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:5:149", "nodes": [ { "map_key": { @@ -1074,7 +1074,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:1:164", "nodes": [ { "map_key": { @@ -1098,7 +1098,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:3:33", "nodes": [ { "map_key": { @@ -1150,7 +1150,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:3:162", "nodes": [ { "map_key": { @@ -1197,7 +1197,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:3:158", "nodes": [ { "map_key": { @@ -1221,7 +1221,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:4:88", "nodes": null } } @@ -1249,7 +1249,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:4:154", "nodes": [ { "map_key": { @@ -1273,7 +1273,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:5:149", "nodes": [ { "map_key": { @@ -1439,7 +1439,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:0:163", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:1:164", "nodes": [ { "map_key": { @@ -1463,7 +1463,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:2:32", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:3:33", "nodes": [ { "map_key": { @@ -1515,7 +1515,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:2:161", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:3:162", "nodes": [ { "map_key": { @@ -1562,7 +1562,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:2:157", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:3:158", "nodes": [ { "map_key": { @@ -1586,7 +1586,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:3:87", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:4:88", "nodes": null } } @@ -1614,7 +1614,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:3:153", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:4:154", "nodes": [ { "map_key": { @@ -1638,7 +1638,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:4:148", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:5:149", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index ffb88ac9e..23e310c37 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:0:143", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:1:144", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:2:37", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:3:38", "nodes": [ { "map_key": { @@ -126,7 +126,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:2:141", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:3:142", "nodes": [ { "map_key": { @@ -173,7 +173,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:2:137", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:3:138", "nodes": [ { "map_key": { @@ -197,7 +197,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:3:101", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:4:102", "nodes": [ { "map_key": { @@ -249,7 +249,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:3:133", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:4:134", "nodes": [ { "map_key": { @@ -423,7 +423,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:0:143", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:1:144", "nodes": [ { "map_key": { @@ -447,7 +447,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:2:37", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:3:38", "nodes": [ { "map_key": { @@ -499,7 +499,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:2:141", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:3:142", "nodes": [ { "map_key": { @@ -546,7 +546,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:2:137", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:3:138", "nodes": [ { "map_key": { @@ -570,7 +570,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:3:101", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:4:102", "nodes": [ { "map_key": { @@ -622,7 +622,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:3:133", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:4:134", "nodes": [ { "map_key": { @@ -796,7 +796,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:0:143", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:1:144", "nodes": [ { "map_key": { @@ -820,7 +820,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:2:37", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:3:38", "nodes": [ { "map_key": { @@ -872,7 +872,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:2:141", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:3:142", "nodes": [ { "map_key": { @@ -919,7 +919,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:2:137", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:3:138", "nodes": [ { "map_key": { @@ -943,7 +943,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:3:101", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:4:102", "nodes": [ { "map_key": { @@ -995,7 +995,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:3:133", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:4:134", "nodes": [ { "map_key": { @@ -1169,7 +1169,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:0:143", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:1:144", "nodes": [ { "map_key": { @@ -1193,7 +1193,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:2:37", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:3:38", "nodes": [ { "map_key": { @@ -1245,7 +1245,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:2:141", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:3:142", "nodes": [ { "map_key": { @@ -1292,7 +1292,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:2:137", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:3:138", "nodes": [ { "map_key": { @@ -1316,7 +1316,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:3:101", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:4:102", "nodes": [ { "map_key": { @@ -1368,7 +1368,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:3:133", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:4:134", "nodes": [ { "map_key": { @@ -1589,7 +1589,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:0:143", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:1:144", "nodes": [ { "map_key": { @@ -1613,7 +1613,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:2:37", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:3:38", "nodes": [ { "map_key": { @@ -1665,7 +1665,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:2:141", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:3:142", "nodes": [ { "map_key": { @@ -1712,7 +1712,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:2:137", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:3:138", "nodes": [ { "map_key": { @@ -1736,7 +1736,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:3:101", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:4:102", "nodes": [ { "map_key": { @@ -1788,7 +1788,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:3:133", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:4:134", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index e53b1ebc1..83483ec1d 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:0:63", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:1:64", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:2:37", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:3:38", "nodes": [ { "map_key": { @@ -126,7 +126,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:2:61", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:3:62", "nodes": [ { "map_key": { @@ -290,7 +290,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:0:63", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:1:64", "nodes": [ { "map_key": { @@ -314,7 +314,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:2:37", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:3:38", "nodes": [ { "map_key": { @@ -366,7 +366,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:2:61", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:3:62", "nodes": [ { "map_key": { @@ -530,7 +530,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:0:63", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:1:64", "nodes": [ { "map_key": { @@ -554,7 +554,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:2:37", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:3:38", "nodes": [ { "map_key": { @@ -606,7 +606,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:2:61", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:3:62", "nodes": [ { "map_key": { diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index 6e3e364fc..e4c36bd76 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:11:19-6:0:67", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:11:19-6:1:68", "nodes": [ { "map_key": { @@ -97,7 +97,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:5:26-5:2:65", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:5:26-5:3:66", "nodes": [ { "map_key": { @@ -425,7 +425,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:11:19-6:0:67", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:11:19-6:1:68", "nodes": [ { "map_key": { @@ -449,7 +449,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:5:26-5:2:65", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:5:26-5:3:66", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/classes/basic.exp.json b/testdata/d2ir/TestCompile/classes/basic.exp.json index 5b67fed1d..eed20a6c8 100644 --- a/testdata/d2ir/TestCompile/classes/basic.exp.json +++ b/testdata/d2ir/TestCompile/classes/basic.exp.json @@ -309,7 +309,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/basic.d2,2:9:22-4:2:49", + "range": "TestCompile/classes/basic.d2,2:9:22-4:3:50", "nodes": [ { "map_key": { @@ -416,7 +416,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/basic.d2,1:9:11-5:0:51", + "range": "TestCompile/classes/basic.d2,1:9:11-5:1:52", "nodes": [ { "map_key": { @@ -440,7 +440,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/basic.d2,2:9:22-4:2:49", + "range": "TestCompile/classes/basic.d2,2:9:22-4:3:50", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/classes/inherited.exp.json b/testdata/d2ir/TestCompile/classes/inherited.exp.json index 8e5054f05..f88697361 100644 --- a/testdata/d2ir/TestCompile/classes/inherited.exp.json +++ b/testdata/d2ir/TestCompile/classes/inherited.exp.json @@ -253,7 +253,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -360,7 +360,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -384,7 +384,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -704,7 +704,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -811,7 +811,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -835,7 +835,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1155,7 +1155,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1458,7 +1458,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -1565,7 +1565,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -1589,7 +1589,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1695,7 +1695,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -1719,7 +1719,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -1887,7 +1887,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,8:9:96-15:6:203", + "range": "TestCompile/classes/inherited.d2,8:9:96-15:7:204", "nodes": [ { "map_key": { @@ -1911,7 +1911,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -1935,7 +1935,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -2279,7 +2279,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -2582,7 +2582,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -2689,7 +2689,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -2713,7 +2713,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -2819,7 +2819,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -2843,7 +2843,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -3067,7 +3067,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,16:9:214-18:6:232", + "range": "TestCompile/classes/inherited.d2,16:9:214-18:7:233", "nodes": [ { "map_key": { @@ -3357,7 +3357,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -3826,7 +3826,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -3927,7 +3927,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -4034,7 +4034,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -4058,7 +4058,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -4164,7 +4164,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -4188,7 +4188,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -4294,7 +4294,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -4318,7 +4318,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -4593,7 +4593,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,19:9:243-26:6:351", + "range": "TestCompile/classes/inherited.d2,19:9:243-26:7:352", "nodes": [ { "map_key": { @@ -4617,7 +4617,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -4641,7 +4641,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -4985,7 +4985,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -5454,7 +5454,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -5555,7 +5555,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -5662,7 +5662,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -5686,7 +5686,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -5792,7 +5792,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -5816,7 +5816,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -5922,7 +5922,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -5946,7 +5946,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -6536,7 +6536,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -7005,7 +7005,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -7106,7 +7106,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -7213,7 +7213,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/inherited.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -7237,7 +7237,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/inherited.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -7343,7 +7343,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -7367,7 +7367,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -7473,7 +7473,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -7497,7 +7497,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -7609,7 +7609,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { @@ -7695,7 +7695,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,28:16:380-32:8:434", + "range": "TestCompile/classes/inherited.d2,28:16:380-32:9:435", "nodes": [ { "map_key": { @@ -7719,7 +7719,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { @@ -7810,7 +7810,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,27:9:362-34:6:452", + "range": "TestCompile/classes/inherited.d2,27:9:362-34:7:453", "nodes": [ { "map_key": { @@ -7834,7 +7834,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,28:16:380-32:8:434", + "range": "TestCompile/classes/inherited.d2,28:16:380-32:9:435", "nodes": [ { "map_key": { @@ -7858,7 +7858,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { @@ -7977,7 +7977,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,7:9:85-35:4:458", + "range": "TestCompile/classes/inherited.d2,7:9:85-35:5:459", "nodes": [ { "map_key": { @@ -8001,7 +8001,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,8:9:96-15:6:203", + "range": "TestCompile/classes/inherited.d2,8:9:96-15:7:204", "nodes": [ { "map_key": { @@ -8025,7 +8025,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -8049,7 +8049,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -8155,7 +8155,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,16:9:214-18:6:232", + "range": "TestCompile/classes/inherited.d2,16:9:214-18:7:233", "nodes": [ { "map_key": { @@ -8207,7 +8207,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,19:9:243-26:6:351", + "range": "TestCompile/classes/inherited.d2,19:9:243-26:7:352", "nodes": [ { "map_key": { @@ -8231,7 +8231,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -8255,7 +8255,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -8361,7 +8361,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,27:9:362-34:6:452", + "range": "TestCompile/classes/inherited.d2,27:9:362-34:7:453", "nodes": [ { "map_key": { @@ -8385,7 +8385,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,28:16:380-32:8:434", + "range": "TestCompile/classes/inherited.d2,28:16:380-32:9:435", "nodes": [ { "map_key": { @@ -8409,7 +8409,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { @@ -8533,7 +8533,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,6:10:74-36:2:462", + "range": "TestCompile/classes/inherited.d2,6:10:74-36:3:463", "nodes": [ { "map_key": { @@ -8557,7 +8557,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,7:9:85-35:4:458", + "range": "TestCompile/classes/inherited.d2,7:9:85-35:5:459", "nodes": [ { "map_key": { @@ -8581,7 +8581,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,8:9:96-15:6:203", + "range": "TestCompile/classes/inherited.d2,8:9:96-15:7:204", "nodes": [ { "map_key": { @@ -8605,7 +8605,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -8629,7 +8629,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -8735,7 +8735,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,16:9:214-18:6:232", + "range": "TestCompile/classes/inherited.d2,16:9:214-18:7:233", "nodes": [ { "map_key": { @@ -8787,7 +8787,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,19:9:243-26:6:351", + "range": "TestCompile/classes/inherited.d2,19:9:243-26:7:352", "nodes": [ { "map_key": { @@ -8811,7 +8811,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -8835,7 +8835,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -8941,7 +8941,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,27:9:362-34:6:452", + "range": "TestCompile/classes/inherited.d2,27:9:362-34:7:453", "nodes": [ { "map_key": { @@ -8965,7 +8965,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,28:16:380-32:8:434", + "range": "TestCompile/classes/inherited.d2,28:16:380-32:9:435", "nodes": [ { "map_key": { @@ -8989,7 +8989,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { @@ -9118,7 +9118,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,5:11:62-37:0:464", + "range": "TestCompile/classes/inherited.d2,5:11:62-37:1:465", "nodes": [ { "map_key": { @@ -9142,7 +9142,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,6:10:74-36:2:462", + "range": "TestCompile/classes/inherited.d2,6:10:74-36:3:463", "nodes": [ { "map_key": { @@ -9166,7 +9166,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,7:9:85-35:4:458", + "range": "TestCompile/classes/inherited.d2,7:9:85-35:5:459", "nodes": [ { "map_key": { @@ -9190,7 +9190,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,8:9:96-15:6:203", + "range": "TestCompile/classes/inherited.d2,8:9:96-15:7:204", "nodes": [ { "map_key": { @@ -9214,7 +9214,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,9:17:115-13:8:185", + "range": "TestCompile/classes/inherited.d2,9:17:115-13:9:186", "nodes": [ { "map_key": { @@ -9238,7 +9238,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,10:18:135-12:10:175", + "range": "TestCompile/classes/inherited.d2,10:18:135-12:11:176", "nodes": [ { "map_key": { @@ -9344,7 +9344,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,16:9:214-18:6:232", + "range": "TestCompile/classes/inherited.d2,16:9:214-18:7:233", "nodes": [ { "map_key": { @@ -9396,7 +9396,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,19:9:243-26:6:351", + "range": "TestCompile/classes/inherited.d2,19:9:243-26:7:352", "nodes": [ { "map_key": { @@ -9420,7 +9420,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,20:17:262-24:8:333", + "range": "TestCompile/classes/inherited.d2,20:17:262-24:9:334", "nodes": [ { "map_key": { @@ -9444,7 +9444,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,21:18:282-23:10:323", + "range": "TestCompile/classes/inherited.d2,21:18:282-23:11:324", "nodes": [ { "map_key": { @@ -9550,7 +9550,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,27:9:362-34:6:452", + "range": "TestCompile/classes/inherited.d2,27:9:362-34:7:453", "nodes": [ { "map_key": { @@ -9574,7 +9574,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,28:16:380-32:8:434", + "range": "TestCompile/classes/inherited.d2,28:16:380-32:9:435", "nodes": [ { "map_key": { @@ -9598,7 +9598,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/inherited.d2,29:16:398-31:10:424", + "range": "TestCompile/classes/inherited.d2,29:16:398-31:11:425", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json index b1fdcab52..087bc4de2 100644 --- a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json +++ b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json @@ -253,7 +253,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:2:45", + "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:3:46", "nodes": [ { "map_key": { @@ -360,7 +360,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,0:9:9-4:0:47", + "range": "TestCompile/classes/layer-modify.d2,0:9:9-4:1:48", "nodes": [ { "map_key": { @@ -384,7 +384,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:2:45", + "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:3:46", "nodes": [ { "map_key": { @@ -974,7 +974,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:2:45", + "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:3:46", "nodes": [ { "map_key": { @@ -1208,7 +1208,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,0:9:9-4:0:47", + "range": "TestCompile/classes/layer-modify.d2,0:9:9-4:1:48", "nodes": [ { "map_key": { @@ -1232,7 +1232,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:2:45", + "range": "TestCompile/classes/layer-modify.d2,1:7:18-3:3:46", "nodes": [ { "map_key": { @@ -1344,7 +1344,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,6:5:64-8:2:102", + "range": "TestCompile/classes/layer-modify.d2,6:5:64-8:3:103", "nodes": [ { "map_key": { @@ -1473,7 +1473,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,5:8:57-9:0:104", + "range": "TestCompile/classes/layer-modify.d2,5:8:57-9:1:105", "nodes": [ { "map_key": { @@ -1497,7 +1497,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/layer-modify.d2,6:5:64-8:2:102", + "range": "TestCompile/classes/layer-modify.d2,6:5:64-8:3:103", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/classes/merge.exp.json b/testdata/d2ir/TestCompile/classes/merge.exp.json index 9cc9a1320..1ad04233f 100644 --- a/testdata/d2ir/TestCompile/classes/merge.exp.json +++ b/testdata/d2ir/TestCompile/classes/merge.exp.json @@ -322,7 +322,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,1:9:20-4:2:59", + "range": "TestCompile/classes/merge.d2,1:9:20-4:3:60", "nodes": [ { "map_key": { @@ -458,7 +458,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,0:9:9-5:0:61", + "range": "TestCompile/classes/merge.d2,0:9:9-5:1:62", "nodes": [ { "map_key": { @@ -482,7 +482,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,1:9:20-4:2:59", + "range": "TestCompile/classes/merge.d2,1:9:20-4:3:60", "nodes": [ { "map_key": { @@ -957,7 +957,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,1:9:20-4:2:59", + "range": "TestCompile/classes/merge.d2,1:9:20-4:3:60", "nodes": [ { "map_key": { @@ -1087,7 +1087,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,9:13:113-11:6:141", + "range": "TestCompile/classes/merge.d2,9:13:113-11:7:142", "nodes": [ { "map_key": { @@ -1179,7 +1179,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,0:9:9-5:0:61", + "range": "TestCompile/classes/merge.d2,0:9:9-5:1:62", "nodes": [ { "map_key": { @@ -1203,7 +1203,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,1:9:20-4:2:59", + "range": "TestCompile/classes/merge.d2,1:9:20-4:3:60", "nodes": [ { "map_key": { @@ -1344,7 +1344,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,7:10:83-13:2:151", + "range": "TestCompile/classes/merge.d2,7:10:83-13:3:152", "nodes": [ { "map_key": { @@ -1368,7 +1368,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,8:13:98-12:4:147", + "range": "TestCompile/classes/merge.d2,8:13:98-12:5:148", "nodes": [ { "map_key": { @@ -1392,7 +1392,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,9:13:113-11:6:141", + "range": "TestCompile/classes/merge.d2,9:13:113-11:7:142", "nodes": [ { "map_key": { @@ -1494,7 +1494,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,6:8:71-14:0:153", + "range": "TestCompile/classes/merge.d2,6:8:71-14:1:154", "nodes": [ { "map_key": { @@ -1518,7 +1518,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,7:10:83-13:2:151", + "range": "TestCompile/classes/merge.d2,7:10:83-13:3:152", "nodes": [ { "map_key": { @@ -1542,7 +1542,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,8:13:98-12:4:147", + "range": "TestCompile/classes/merge.d2,8:13:98-12:5:148", "nodes": [ { "map_key": { @@ -1566,7 +1566,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/merge.d2,9:13:113-11:6:141", + "range": "TestCompile/classes/merge.d2,9:13:113-11:7:142", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/classes/nested.exp.json b/testdata/d2ir/TestCompile/classes/nested.exp.json index 576dc9642..9fec0c647 100644 --- a/testdata/d2ir/TestCompile/classes/nested.exp.json +++ b/testdata/d2ir/TestCompile/classes/nested.exp.json @@ -253,7 +253,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -360,7 +360,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/nested.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -384,7 +384,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -768,7 +768,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -875,7 +875,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/nested.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -899,7 +899,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1011,7 +1011,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,8:12:97-10:6:115", + "range": "TestCompile/classes/nested.d2,8:12:97-10:7:116", "nodes": [ { "map_key": { @@ -1097,7 +1097,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,7:10:83-11:4:121", + "range": "TestCompile/classes/nested.d2,7:10:83-11:5:122", "nodes": [ { "map_key": { @@ -1121,7 +1121,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,8:12:97-10:6:115", + "range": "TestCompile/classes/nested.d2,8:12:97-10:7:116", "nodes": [ { "map_key": { @@ -1412,7 +1412,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1519,7 +1519,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,0:9:9-4:0:49", + "range": "TestCompile/classes/nested.d2,0:9:9-4:1:50", "nodes": [ { "map_key": { @@ -1543,7 +1543,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,1:9:20-3:2:47", + "range": "TestCompile/classes/nested.d2,1:9:20-3:3:48", "nodes": [ { "map_key": { @@ -1655,7 +1655,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,6:10:71-12:2:125", + "range": "TestCompile/classes/nested.d2,6:10:71-12:3:126", "nodes": [ { "map_key": { @@ -1679,7 +1679,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,7:10:83-11:4:121", + "range": "TestCompile/classes/nested.d2,7:10:83-11:5:122", "nodes": [ { "map_key": { @@ -1703,7 +1703,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,8:12:97-10:6:115", + "range": "TestCompile/classes/nested.d2,8:12:97-10:7:116", "nodes": [ { "map_key": { @@ -1799,7 +1799,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,5:8:59-13:0:127", + "range": "TestCompile/classes/nested.d2,5:8:59-13:1:128", "nodes": [ { "map_key": { @@ -1823,7 +1823,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,6:10:71-12:2:125", + "range": "TestCompile/classes/nested.d2,6:10:71-12:3:126", "nodes": [ { "map_key": { @@ -1847,7 +1847,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,7:10:83-11:4:121", + "range": "TestCompile/classes/nested.d2,7:10:83-11:5:122", "nodes": [ { "map_key": { @@ -1871,7 +1871,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/classes/nested.d2,8:12:97-10:6:115", + "range": "TestCompile/classes/nested.d2,8:12:97-10:7:116", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/edges/underscore.exp.json b/testdata/d2ir/TestCompile/edges/underscore.exp.json index fc2b7b1bf..878a4cff4 100644 --- a/testdata/d2ir/TestCompile/edges/underscore.exp.json +++ b/testdata/d2ir/TestCompile/edges/underscore.exp.json @@ -194,7 +194,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/edges/underscore.d2,0:3:3-0:14:14", + "range": "TestCompile/edges/underscore.d2,0:3:3-0:15:15", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/fields/array.exp.json b/testdata/d2ir/TestCompile/fields/array.exp.json index 1c8abdcad..4530ab3bc 100644 --- a/testdata/d2ir/TestCompile/fields/array.exp.json +++ b/testdata/d2ir/TestCompile/fields/array.exp.json @@ -84,7 +84,7 @@ "primary": {}, "value": { "array": { - "range": "TestCompile/fields/array.d2,0:3:3-0:11:11", + "range": "TestCompile/fields/array.d2,0:3:3-0:12:12", "nodes": [ { "number": { diff --git a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json index 273034225..815fc5fcc 100644 --- a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json @@ -160,7 +160,7 @@ }, "value": { "map": { - "range": "TestCompile/fields/primary/nested.d2,0:9:9-0:16:16", + "range": "TestCompile/fields/primary/nested.d2,0:9:9-0:17:17", "nodes": [ { "map_key": { @@ -278,7 +278,7 @@ }, "value": { "map": { - "range": "TestCompile/fields/primary/nested.d2,0:9:9-0:16:16", + "range": "TestCompile/fields/primary/nested.d2,0:9:9-0:17:17", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/fields/primary/root.exp.json b/testdata/d2ir/TestCompile/fields/primary/root.exp.json index 91b910a6e..5b82d2d85 100644 --- a/testdata/d2ir/TestCompile/fields/primary/root.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/root.exp.json @@ -134,7 +134,7 @@ }, "value": { "map": { - "range": "TestCompile/fields/primary/root.d2,0:7:7-0:14:14", + "range": "TestCompile/fields/primary/root.d2,0:7:7-0:15:15", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/layers/root.exp.json b/testdata/d2ir/TestCompile/layers/root.exp.json index 7cf8bf4b1..27e7e95c6 100644 --- a/testdata/d2ir/TestCompile/layers/root.exp.json +++ b/testdata/d2ir/TestCompile/layers/root.exp.json @@ -601,7 +601,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/layers/root.d2,2:8:25-2:16:33", + "range": "TestCompile/layers/root.d2,2:8:25-2:17:34", "nodes": [ { "map_key": { @@ -709,7 +709,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/layers/root.d2,1:8:15-3:0:35", + "range": "TestCompile/layers/root.d2,1:8:15-3:1:36", "nodes": [ { "map_key": { @@ -733,7 +733,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/layers/root.d2,2:8:25-2:16:33", + "range": "TestCompile/layers/root.d2,2:8:25-2:17:34", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/scenarios/edge.exp.json b/testdata/d2ir/TestCompile/scenarios/edge.exp.json index 45d6ef21a..37f6f502a 100644 --- a/testdata/d2ir/TestCompile/scenarios/edge.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/edge.exp.json @@ -1386,7 +1386,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/edge.d2,2:5:25-4:2:64", + "range": "TestCompile/scenarios/edge.d2,2:5:25-4:3:65", "nodes": [ { "map_key": { @@ -1533,7 +1533,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/edge.d2,1:11:18-5:0:66", + "range": "TestCompile/scenarios/edge.d2,1:11:18-5:1:67", "nodes": [ { "map_key": { @@ -1557,7 +1557,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/edge.d2,2:5:25-4:2:64", + "range": "TestCompile/scenarios/edge.d2,2:5:25-4:3:65", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/scenarios/root.exp.json b/testdata/d2ir/TestCompile/scenarios/root.exp.json index 9b077fb06..591518abf 100644 --- a/testdata/d2ir/TestCompile/scenarios/root.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/root.exp.json @@ -932,7 +932,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/root.d2,2:8:28-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:8:28-2:17:37", "nodes": [ { "map_key": { @@ -1431,7 +1431,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/root.d2,3:10:48-3:19:57", + "range": "TestCompile/scenarios/root.d2,3:10:48-3:20:58", "nodes": [ { "map_key": { @@ -1517,7 +1517,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/root.d2,1:11:18-4:0:59", + "range": "TestCompile/scenarios/root.d2,1:11:18-4:1:60", "nodes": [ { "map_key": { @@ -1541,7 +1541,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/root.d2,2:8:28-2:16:36", + "range": "TestCompile/scenarios/root.d2,2:8:28-2:17:37", "nodes": [ { "map_key": { @@ -1615,7 +1615,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/scenarios/root.d2,3:10:48-3:19:57", + "range": "TestCompile/scenarios/root.d2,3:10:48-3:20:58", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/steps/recursive.exp.json b/testdata/d2ir/TestCompile/steps/recursive.exp.json index 01c07121f..3e09926d4 100644 --- a/testdata/d2ir/TestCompile/steps/recursive.exp.json +++ b/testdata/d2ir/TestCompile/steps/recursive.exp.json @@ -932,7 +932,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,2:8:24-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:8:24-2:17:33", "nodes": [ { "map_key": { @@ -2401,7 +2401,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,6:13:83-8:3:105", + "range": "TestCompile/steps/recursive.d2,6:13:83-8:4:106", "nodes": [ { "map_key": { @@ -2487,7 +2487,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,5:13:68-9:2:109", + "range": "TestCompile/steps/recursive.d2,5:13:68-9:3:110", "nodes": [ { "map_key": { @@ -2511,7 +2511,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,6:13:83-8:3:105", + "range": "TestCompile/steps/recursive.d2,6:13:83-8:4:106", "nodes": [ { "map_key": { @@ -2703,7 +2703,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,3:10:44-10:1:112", + "range": "TestCompile/steps/recursive.d2,3:10:44-10:2:113", "nodes": [ { "map_key": { @@ -2750,7 +2750,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,5:13:68-9:2:109", + "range": "TestCompile/steps/recursive.d2,5:13:68-9:3:110", "nodes": [ { "map_key": { @@ -2774,7 +2774,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,6:13:83-8:3:105", + "range": "TestCompile/steps/recursive.d2,6:13:83-8:4:106", "nodes": [ { "map_key": { @@ -2870,7 +2870,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,1:7:14-11:0:114", + "range": "TestCompile/steps/recursive.d2,1:7:14-11:1:115", "nodes": [ { "map_key": { @@ -2894,7 +2894,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,2:8:24-2:16:32", + "range": "TestCompile/steps/recursive.d2,2:8:24-2:17:33", "nodes": [ { "map_key": { @@ -2968,7 +2968,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,3:10:44-10:1:112", + "range": "TestCompile/steps/recursive.d2,3:10:44-10:2:113", "nodes": [ { "map_key": { @@ -3015,7 +3015,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,5:13:68-9:2:109", + "range": "TestCompile/steps/recursive.d2,5:13:68-9:3:110", "nodes": [ { "map_key": { @@ -3039,7 +3039,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/recursive.d2,6:13:83-8:3:105", + "range": "TestCompile/steps/recursive.d2,6:13:83-8:4:106", "nodes": [ { "map_key": { diff --git a/testdata/d2ir/TestCompile/steps/root.exp.json b/testdata/d2ir/TestCompile/steps/root.exp.json index a4357ba31..ec142d977 100644 --- a/testdata/d2ir/TestCompile/steps/root.exp.json +++ b/testdata/d2ir/TestCompile/steps/root.exp.json @@ -932,7 +932,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/root.d2,2:8:24-2:16:32", + "range": "TestCompile/steps/root.d2,2:8:24-2:17:33", "nodes": [ { "map_key": { @@ -1741,7 +1741,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/root.d2,3:10:44-3:19:53", + "range": "TestCompile/steps/root.d2,3:10:44-3:20:54", "nodes": [ { "map_key": { @@ -1827,7 +1827,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/root.d2,1:7:14-4:0:55", + "range": "TestCompile/steps/root.d2,1:7:14-4:1:56", "nodes": [ { "map_key": { @@ -1851,7 +1851,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/root.d2,2:8:24-2:16:32", + "range": "TestCompile/steps/root.d2,2:8:24-2:17:33", "nodes": [ { "map_key": { @@ -1925,7 +1925,7 @@ "primary": {}, "value": { "map": { - "range": "TestCompile/steps/root.d2,3:10:44-3:19:53", + "range": "TestCompile/steps/root.d2,3:10:44-3:20:54", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index 313bc4453..6fcb79158 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/container.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestCreate/container.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 67de3a5ee..6ba6e5e8b 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,0:3:3-2:0:14", + "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,0:3:3-2:1:15", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index dd86c4758..1360833c9 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -37,7 +37,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,0:8:8-2:0:19", + "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,0:8:8-2:1:20", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index 1ae389403..5b81a0d30 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,0:11:11-2:0:22", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,0:11:11-2:1:23", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index ace2f2ebe..c2c794681 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,0:11:11-2:0:22", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,0:11:11-2:1:23", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index 966bef34f..72f28cd4b 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -38,7 +38,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,0:5:5-2:0:16", + "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,0:5:5-2:1:17", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index b7f76f285..25e951a1e 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/gen_key_n.d2,0:7:7-12:0:130", + "range": "d2/testdata/d2oracle/TestCreate/gen_key_n.d2,0:7:7-12:1:131", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index 8151a96d6..c667d493c 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/gen_key_scope.d2,0:7:7-3:0:29", + "range": "d2/testdata/d2oracle/TestCreate/gen_key_scope.d2,0:7:7-3:1:30", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index c8a266867..acfc69b53 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline.d2,0:6:6-3:0:33", + "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline.d2,0:6:6-3:1:34", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json index a3ca572b8..c3d9ae2a0 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.d2,1:6:13-4:0:40", + "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.d2,1:6:13-4:1:41", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json index 736cd373f..c8e067f34 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.d2,2:6:14-5:0:41", + "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.d2,2:6:14-5:1:42", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index ed300d55d..f9b49e6ca 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestCreate/scope.d2,0:7:7-2:0:18", + "range": "d2/testdata/d2oracle/TestCreate/scope.d2,0:7:7-2:1:19", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json index cae034940..d9d278041 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:8:8-2:0:44", + "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:8:8-2:1:45", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json index 37e9a36c1..55d9bf07f 100644 --- a/testdata/d2oracle/TestDelete/chaos_1.exp.json +++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,0:4:4-0:20:20", + "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,0:4:4-0:21:21", "nodes": [ { "map_key": { @@ -112,7 +112,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:11:33-1:51:73", + "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:11:33-1:52:74", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index f63710718..1c62b38fe 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/children_nested_conflicts.d2,0:5:5-2:0:11", + "range": "d2/testdata/d2oracle/TestDelete/children_nested_conflicts.d2,0:5:5-2:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index c9255013d..17f67d0e6 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/children_order.d2,0:3:3-6:0:32", + "range": "d2/testdata/d2oracle/TestDelete/children_order.d2,0:3:3-6:1:33", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 630970e3d..4062ac2b2 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -38,7 +38,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,0:5:5-3:0:28", + "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,0:5:5-3:1:29", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json index 06b5c7bfb..c88ea51b6 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/conflicts_generated.d2,2:8:16-4:0:27", + "range": "d2/testdata/d2oracle/TestDelete/conflicts_generated.d2,2:8:16-4:1:28", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 9f216275b..bb83aea5c 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,0:3:3-2:0:15", + "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,0:3:3-2:1:16", "nodes": [ { "map_key": { @@ -112,7 +112,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,4:3:22-6:0:34", + "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,4:3:22-6:1:35", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index fd520cb59..0fb34062b 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -38,7 +38,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,0:5:5-2:0:34", + "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,0:5:5-2:1:35", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 72ea2342f..472b97710 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:7:7-0:22:22", + "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:7:7-0:23:23", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 38149e7d9..a52719df3 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:7:7-0:27:27", + "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:7:7-0:28:28", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 5684d997c..13c909fc9 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:7:7-0:27:27", + "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:7:7-0:28:28", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index fc8d49b06..7c8fe8d35 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/empty_map.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestDelete/empty_map.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index e7e88fd2e..128188fca 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/hoist_children.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestDelete/hoist_children.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index 4c73064fa..b77c544d6 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,1:10:14-3:0:28", + "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,1:10:14-3:1:29", "nodes": [ { "map_key": { @@ -112,7 +112,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,4:4:34-6:0:49", + "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,4:4:34-6:1:50", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index 41419ac2a..96780bc6e 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_conflict.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_conflict.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { @@ -79,7 +79,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_conflict.d2,3:3:16-5:0:22", + "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_conflict.d2,3:3:16-5:1:23", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json index 7b3dcc4f0..ef4537b12 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index be177a849..d8e3849b3 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multiple_map_styles.d2,0:3:3-4:0:37", + "range": "d2/testdata/d2oracle/TestDelete/multiple_map_styles.d2,0:3:3-4:1:38", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/multiple_map_styles.d2,1:9:14-3:2:35", + "range": "d2/testdata/d2oracle/TestDelete/multiple_map_styles.d2,1:9:14-3:3:36", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index d9e60c63c..062e981ea 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,0:3:3-2:0:14", + "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,0:3:3-2:1:15", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index ae69040d8..d8dbc5afb 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/nested_underscore_update.d2,0:7:7-2:0:18", + "range": "d2/testdata/d2oracle/TestDelete/nested_underscore_update.d2,0:7:7-2:1:19", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index 96becc9d0..458a27804 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -119,7 +119,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,2:4:18-4:0:32", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,2:4:18-4:1:33", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 92bb37fcc..e2cd47fca 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -158,7 +158,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,1:5:22-3:0:36", + "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,1:5:22-3:1:37", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json index 0a3a1ad73..802a3df40 100644 --- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/only-underscore-nested.d2,0:8:8-2:0:18", + "range": "d2/testdata/d2oracle/TestDelete/only-underscore-nested.d2,0:8:8-2:1:19", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/only-underscore.exp.json b/testdata/d2oracle/TestDelete/only-underscore.exp.json index 675240729..f60a537a8 100644 --- a/testdata/d2oracle/TestDelete/only-underscore.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/only-underscore.d2,0:8:8-2:0:18", + "range": "d2/testdata/d2oracle/TestDelete/only-underscore.d2,0:8:8-2:1:19", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 42e4680c7..86f2701d8 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,0:3:3-0:27:27", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,0:3:3-0:28:28", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 47aec3c7c..ea742ec25 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:8:12-2:32:36", + "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:8:12-2:33:37", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index c9e2dbffd..bab54bbe0 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,0:3:3-3:0:23", + "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,0:3:3-3:1:24", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index 982b01acc..a94b1e761 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/order_6.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestDelete/order_6.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index b4aaa8cf5..883029a40 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/order_7.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestDelete/order_7.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json index 90e716053..0a0840513 100644 --- a/testdata/d2oracle/TestDelete/save_map.exp.json +++ b/testdata/d2oracle/TestDelete/save_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:3:3-2:0:21", + "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:3:3-2:1:22", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json index 548eacac3..038242130 100644 --- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json @@ -37,7 +37,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:9:9-2:0:27", + "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,0:9:9-2:1:28", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 6d1681ec5..0913869b9 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,0:7:7-8:0:123", + "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,0:7:7-8:1:124", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,1:9:18-4:2:81", + "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,1:9:18-4:3:82", "nodes": [ { "map_key": { @@ -118,7 +118,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,3:12:53-3:36:77", + "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,3:12:53-3:37:78", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/table_refs.exp.json b/testdata/d2oracle/TestDelete/table_refs.exp.json index 7cd4b6e1a..2ab147458 100644 --- a/testdata/d2oracle/TestDelete/table_refs.exp.json +++ b/testdata/d2oracle/TestDelete/table_refs.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/table_refs.d2,0:3:3-3:0:28", + "range": "d2/testdata/d2oracle/TestDelete/table_refs.d2,0:3:3-3:1:29", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index ba51e7d5a..9a0ab8b2e 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestDelete/underscore_no_conflict.d2,0:3:3-4:0:16", + "range": "d2/testdata/d2oracle/TestDelete/underscore_no_conflict.d2,0:3:3-4:1:17", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index 4ae722c82..bec332a1a 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,0:3:3-11:0:102", + "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,0:3:3-11:1:103", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,1:5:10-5:2:52", + "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,1:5:10-5:3:53", "nodes": [ { "map_key": { @@ -75,7 +75,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,2:11:23-4:4:48", + "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,2:11:23-4:5:49", "nodes": [ { "map_key": { @@ -138,7 +138,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,6:5:59-10:2:100", + "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,6:5:59-10:3:101", "nodes": [ { "map_key": { @@ -162,7 +162,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,7:11:72-9:4:96", + "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,7:11:72-9:5:97", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index 3d50e422a..da56ee65f 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/basic_nested.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/basic_nested.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index 76f5a3554..a0d837dd2 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/between_containers.d2,1:3:5-3:0:11", + "range": "d2/testdata/d2oracle/TestMove/between_containers.d2,1:3:5-3:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json index 5e3a6e282..87cd919ec 100644 --- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json +++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json @@ -83,7 +83,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,3:10:35-5:0:52", + "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,3:10:35-5:1:53", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json index 1d6a6ebc1..4258f1564 100644 --- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json +++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 05201a9b6..7613c98ed 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/container_near.d2,0:3:3-5:0:38", + "range": "d2/testdata/d2oracle/TestMove/container_near.d2,0:3:3-5:1:39", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/container_near.d2,1:5:10-3:2:30", + "range": "d2/testdata/d2oracle/TestMove/container_near.d2,1:5:10-3:3:31", "nodes": [ { "map_key": { @@ -152,7 +152,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/container_near.d2,6:3:43-8:0:49", + "range": "d2/testdata/d2oracle/TestMove/container_near.d2,6:3:43-8:1:50", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/duplicate.exp.json b/testdata/d2oracle/TestMove/duplicate.exp.json index aeb168979..a73442617 100644 --- a/testdata/d2oracle/TestMove/duplicate.exp.json +++ b/testdata/d2oracle/TestMove/duplicate.exp.json @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/duplicate.d2,3:3:8-5:0:28", + "range": "d2/testdata/d2oracle/TestMove/duplicate.d2,3:3:8-5:1:29", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/duplicate_generated.exp.json b/testdata/d2oracle/TestMove/duplicate_generated.exp.json index 22654afcc..a3f462509 100644 --- a/testdata/d2oracle/TestMove/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestMove/duplicate_generated.exp.json @@ -142,7 +142,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/duplicate_generated.d2,7:3:23-9:0:31", + "range": "d2/testdata/d2oracle/TestMove/duplicate_generated.d2,7:3:23-9:1:32", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index beb4e5634..d6695865d 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,0:3:3-2:0:18", + "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,0:3:3-2:1:19", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index df87ea83e..74ca2b686 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,0:3:3-2:0:23", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,0:3:3-2:1:24", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index 1b5d9b69f..cf140af7a 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,0:3:3-2:0:21", + "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,0:3:3-2:1:22", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index cc2aab88b..fcbb68491 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -95,7 +95,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,1:3:18-3:0:24", + "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,1:3:18-3:1:25", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 943587e97..16d6030af 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index fbe8d3aeb..5490597dc 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,0:3:3-2:0:14", + "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,0:3:3-2:1:15", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index 76f20e41e..1f810981f 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,0:3:3-2:0:16", + "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,0:3:3-2:1:17", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index a9bc27742..6838bbff1 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -79,7 +79,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,3:3:14-7:0:33", + "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,3:3:14-7:1:34", "nodes": [ { "map_key": { @@ -103,7 +103,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,4:5:21-6:2:31", + "range": "d2/testdata/d2oracle/TestMove/extend_map.d2,4:5:21-6:3:32", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index c1388762e..4cb83f215 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -72,7 +72,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/extend_stationary_path.d2,1:3:9-5:0:28", + "range": "d2/testdata/d2oracle/TestMove/extend_stationary_path.d2,1:3:9-5:1:29", "nodes": [ { "map_key": { @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/extend_stationary_path.d2,2:5:16-4:2:26", + "range": "d2/testdata/d2oracle/TestMove/extend_stationary_path.d2,2:5:16-4:3:27", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index f383bbd08..955ae642f 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_between_containers.d2,1:3:5-3:0:11", + "range": "d2/testdata/d2oracle/TestMove/flat_between_containers.d2,1:3:5-3:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 1a71d4059..8e581eafb 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_merge.d2,1:3:5-4:0:21", + "range": "d2/testdata/d2oracle/TestMove/flat_merge.d2,1:3:5-4:1:22", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index 7ee1856dc..af577eb7e 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -61,7 +61,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_middle_container.d2,1:3:7-3:0:13", + "range": "d2/testdata/d2oracle/TestMove/flat_middle_container.d2,1:3:7-3:1:14", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/flat_near.exp.json b/testdata/d2oracle/TestMove/flat_near.exp.json index 817f025d2..66456858b 100644 --- a/testdata/d2oracle/TestMove/flat_near.exp.json +++ b/testdata/d2oracle/TestMove/flat_near.exp.json @@ -71,7 +71,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_near.d2,1:3:15-3:0:21", + "range": "d2/testdata/d2oracle/TestMove/flat_near.d2,1:3:15-3:1:22", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 455a2f981..98a156b77 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -94,7 +94,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge.d2,1:5:13-4:0:27", + "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge.d2,1:5:13-4:1:28", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json index 177336e19..b301398b2 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.d2,0:3:3-7:0:38", + "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.d2,0:3:3-7:1:39", "nodes": [ { "map_key": { @@ -62,7 +62,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.d2,1:7:12-4:2:28", + "range": "d2/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.d2,1:7:12-4:3:29", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json index 6da1ee6d5..9f81e6241 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_map_value.d2,1:3:5-3:0:24", + "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_map_value.d2,1:3:5-3:1:25", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json index c5c8e6e7d..7511a4c58 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,0:3:3-3:0:25", + "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,0:3:3-3:1:26", "nodes": [ { "comment": { @@ -85,7 +85,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,4:3:30-7:0:70", + "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,4:3:30-7:1:71", "nodes": [ { "comment": { diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index 66f168b08..ee9c53c65 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/flat_style.d2,0:3:3-3:0:50", + "range": "d2/testdata/d2oracle/TestMove/flat_style.d2,0:3:3-3:1:51", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index dca6fdaa0..e81da954d 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,0:3:3-3:0:20", + "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,0:3:3-3:1:21", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index bd3bf0e72..7f197757e 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/full_slice.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/full_slice.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index f0eeecdc3..bb020cbe6 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,1:3:18-3:0:30", + "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,1:3:18-3:1:31", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index da7bbfa2f..169d90c1a 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/hoist_container_children.d2,3:3:8-5:0:14", + "range": "d2/testdata/d2oracle/TestMove/hoist_container_children.d2,3:3:8-5:1:15", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json b/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json index 5c70c063b..76e7ed4ba 100644 --- a/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_conflict.d2,0:3:3-3:0:17", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_conflict.d2,0:3:3-3:1:18", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json index 8041bc7c9..7d0a79a50 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_child.d2,0:3:3-4:0:27", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_child.d2,0:3:3-4:1:28", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_child.d2,1:5:10-3:2:25", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_child.d2,1:5:10-3:3:26", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json index fcaf3d582..b24f0320c 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json index 283221e09..0d07b6146 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.d2,0:5:5-4:0:28", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.d2,0:5:5-4:1:29", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json index 6c3f40f55..9fb9ad366 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -169,7 +169,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.d2,4:3:29-6:0:52", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.d2,4:3:29-6:1:53", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json index c7fe1680b..76abaf2bd 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_flat_1.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_flat_1.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json index 6f1a77e95..ea273e78f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json @@ -61,7 +61,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_flat_2.d2,1:5:7-3:0:15", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_flat_2.d2,1:5:7-3:1:16", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json b/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json index 3c7e78246..35b66fea9 100644 --- a/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,0:3:3-7:0:47", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,0:3:3-7:1:48", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,1:5:10-6:2:45", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,1:5:10-6:3:46", "nodes": [ { "map_key": { @@ -109,7 +109,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,3:7:27-5:4:41", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_grandchild.d2,3:7:27-5:5:42", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json index 4ed6904f5..255de90db 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_1.d2,0:3:3-4:0:22", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_1.d2,0:3:3-4:1:23", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_1.d2,1:5:10-3:2:20", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_1.d2,1:5:10-3:3:21", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json index f142a1f98..6e826d818 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_2.d2,3:3:9-5:0:15", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_map_2.d2,3:3:9-5:1:16", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json b/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json index db22e48e9..a1aeef336 100644 --- a/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_move_out.d2,1:3:5-5:0:24", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_move_out.d2,1:3:5-5:1:25", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_move_out.d2,2:5:12-4:2:22", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_move_out.d2,2:5:12-4:3:23", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_near.exp.json b/testdata/d2oracle/TestMove/include_descendants_near.exp.json index 95ed643c3..1c42cbfcc 100644 --- a/testdata/d2oracle/TestMove/include_descendants_near.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_near.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_near.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_near.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json index c8334c5b0..99d635e08 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_1.d2,1:3:5-3:0:11", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_1.d2,1:3:5-3:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json index ffcdc9ec2..206d9c205 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json @@ -61,7 +61,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_2.d2,1:5:7-3:0:13", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_2.d2,1:5:7-3:1:14", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json b/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json index 0efe58b19..24982ff1c 100644 --- a/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_non_conflict.d2,0:3:3-3:0:17", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_non_conflict.d2,0:3:3-3:1:18", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json index 3daa5414f..ecb570832 100644 --- a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,0:3:3-5:0:46", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,0:3:3-5:1:47", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,1:5:10-4:2:44", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,1:5:10-4:3:45", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json index 32dbb24e5..68e5be879 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json @@ -95,7 +95,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore.d2,2:8:34-6:0:83", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore.d2,2:8:34-6:1:84", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json index 2e08bff1c..ce22948e7 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_2.d2,1:3:5-3:0:15", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_2.d2,1:3:5-3:1:16", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json index 797e1014d..cd5a24478 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_3.d2,1:3:5-4:0:37", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_3.d2,1:3:5-4:1:38", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json index a4876c486..6765f7e7a 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json index 153524784..5ffd2006f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index d693f7bd4..4a2cd94e7 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/into_container_existing_map.d2,0:3:3-3:0:13", + "range": "d2/testdata/d2oracle/TestMove/into_container_existing_map.d2,0:3:3-3:1:14", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index 406d1ef9f..ec521130f 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/into_container_nonexisting_map.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/into_container_nonexisting_map.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json index 135a83ef7..c391111bd 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,0:3:3-6:0:93", + "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,0:3:3-6:1:94", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,1:5:10-5:2:91", + "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,1:5:10-5:3:92", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json index bba5f98b6..167ef2933 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_style.d2,0:3:3-3:0:34", + "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_style.d2,0:3:3-3:1:35", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index 586e8b616..e17865fcb 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -73,7 +73,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,4:3:9-12:0:77", + "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,4:3:9-12:1:78", "nodes": [ { "map_key": { @@ -97,7 +97,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,5:5:16-11:2:75", + "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,5:5:16-11:3:76", "nodes": [ { "map_key": { @@ -121,7 +121,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,6:11:29-8:4:54", + "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,6:11:29-8:5:55", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index 7a1c7fd9f..697eae05f 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/map_with_label.d2,2:3:6-4:0:18", + "range": "d2/testdata/d2oracle/TestMove/map_with_label.d2,2:3:6-4:1:19", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index b6c858933..53cbe88de 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,0:3:3-10:0:65", + "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,0:3:3-10:1:66", "nodes": [ { "map_key": { @@ -164,7 +164,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,4:5:30-9:2:63", + "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,4:5:30-9:3:64", "nodes": [ { "map_key": { @@ -188,7 +188,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,5:7:39-7:4:53", + "range": "d2/testdata/d2oracle/TestMove/merge_nested_maps.d2,5:7:39-7:5:54", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 59eadcb67..7933a829a 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,0:3:3-8:0:68", + "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,0:3:3-8:1:69", "nodes": [ { "map_key": { @@ -173,7 +173,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,4:5:48-7:2:66", + "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,4:5:48-7:3:67", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index 12bae318b..b73c2be58 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/middle_container.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/middle_container.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json index 518469ce4..5ced0651d 100644 --- a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json +++ b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json @@ -152,7 +152,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,4:3:43-11:0:81", + "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,4:3:43-11:1:82", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index 3a76c1c31..cc1c9eeff 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/move_container_children.d2,4:3:10-6:0:16", + "range": "d2/testdata/d2oracle/TestMove/move_container_children.d2,4:3:10-6:1:17", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index 1f7889425..b718a78c2 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/move_container_conflict_children.d2,4:3:12-6:0:18", + "range": "d2/testdata/d2oracle/TestMove/move_container_conflict_children.d2,4:3:12-6:1:19", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json index 2feb2e4b4..4ed37d3ef 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -37,7 +37,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/move_into_key_with_value.d2,0:8:8-2:0:14", + "range": "d2/testdata/d2oracle/TestMove/move_into_key_with_value.d2,0:8:8-2:1:15", "nodes": [ { "map_key": { 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 42428a39a..919775b3b 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -117,7 +117,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,1:5:18-3:0:24", + "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,1:5:18-3:1:25", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index 3bfdd13a4..ccd390919 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,0:3:3-9:0:61", + "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,0:3:3-9:1:62", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,1:5:10-7:2:51", + "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,1:5:10-7:3:52", "nodes": [ { "map_key": { @@ -98,7 +98,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,3:7:25-6:4:47", + "range": "d2/testdata/d2oracle/TestMove/multiple_nesting_levels.d2,3:7:25-6:5:48", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index 31cde246f..b90fe8621 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/near.d2,0:3:3-2:0:17", + "range": "d2/testdata/d2oracle/TestMove/near.d2,0:3:3-2:1:18", "nodes": [ { "map_key": { @@ -89,7 +89,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/near.d2,3:3:22-5:0:28", + "range": "d2/testdata/d2oracle/TestMove/near.d2,3:3:22-5:1:29", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json index 1dc1b90c3..6cb5b9ed4 100644 --- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json +++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nested-underscore-move-out.d2,0:8:8-3:0:25", + "range": "d2/testdata/d2oracle/TestMove/nested-underscore-move-out.d2,0:8:8-3:1:26", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json index 3d1722af3..8cf3a05af 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json @@ -72,7 +72,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nested_reserved_3.d2,1:5:9-6:0:48", + "range": "d2/testdata/d2oracle/TestMove/nested_reserved_3.d2,1:5:9-6:1:49", "nodes": [ { "map_key": { @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nested_reserved_3.d2,2:5:16-5:2:46", + "range": "d2/testdata/d2oracle/TestMove/nested_reserved_3.d2,2:5:16-5:3:47", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index 59cd0e06b..2826789ba 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_one.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_one.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { @@ -79,7 +79,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_one.d2,3:3:14-5:0:20", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_one.d2,3:3:14-5:1:21", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index 4cb5a41cc..b244e6cec 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,0:3:3-2:0:17", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,0:3:3-2:1:18", "nodes": [ { "map_key": { @@ -102,7 +102,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,3:3:22-6:0:32", + "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,3:3:22-6:1:33", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index c998f5188..5fbc66d25 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -96,7 +96,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/rename_2.d2,4:3:14-6:0:20", + "range": "d2/testdata/d2oracle/TestMove/rename_2.d2,4:3:14-6:1:21", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index 4913ec646..cddfddaae 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/reuse_map.d2,0:3:3-6:0:37", + "range": "d2/testdata/d2oracle/TestMove/reuse_map.d2,0:3:3-6:1:38", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/reuse_map.d2,1:5:10-4:2:28", + "range": "d2/testdata/d2oracle/TestMove/reuse_map.d2,1:5:10-4:3:29", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json index 2fb89411a..90ffbf114 100644 --- a/testdata/d2oracle/TestMove/underscore-connection.exp.json +++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,0:3:3-2:0:22", + "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,0:3:3-2:1:23", "nodes": [ { "map_key": { @@ -146,7 +146,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,4:3:28-7:0:38", + "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,4:3:28-7:1:39", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index 34035e86c..f269053d2 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_children.d2,0:3:3-2:0:11", + "range": "d2/testdata/d2oracle/TestMove/underscore_children.d2,0:3:3-2:1:12", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index eaa941d03..3bf160d9a 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,0:3:3-2:0:16", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,0:3:3-2:1:17", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 2deaee517..36518954f 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,0:3:3-2:0:14", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,0:3:3-2:1:15", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 502a6ae7f..4dad226b6 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,0:3:3-2:0:16", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,0:3:3-2:1:17", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index c9d972e26..0ea41b209 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,0:3:3-2:0:16", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,0:3:3-2:1:17", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index c90c19765..9d20231ea 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,0:3:3-2:0:14", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,0:3:3-2:1:15", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 14a1fee58..600aaa622 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,0:3:3-2:0:20", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,0:3:3-2:1:21", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json index d8fc3cf89..cd5cfdcc1 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_6.d2,0:3:3-2:0:18", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_6.d2,0:3:3-2:1:19", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 99b9b1abe..ce13ffa5a 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,0:3:3-4:0:30", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,0:3:3-4:1:31", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,1:5:10-3:2:28", + "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,1:5:10-3:3:29", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index 6c3414052..fec44e76c 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,2:3:6-5:0:30", + "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,2:3:6-5:1:31", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index e190dfd0e..9ccbcafda 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split.d2,0:3:3-4:0:24", + "range": "d2/testdata/d2oracle/TestMove/underscore_split.d2,0:3:3-4:1:25", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split.d2,1:5:10-3:2:22", + "range": "d2/testdata/d2oracle/TestMove/underscore_split.d2,1:5:10-3:3:23", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index 2656b7b49..525dacac9 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,0:3:3-9:0:58", + "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,0:3:3-9:1:59", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,1:5:10-3:2:22", + "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,1:5:10-3:3:23", "nodes": [ { "map_key": { @@ -114,7 +114,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,4:5:29-8:2:56", + "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,4:5:29-8:3:57", "nodes": [ { "map_key": { @@ -138,7 +138,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,5:7:38-7:4:52", + "range": "d2/testdata/d2oracle/TestMove/underscore_split_out.d2,5:7:38-7:5:53", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index 1c92d49c1..ae0b189c4 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/underscore_transplant.d2,0:3:3-2:0:9", + "range": "d2/testdata/d2oracle/TestMove/underscore_transplant.d2,0:3:3-2:1:10", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index 7f676ea29..8be9c1042 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/unique_name.d2,0:3:3-3:0:15", + "range": "d2/testdata/d2oracle/TestMove/unique_name.d2,0:3:3-3:1:16", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index 37085ae05..6e1f866af 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,0:3:3-3:0:15", + "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,0:3:3-3:1:16", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json index ecc1c84f4..7143dca93 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,0:3:3-7:0:38", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,0:3:3-7:1:39", "nodes": [ { "map_key": { @@ -131,7 +131,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,4:5:26-6:2:36", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,4:5:26-6:3:37", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json index a80bd4e6a..308ff56f2 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,0:3:3-3:0:20", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,0:3:3-3:1:21", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json index 0e31d4886..01d28d1a1 100644 --- a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:8:8-2:0:31", + "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:8:8-2:1:32", "nodes": [ { "map_key": { @@ -146,7 +146,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:8:41-5:0:63", + "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:8:41-5:1:64", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index dd888cf03..9c96a107d 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -49,7 +49,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/conflict_2.d2,0:7:7-3:0:19", + "range": "d2/testdata/d2oracle/TestRename/conflict_2.d2,0:7:7-3:1:20", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 9b29a3155..36bdd6aa4 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -327,7 +327,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,1:16:87-4:0:114", + "range": "d2/testdata/d2oracle/TestRename/container.d2,1:16:87-4:1:115", "nodes": [ { "map_key": { @@ -472,7 +472,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,5:4:120-9:0:149", + "range": "d2/testdata/d2oracle/TestRename/container.d2,5:4:120-9:1:150", "nodes": [ { "map_key": { @@ -496,7 +496,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/container.d2,6:15:137-8:2:147", + "range": "d2/testdata/d2oracle/TestRename/container.d2,6:15:137-8:3:148", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 40be42dcf..477c5dad0 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -272,7 +272,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/edges.d2,1:3:41-4:0:72", + "range": "d2/testdata/d2oracle/TestRename/edges.d2,1:3:41-4:1:73", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 13468f6f7..ad56cf423 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/near.d2,0:3:3-2:0:15", + "range": "d2/testdata/d2oracle/TestRename/near.d2,0:3:3-2:1:16", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 710fc49b7..6f86026d7 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -127,7 +127,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestRename/nested.d2,1:9:36-3:0:59", + "range": "d2/testdata/d2oracle/TestRename/nested.d2,1:9:36-3:1:60", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/classes-style.exp.json b/testdata/d2oracle/TestSet/classes-style.exp.json index 7606c8653..071158f8b 100644 --- a/testdata/d2oracle/TestSet/classes-style.exp.json +++ b/testdata/d2oracle/TestSet/classes-style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,0:9:9-4:0:42", + "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,0:9:9-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,1:5:16-3:2:40", + "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,1:5:16-3:3:41", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json index 50a62f7bf..ff1f7db7c 100644 --- a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,0:9:9-4:0:42", + "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,0:9:9-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,1:5:16-3:2:40", + "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,1:5:16-3:3:41", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index 9c0be60cd..c324ca764 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:8:8-0:29:29", + "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:8:8-0:30:30", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index 106987b19..3f362e132 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,0:6:6-3:0:91", + "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,0:6:6-3:1:92", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 77f29a89f..3b0df7ec8 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,0:6:6-3:0:61", + "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,0:6:6-3:1:62", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index 0ac79eff4..434ccaca1 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,0:8:8-2:0:36", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,0:8:8-2:1:37", "nodes": [ { "map_key": { @@ -112,7 +112,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,3:3:41-5:0:52", + "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,3:3:41-5:1:53", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index f1aa1ad6c..6088fdc6c 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,0:6:6-2:0:23", + "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,0:6:6-2:1:24", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index dcc248bb9..e3ea5aa72 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -95,7 +95,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:12:14-1:33:35", + "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:12:14-1:34:36", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index e7649247a..5a2dd33c7 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -60,7 +60,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:13:13-0:34:34", + "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:13:13-0:35:35", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json index 0fbdc6921..d6ad15df4 100644 --- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:8:8-5:0:68", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:8:8-5:1:69", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,1:20:30-4:2:66", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,1:20:30-4:3:67", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index d74f7c436..2aecd568d 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:8:8-5:0:61", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:8:8-5:1:62", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,1:9:19-4:2:59", + "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,1:9:19-4:3:60", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 19305fea6..e874b047b 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,0:6:6-2:0:21", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,0:6:6-2:1:22", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index 848b41a6b..83bf4d56a 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,0:6:6-2:0:44", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,0:6:6-2:1:45", "nodes": [ { "map_key": { @@ -84,7 +84,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:15:23-1:34:42", + "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:15:23-1:35:43", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json index 07bc4b429..3c28a1fc9 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:8:8-0:40:40", + "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:8:8-0:41:41", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json index 628da4b0d..8226eb193 100644 --- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:8:8-0:40:40", + "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:8:8-0:41:41", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index 0ce80a7cf..b8718f550 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/expanded_map_style.d2,0:8:8-4:0:42", + "range": "d2/testdata/d2oracle/TestSet/expanded_map_style.d2,0:8:8-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/expanded_map_style.d2,1:9:19-3:2:40", + "range": "d2/testdata/d2oracle/TestSet/expanded_map_style.d2,1:9:19-3:3:41", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index 529342cc8..27313b236 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/icon.d2,0:6:6-0:66:66", + "range": "d2/testdata/d2oracle/TestSet/icon.d2,0:6:6-0:67:67", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index 25d9c3795..a64c0d449 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/inline_style.d2,0:8:8-3:0:49", + "range": "d2/testdata/d2oracle/TestSet/inline_style.d2,0:8:8-3:1:50", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index a43045369..0bbe3fd12 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -33,7 +33,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,0:50:50-2:0:61", + "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,0:50:50-2:1:62", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index a022a2076..d3915f665 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,0:6:6-4:0:200", + "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,0:6:6-4:1:201", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index ca0879f88..e9bc5e329 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/new_style.d2,0:8:8-0:27:27", + "range": "d2/testdata/d2oracle/TestSet/new_style.d2,0:8:8-0:28:28", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json index eba63f5ee..281b69376 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:8:8-2:0:43", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:8:8-2:1:44", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json index 466375933..95bf7af10 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:8:8-4:0:54", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:8:8-4:1:55", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,1:20:30-3:2:52", + "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,1:20:30-3:3:53", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/replace_dimensions.exp.json b/testdata/d2oracle/TestSet/replace_dimensions.exp.json index b999b3e57..6a0be1d47 100644 --- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_dimensions.d2,0:8:8-2:0:23", + "range": "d2/testdata/d2oracle/TestSet/replace_dimensions.d2,0:8:8-2:1:24", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json index a4de62e89..564ae1188 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:8:8-3:0:57", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:8:8-3:1:58", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json index aefa1e8f2..de3a4e806 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json @@ -50,7 +50,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:8:8-4:0:44", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:8:8-4:1:45", "nodes": [ { "map_key": { @@ -74,7 +74,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,1:9:19-3:2:42", + "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,1:9:19-3:3:43", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json index c783b3862..d2d83494e 100644 --- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_fill_pattern.d2,0:8:8-2:0:38", + "range": "d2/testdata/d2oracle/TestSet/replace_fill_pattern.d2,0:8:8-2:1:39", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json index 24e0ad009..3667dd92e 100644 --- a/testdata/d2oracle/TestSet/replace_link.exp.json +++ b/testdata/d2oracle/TestSet/replace_link.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_link.d2,0:8:8-2:0:36", + "range": "d2/testdata/d2oracle/TestSet/replace_link.d2,0:8:8-2:1:37", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/replace_position.exp.json b/testdata/d2oracle/TestSet/replace_position.exp.json index eb08e4668..e68e99b04 100644 --- a/testdata/d2oracle/TestSet/replace_position.exp.json +++ b/testdata/d2oracle/TestSet/replace_position.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_position.d2,0:8:8-4:0:45", + "range": "d2/testdata/d2oracle/TestSet/replace_position.d2,0:8:8-4:1:46", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json index a5d18437f..8d47cd42c 100644 --- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/replace_tooltip.d2,0:8:8-2:0:23", + "range": "d2/testdata/d2oracle/TestSet/replace_tooltip.d2,0:8:8-2:1:24", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/set_dimensions.exp.json b/testdata/d2oracle/TestSet/set_dimensions.exp.json index adfb943b6..db12c96e6 100644 --- a/testdata/d2oracle/TestSet/set_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/set_dimensions.d2,0:8:8-0:19:19", + "range": "d2/testdata/d2oracle/TestSet/set_dimensions.d2,0:8:8-0:20:20", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json index 6984ebd04..9ff9cb5a7 100644 --- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/set_fill_pattern.d2,0:8:8-0:34:34", + "range": "d2/testdata/d2oracle/TestSet/set_fill_pattern.d2,0:8:8-0:35:35", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/set_position.exp.json b/testdata/d2oracle/TestSet/set_position.exp.json index 5b0379637..8775bfb56 100644 --- a/testdata/d2oracle/TestSet/set_position.exp.json +++ b/testdata/d2oracle/TestSet/set_position.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/set_position.d2,0:8:8-0:17:17", + "range": "d2/testdata/d2oracle/TestSet/set_position.d2,0:8:8-0:18:18", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json index ac8684a61..2f31cdc22 100644 --- a/testdata/d2oracle/TestSet/set_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/set_tooltip.d2,0:8:8-0:19:19", + "range": "d2/testdata/d2oracle/TestSet/set_tooltip.d2,0:8:8-0:20:20", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index b972a20aa..885841e55 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/shape.d2,0:8:8-0:22:22", + "range": "d2/testdata/d2oracle/TestSet/shape.d2,0:8:8-0:23:23", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index 301e3e04b..8700cd586 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/shape_nested_style_set.d2,0:3:3-0:22:22", + "range": "d2/testdata/d2oracle/TestSet/shape_nested_style_set.d2,0:3:3-0:23:23", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json index 9821f6bd4..b60ab7a67 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,0:9:9-4:0:42", + "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,0:9:9-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,1:5:16-3:2:40", + "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,1:5:16-3:3:41", "nodes": [ { "map_key": { @@ -129,7 +129,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,5:3:47-5:21:65", + "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,5:3:47-5:22:66", "nodes": [ { "map_key": { diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json index 003a21036..bc1700429 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json @@ -27,7 +27,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,0:9:9-4:0:42", + "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,0:9:9-4:1:43", "nodes": [ { "map_key": { @@ -51,7 +51,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,1:5:16-3:2:40", + "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,1:5:16-3:3:41", "nodes": [ { "map_key": { diff --git a/testdata/d2parser/TestParse/block_string.exp.json b/testdata/d2parser/TestParse/block_string.exp.json index cc9f06c07..e088e4678 100644 --- a/testdata/d2parser/TestParse/block_string.exp.json +++ b/testdata/d2parser/TestParse/block_string.exp.json @@ -97,7 +97,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/block_string.d2,19:3:107-20:0:109", + "range": "d2/testdata/d2parser/TestParse/block_string.d2,19:3:107-20:1:110", "nodes": null } } diff --git a/testdata/d2parser/TestParse/import/#08.exp.json b/testdata/d2parser/TestParse/import/#08.exp.json index a79694a98..3a0df6896 100644 --- a/testdata/d2parser/TestParse/import/#08.exp.json +++ b/testdata/d2parser/TestParse/import/#08.exp.json @@ -40,8 +40,8 @@ "err": { "errs": [ { - "range": "d2/testdata/d2parser/TestParse/import/#08.d2,0:9:9-0:10:10", - "errmsg": "d2/testdata/d2parser/TestParse/import/#08.d2:1:10: unquoted strings cannot begin with ...@ as that's import spread syntax" + "range": "d2/testdata/d2parser/TestParse/import/#08.d2,0:6:6-0:10:10", + "errmsg": "d2/testdata/d2parser/TestParse/import/#08.d2:1:7: unquoted strings cannot begin with ...@ as that's import spread syntax" } ] } diff --git a/testdata/d2parser/TestParse/primary.exp.json b/testdata/d2parser/TestParse/primary.exp.json index da623705c..25125e314 100644 --- a/testdata/d2parser/TestParse/primary.exp.json +++ b/testdata/d2parser/TestParse/primary.exp.json @@ -83,7 +83,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/primary.d2,1:19:20-16:0:741", + "range": "d2/testdata/d2parser/TestParse/primary.d2,1:19:20-16:1:742", "nodes": [ { "map_key": { diff --git a/testdata/d2parser/TestParse/table_and_class.exp.json b/testdata/d2parser/TestParse/table_and_class.exp.json index b44e38f25..d5ab2c9ed 100644 --- a/testdata/d2parser/TestParse/table_and_class.exp.json +++ b/testdata/d2parser/TestParse/table_and_class.exp.json @@ -34,7 +34,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,1:25:26-44:0:1006", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,1:25:26-44:1:1007", "nodes": [ { "map_key": { @@ -58,7 +58,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,2:9:37-11:2:310", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,2:9:37-11:3:311", "nodes": [ { "map_key": { @@ -125,7 +125,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,4:12:72-4:36:96", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,4:12:72-4:37:97", "nodes": [ { "map_key": { @@ -197,7 +197,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,5:15:113-5:39:137", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,5:15:113-5:40:138", "nodes": [ { "map_key": { @@ -269,7 +269,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,6:17:156-6:41:180", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,6:17:156-6:42:181", "nodes": [ { "map_key": { @@ -758,7 +758,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,23:12:516-27:2:620", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,23:12:516-27:3:621", "nodes": [ { "map_key": { @@ -815,7 +815,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,25:8:547-25:43:582", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,25:8:547-25:44:583", "nodes": [ { "map_key": { @@ -877,7 +877,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,26:20:604-26:32:616", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,26:20:604-26:33:617", "nodes": [ { "map_key": { @@ -944,7 +944,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,29:9:632-34:2:779", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,29:9:632-34:3:780", "nodes": [ { "map_key": { @@ -1001,7 +1001,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,31:8:663-31:43:698", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,31:8:663-31:44:699", "nodes": [ { "map_key": { @@ -1063,7 +1063,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,32:20:720-32:32:732", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,32:20:720-32:33:733", "nodes": [ { "map_key": { @@ -1135,7 +1135,7 @@ }, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,33:17:751-33:41:775", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,33:17:751-33:42:776", "nodes": [ { "map_key": { @@ -1270,7 +1270,7 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,46:15:1024-56:0:1178", + "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,46:15:1024-56:1:1179", "nodes": [ { "map_key": {