diff --git a/d2ir/compile.go b/d2ir/compile.go index 41b1bce99..2f27bd4a0 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -126,6 +126,9 @@ func (c *compiler) overlayClasses(m *Map) { func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { for _, f := range m.Fields { + if f.Name == nil { + continue + } if f.Name.ScalarString() == "vars" && f.Name.IsUnquoted() && f.Map() != nil { varsStack = append([]*Map{f.Map()}, varsStack...) } @@ -148,7 +151,7 @@ func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { } } } else if f.Map() != nil { - if f.Name.ScalarString() == "vars" && f.Name.IsUnquoted() { + if f.Name != nil && f.Name.ScalarString() == "vars" && f.Name.IsUnquoted() { c.compileSubstitutions(f.Map(), varsStack) c.validateConfigs(f.Map().GetField("d2-config")) } else { @@ -398,7 +401,7 @@ func (c *compiler) resolveSubstitution(vars *Map, node Node, substitution *d2ast // // When resolving hi.vars.x, the vars stack includes itself. // So this next if clause says, "ignore if we're using the current scope's vars to try to resolve a substitution that requires a var from further in the stack" - if fok && fieldNode.Name.ScalarString() == p.Unbox().ScalarString() && isCurrentScopeVars && parent.Name.ScalarString() == "vars" && parent.Name.IsUnquoted() { + if fok && fieldNode.Name != nil && fieldNode.Name.ScalarString() == p.Unbox().ScalarString() && isCurrentScopeVars && parent.Name.ScalarString() == "vars" && parent.Name.IsUnquoted() { return nil } diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 1a86e7271..4de0c8ec0 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -735,6 +735,9 @@ func (m *Map) getField(ida []string) *Field { } for _, f := range m.Fields { + if f.Name == nil { + continue + } if !strings.EqualFold(f.Name.ScalarString(), s) { continue } @@ -841,6 +844,9 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b return nil } for _, f := range m.Fields { + if f.Name == nil { + continue + } if matchPattern(f.Name.ScalarString(), us.Pattern) { if i == len(kp.Path)-1 { faAppend(f) diff --git a/d2ir/pattern.go b/d2ir/pattern.go index 35722e241..a62021342 100644 --- a/d2ir/pattern.go +++ b/d2ir/pattern.go @@ -21,6 +21,9 @@ func (m *Map) multiGlob(pattern []string) ([]*Field, bool) { func (m *Map) _doubleGlob(fa *[]*Field) { for _, f := range m.Fields { + if f.Name == nil { + continue + } if _, ok := d2ast.ReservedKeywords[f.Name.ScalarString()]; ok && f.Name.IsUnquoted() { if f.Name.ScalarString() == "layers" { continue diff --git a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg index e0f86221d..67a938e4d 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg @@ -1,16 +1,16 @@ CHICKEN'S PLAN +}]]>CHICKEN'S PLAN -CHICKEN'S PLANAPPROACH ROAD +CHICKEN'S PLANAPPROACH ROAD -CHICKEN'S PLANAPPROACH ROADCROSS ROAD +CHICKEN'S PLANAPPROACH ROADCROSS ROAD -CHICKEN'S PLANAPPROACH ROADCROSS ROADMAKE YOU WONDER WHY +CHICKEN'S PLANAPPROACH ROADCROSS ROADMAKE YOU WONDER WHY diff --git a/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json b/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json index b1ef6ce86..a779a2f70 100644 --- a/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json @@ -292,10 +292,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,3:4:28-3:6:30", "value": [ { - "string": "RJ" + "string": "RJ", + "raw_string": "RJ" } ] } @@ -394,10 +395,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,6:4:46-6:9:51", "value": [ { - "string": "label" + "string": "label", + "raw_string": "label" } ] } @@ -426,10 +428,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,7:4:61-7:6:63", "value": [ { - "string": "RJ" + "string": "RJ", + "raw_string": "RJ" } ] } diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json index cd20cadf7..bd5884c85 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json @@ -161,10 +161,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,1:0:1-1:9:10", "value": [ { - "string": "direction" + "string": "direction", + "raw_string": "direction" } ] } @@ -193,10 +194,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,5:4:39-5:6:41", "value": [ { - "string": "RJ" + "string": "RJ", + "raw_string": "RJ" } ] } diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 8e093a0f6..b83fbd95c 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -332,10 +332,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", "value": [ { - "string": "santa" + "string": "santa", + "raw_string": "santa" } ] } @@ -434,10 +435,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -456,10 +458,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", "value": [ { - "string": "scenarios" + "string": "scenarios", + "raw_string": "scenarios" } ] } @@ -479,10 +482,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", "value": [ { - "string": "seinfeld" + "string": "seinfeld", + "raw_string": "seinfeld" } ] } @@ -502,10 +506,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -529,10 +534,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", "value": [ { - "string": "missoula" + "string": "missoula", + "raw_string": "missoula" } ] } @@ -552,10 +558,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -574,10 +581,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", "value": [ { - "string": "steps" + "string": "steps", + "raw_string": "steps" } ] } @@ -597,10 +605,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", "value": [ { - "string": "missus" + "string": "missus", + "raw_string": "missus" } ] } @@ -724,10 +733,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -826,10 +836,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -848,10 +859,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", "value": [ { - "string": "steps" + "string": "steps", + "raw_string": "steps" } ] } @@ -871,10 +883,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", "value": [ { - "string": "missus" + "string": "missus", + "raw_string": "missus" } ] } diff --git a/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json b/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json index 54890fce4..843612380 100644 --- a/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json @@ -161,10 +161,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/no-inherit-label.d2,5:4:32-5:6:34", "value": [ { - "string": "RJ" + "string": "RJ", + "raw_string": "RJ" } ] } diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index 8324c327d..a15839583 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -382,10 +382,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", "value": [ { - "string": "santa" + "string": "santa", + "raw_string": "santa" } ] } @@ -484,10 +485,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -506,10 +508,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", "value": [ { - "string": "steps" + "string": "steps", + "raw_string": "steps" } ] } @@ -529,10 +532,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", "value": [ { - "string": "seinfeld" + "string": "seinfeld", + "raw_string": "seinfeld" } ] } @@ -552,10 +556,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -574,10 +579,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", "value": [ { - "string": "reindeer" + "string": "reindeer", + "raw_string": "reindeer" } ] } @@ -601,10 +607,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", "value": [ { - "string": "missoula" + "string": "missoula", + "raw_string": "missoula" } ] } @@ -624,10 +631,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -646,10 +654,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", "value": [ { - "string": "reindeer" + "string": "reindeer", + "raw_string": "reindeer" } ] } @@ -668,10 +677,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", "value": [ { - "string": "montana" + "string": "montana", + "raw_string": "montana" } ] } @@ -780,10 +790,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -802,10 +813,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", "value": [ { - "string": "reindeer" + "string": "reindeer", + "raw_string": "reindeer" } ] } @@ -949,10 +961,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -971,10 +984,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", "value": [ { - "string": "reindeer" + "string": "reindeer", + "raw_string": "reindeer" } ] } @@ -993,10 +1007,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", "value": [ { - "string": "montana" + "string": "montana", + "raw_string": "montana" } ] } diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index d610fe2e0..9114f54fb 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -249,10 +249,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", "value": [ { - "string": "santa" + "string": "santa", + "raw_string": "santa" } ] } @@ -351,10 +352,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index 4fa49ab8b..a8143b2ea 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -357,10 +357,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -379,10 +380,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -446,10 +448,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:16:44-4:21:49", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -469,10 +472,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:22:50-4:29:57", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } diff --git a/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json b/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json index 817cad6cf..3cca1d32c 100644 --- a/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json @@ -454,10 +454,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,20:4:139-20:5:140", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -558,10 +559,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,4:4:48-4:5:49", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -581,10 +583,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:3:3-0:8:8", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -604,10 +607,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:9:9-0:15:15", "value": [ { - "string": "stroke" + "string": "stroke", + "raw_string": "stroke" } ] } @@ -730,10 +734,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,7:4:65-7:5:66", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -753,10 +758,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:3:3-0:8:8", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -776,10 +782,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:9:9-0:15:15", "value": [ { - "string": "stroke" + "string": "stroke", + "raw_string": "stroke" } ] } @@ -904,10 +911,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,12:4:93-12:5:94", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -927,10 +935,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:3:3-0:8:8", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -950,10 +959,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:9:9-0:15:15", "value": [ { - "string": "stroke" + "string": "stroke", + "raw_string": "stroke" } ] } @@ -1076,10 +1086,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,12:4:93-12:5:94", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -1099,10 +1110,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:3:3-0:8:8", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -1122,10 +1134,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:9:9-0:15:15", "value": [ { - "string": "stroke" + "string": "stroke", + "raw_string": "stroke" } ] } diff --git a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json index 9d857a0fc..ea7fc0a46 100644 --- a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json @@ -446,10 +446,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.d2,11:4:101-11:5:102", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -469,10 +470,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.d2,1:4:5-1:9:10", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -492,10 +494,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.d2,1:10:11-1:14:15", "value": [ { - "string": "fill" + "string": "fill", + "raw_string": "fill" } ] } diff --git a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json index 24f29b12f..f71559a58 100644 --- a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json @@ -211,10 +211,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,5:4:48-5:5:49", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -234,10 +235,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,1:3:4-1:8:9", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -257,10 +259,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,1:9:10-1:13:14", "value": [ { - "string": "fill" + "string": "fill", + "raw_string": "fill" } ] } @@ -299,10 +302,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,5:9:53-5:10:54", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -322,10 +326,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,1:3:4-1:8:9", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -345,10 +350,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,1:9:10-1:13:14", "value": [ { - "string": "fill" + "string": "fill", + "raw_string": "fill" } ] } diff --git a/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json b/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json index 80e132917..bd5af6c7a 100644 --- a/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json @@ -362,10 +362,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/reapply-scenario.d2,2:0:20-2:1:21", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -385,10 +386,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/reapply-scenario.d2,3:2:27-3:3:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -408,10 +410,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/reapply-scenario.d2,1:5:6-1:10:11", "value": [ { - "string": "shape" + "string": "shape", + "raw_string": "shape" } ] } diff --git a/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json b/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json index 727036175..e03f20ba0 100644 --- a/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json @@ -300,10 +300,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,5:4:45-5:5:46", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -323,10 +324,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,6:6:56-6:7:57", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -346,10 +348,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,1:5:6-1:10:11", "value": [ { - "string": "shape" + "string": "shape", + "raw_string": "shape" } ] } @@ -513,10 +516,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,10:4:79-10:5:80", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -536,10 +540,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,11:6:90-11:7:91", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -559,10 +564,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,1:5:6-1:10:11", "value": [ { - "string": "shape" + "string": "shape", + "raw_string": "shape" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json index deafde506..6a49f19f5 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json @@ -358,10 +358,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,8:4:65-8:8:69", "value": [ { - "string": "vars" + "string": "vars", + "raw_string": "vars" } ] } @@ -381,10 +382,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,9:6:79-9:7:80", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -418,10 +420,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:4:104-11:6:106", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } @@ -450,10 +453,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:4:117-12:9:122", "value": [ { - "string": "hello" + "string": "hello", + "raw_string": "hello" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json index 651a8f2ec..6a99dab5b 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -215,10 +215,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:4:47-7:6:49", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json index 0344bf673..26fab8e09 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -541,10 +541,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,16:4:134-16:8:138", "value": [ { - "string": "vars" + "string": "vars", + "raw_string": "vars" } ] } @@ -564,10 +565,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:6:148-17:7:149", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -601,10 +603,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:4:170-19:5:171", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -633,10 +636,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:4:182-20:5:183", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -792,10 +796,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,1:0:1-1:4:5", "value": [ { - "string": "vars" + "string": "vars", + "raw_string": "vars" } ] } @@ -815,10 +820,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:2:11-2:3:12", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -847,10 +853,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:6:64-8:7:65", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -884,10 +891,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:4:86-10:5:87", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -916,10 +924,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:4:98-11:5:99", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json index a43035991..4fdefffce 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json @@ -277,10 +277,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,1:0:1-1:4:5", "value": [ { - "string": "vars" + "string": "vars", + "raw_string": "vars" } ] } @@ -300,10 +301,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,2:2:11-2:3:12", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -337,10 +339,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:4:95-10:5:96", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } diff --git a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json index 3e7cfeca1..ed15fda22 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json @@ -215,10 +215,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,1:0:1-1:4:5", "value": [ { - "string": "vars" + "string": "vars", + "raw_string": "vars" } ] } @@ -238,10 +239,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:2:11-2:3:12", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -275,10 +277,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:4:50-7:6:52", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } diff --git a/testdata/d2oracle/TestCreate/add_layer/2.exp.json b/testdata/d2oracle/TestCreate/add_layer/2.exp.json index 2b4f7031f..bd411a1f2 100644 --- a/testdata/d2oracle/TestCreate/add_layer/2.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/2.exp.json @@ -225,10 +225,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/2.d2,4:4:24-4:5:25", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } diff --git a/testdata/d2oracle/TestCreate/add_layer/3.exp.json b/testdata/d2oracle/TestCreate/add_layer/3.exp.json index 9a7caee0f..acd0d3440 100644 --- a/testdata/d2oracle/TestCreate/add_layer/3.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/3.exp.json @@ -254,10 +254,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/3.d2,4:4:24-4:5:25", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -276,10 +277,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/3.d2,5:4:30-5:10:36", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -299,10 +301,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/3.d2,6:6:46-6:7:47", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } diff --git a/testdata/d2oracle/TestCreate/add_layer/4.exp.json b/testdata/d2oracle/TestCreate/add_layer/4.exp.json index 5adb73476..9002f903d 100644 --- a/testdata/d2oracle/TestCreate/add_layer/4.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/4.exp.json @@ -197,10 +197,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,4:4:24-4:5:25", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } diff --git a/testdata/d2oracle/TestCreate/layers-basic.exp.json b/testdata/d2oracle/TestCreate/layers-basic.exp.json index fd96eec76..721b66eb3 100644 --- a/testdata/d2oracle/TestCreate/layers-basic.exp.json +++ b/testdata/d2oracle/TestCreate/layers-basic.exp.json @@ -220,10 +220,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:24-4:5:25", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -242,10 +243,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,5:4:30-5:5:31", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json index 3d0e35b9f..610e0f54a 100644 --- a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json +++ b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json @@ -365,10 +365,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:29-4:5:30", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -387,10 +388,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:34-4:10:35", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestCreate/layers-edge.exp.json b/testdata/d2oracle/TestCreate/layers-edge.exp.json index d21cbdf87..d6b57544f 100644 --- a/testdata/d2oracle/TestCreate/layers-edge.exp.json +++ b/testdata/d2oracle/TestCreate/layers-edge.exp.json @@ -243,10 +243,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:24-4:5:25", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -265,10 +266,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:9:35-5:10:36", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json index e6f6e4791..a3f613edd 100644 --- a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json @@ -288,10 +288,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -310,10 +311,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,1:0:2-1:1:3", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -332,10 +334,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,6:4:35-6:5:36", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } diff --git a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json index bf7c7c758..d400206de 100644 --- a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json @@ -342,10 +342,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -364,10 +365,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json index 090920158..3954aedfa 100644 --- a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json @@ -311,10 +311,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -333,10 +334,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,1:0:2-1:1:3", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestCreate/steps-basic.exp.json b/testdata/d2oracle/TestCreate/steps-basic.exp.json index 394b6c479..a9e214f25 100644 --- a/testdata/d2oracle/TestCreate/steps-basic.exp.json +++ b/testdata/d2oracle/TestCreate/steps-basic.exp.json @@ -288,10 +288,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -310,10 +311,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,1:0:2-1:1:3", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -332,10 +334,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:25-5:5:26", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -354,10 +357,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,6:4:31-6:5:32", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } diff --git a/testdata/d2oracle/TestCreate/steps-conflict.exp.json b/testdata/d2oracle/TestCreate/steps-conflict.exp.json index faa16fc82..50176089a 100644 --- a/testdata/d2oracle/TestCreate/steps-conflict.exp.json +++ b/testdata/d2oracle/TestCreate/steps-conflict.exp.json @@ -288,10 +288,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -310,10 +311,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,1:0:2-1:1:3", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -332,10 +334,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:25-5:5:26", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -354,10 +357,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,6:4:31-6:7:34", "value": [ { - "string": "d 2" + "string": "d 2", + "raw_string": "d 2" } ] } diff --git a/testdata/d2oracle/TestCreate/steps-edge.exp.json b/testdata/d2oracle/TestCreate/steps-edge.exp.json index 3298522ab..fbe757b84 100644 --- a/testdata/d2oracle/TestCreate/steps-edge.exp.json +++ b/testdata/d2oracle/TestCreate/steps-edge.exp.json @@ -311,10 +311,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -333,10 +334,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,1:0:2-1:1:3", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -355,10 +357,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:25-5:5:26", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index a0fdc1628..284e75cd0 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -133,7 +133,7 @@ ], "objects": [ { - "id": "\"what's up\"", + "id": "what's up", "id_val": "what's up", "references": [ { diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 13e8a86d1..873898ef7 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -285,7 +285,7 @@ "zIndex": 0 }, { - "id": "\"what's up\"", + "id": "what's up", "id_val": "what's up", "references": [ { diff --git a/testdata/d2oracle/TestDelete/delete-layer-style.exp.json b/testdata/d2oracle/TestDelete/delete-layer-style.exp.json index 4756b825d..58a3a4bd5 100644 --- a/testdata/d2oracle/TestDelete/delete-layer-style.exp.json +++ b/testdata/d2oracle/TestDelete/delete-layer-style.exp.json @@ -128,10 +128,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/delete-layer-style.d2,2:4:21-2:5:22", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } diff --git a/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json b/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json index 6471d0958..76a06f92c 100644 --- a/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json +++ b/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json @@ -197,10 +197,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/delete-not-layer-obj.d2,4:4:24-4:5:25", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } diff --git a/testdata/d2oracle/TestDelete/edge-in-layer.exp.json b/testdata/d2oracle/TestDelete/edge-in-layer.exp.json index 403548280..8839f5026 100644 --- a/testdata/d2oracle/TestDelete/edge-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/edge-in-layer.exp.json @@ -180,10 +180,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,2:4:24-2:5:25", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -203,10 +204,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:6:35-3:7:36", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -225,10 +227,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:11:40-3:12:41", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestDelete/import/2.exp.json b/testdata/d2oracle/TestDelete/import/2.exp.json index 03dae3eb1..79d2c4a66 100644 --- a/testdata/d2oracle/TestDelete/import/2.exp.json +++ b/testdata/d2oracle/TestDelete/import/2.exp.json @@ -266,10 +266,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "index.d2,4:4:34-4:5:35", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } diff --git a/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json b/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json index 28bc88fa7..d2f5bee0c 100644 --- a/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json @@ -128,10 +128,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,2:4:21-2:5:22", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } diff --git a/testdata/d2oracle/TestDelete/layers-basic.exp.json b/testdata/d2oracle/TestDelete/layers-basic.exp.json index b8f5f3fce..01354d3bd 100644 --- a/testdata/d2oracle/TestDelete/layers-basic.exp.json +++ b/testdata/d2oracle/TestDelete/layers-basic.exp.json @@ -197,10 +197,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,4:4:24-4:5:25", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index dc3c6c44f..693282d17 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -463,7 +463,7 @@ "zIndex": 0 }, { - "id": "\"what's up\"", + "id": "what's up", "id_val": "what's up", "references": [ { diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 117af5395..8acca1102 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -639,7 +639,7 @@ "zIndex": 0 }, { - "id": "\"what's up\"", + "id": "what's up", "id_val": "what's up", "references": [ { diff --git a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json index 40a69618b..81557a95f 100644 --- a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json @@ -197,10 +197,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -219,10 +220,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json b/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json index 51771025c..8dcd684ac 100644 --- a/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json @@ -374,10 +374,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-edge-inherited.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -396,10 +397,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-edge-inherited.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -418,10 +420,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-edge-inherited.d2,5:4:38-5:5:39", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } diff --git a/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json b/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json index 26752dc82..500570aef 100644 --- a/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json @@ -247,10 +247,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-inherited.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -269,10 +270,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-inherited.d2,5:4:33-5:5:34", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index e5f1f7ea9..3422a0889 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -56,8 +56,8 @@ "edges": null, "objects": [ { - "id": "\"github.com/terrastruct/d2parser.git\"", - "id_val": "github.com/terrastruct/d2parser.git", + "id": "github.com/terrastruct/d2parser.git", + "id_val": "github", "references": [ { "key": { @@ -82,7 +82,7 @@ ], "attributes": { "label": { - "value": "github.com/terrastruct/d2parser.git" + "value": "github" }, "labelDimensions": { "width": 0, diff --git a/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json b/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json index c30b0d330..42fcbcbd2 100644 --- a/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json @@ -128,10 +128,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,2:4:21-2:5:22", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } diff --git a/testdata/d2oracle/TestMove/layers-basic.exp.json b/testdata/d2oracle/TestMove/layers-basic.exp.json index 1ebf31684..26bf618a0 100644 --- a/testdata/d2oracle/TestMove/layers-basic.exp.json +++ b/testdata/d2oracle/TestMove/layers-basic.exp.json @@ -226,10 +226,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:4:24-4:5:25", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -249,10 +250,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,5:6:35-5:7:36", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } diff --git a/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json b/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json index 9a8fbf16b..6b6324715 100644 --- a/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json @@ -266,10 +266,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/layers-basic.d2,4:4:24-4:5:25", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -288,10 +289,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/layers-basic.d2,5:4:30-5:5:31", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -310,10 +312,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/layers-basic.d2,6:4:36-6:5:37", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } diff --git a/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json b/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json index 9f986050c..829fa8f3d 100644 --- a/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json @@ -266,10 +266,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-basic.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -288,10 +289,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-basic.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -310,10 +312,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-basic.d2,5:4:33-5:5:34", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } diff --git a/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json b/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json index 2e1e86126..5aeba3378 100644 --- a/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json @@ -243,10 +243,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -265,10 +266,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.d2,4:4:27-4:5:28", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -287,10 +289,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.d2,5:4:38-5:5:39", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index ab086e248..6072c8f2c 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -751,7 +751,7 @@ "zIndex": 0 }, { - "id": "\"q)\"", + "id": "q)", "id_val": "q)", "references": [ { diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 1d4593223..b46e3e1e7 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -1258,7 +1258,7 @@ "zIndex": 0 }, { - "id": "\"\"", + "id": "", "id_val": "", "references": [ { diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index 028991927..54bfec7f3 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -56,7 +56,7 @@ "edges": null, "objects": [ { - "id": "\"---\"", + "id": "---", "id_val": "---", "references": [ { diff --git a/testdata/d2oracle/TestRename/layers-basic.exp.json b/testdata/d2oracle/TestRename/layers-basic.exp.json index 3ed3c1f79..32bc3fc82 100644 --- a/testdata/d2oracle/TestRename/layers-basic.exp.json +++ b/testdata/d2oracle/TestRename/layers-basic.exp.json @@ -197,10 +197,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestRename/layers-basic.d2,4:4:24-4:5:25", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestRename/scenarios-basic.exp.json b/testdata/d2oracle/TestRename/scenarios-basic.exp.json index 3189b8434..ca3c52946 100644 --- a/testdata/d2oracle/TestRename/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestRename/scenarios-basic.exp.json @@ -197,10 +197,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-basic.d2,0:0:0-0:1:1", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -219,10 +220,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-basic.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestRename/scenarios-conflict.exp.json b/testdata/d2oracle/TestRename/scenarios-conflict.exp.json index 0a968b476..0116d26b0 100644 --- a/testdata/d2oracle/TestRename/scenarios-conflict.exp.json +++ b/testdata/d2oracle/TestRename/scenarios-conflict.exp.json @@ -197,10 +197,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-conflict.d2,0:0:0-0:1:1", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -219,10 +220,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-conflict.d2,4:4:27-4:7:30", "value": [ { - "string": "x 2" + "string": "x 2", + "raw_string": "x 2" } ] } diff --git a/testdata/d2oracle/TestSet/import/8.exp.json b/testdata/d2oracle/TestSet/import/8.exp.json index c4e4373ba..af3862f3c 100644 --- a/testdata/d2oracle/TestSet/import/8.exp.json +++ b/testdata/d2oracle/TestSet/import/8.exp.json @@ -249,10 +249,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "yo.d2,0:0:0-0:1:1", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -272,10 +273,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "index.d2,5:6:37-5:11:42", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -295,10 +297,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "index.d2,5:12:43-5:16:47", "value": [ { - "string": "fill" + "string": "fill", + "raw_string": "fill" } ] } diff --git a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json index 39dd972b0..b7c8ba9b5 100644 --- a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json @@ -248,10 +248,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:24-4:5:25", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -270,10 +271,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:4:30-5:5:31", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -293,10 +295,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:6:32-5:11:37", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -316,10 +319,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:12:38-5:19:45", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } diff --git a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json index 157eadec4..a2e059610 100644 --- a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json @@ -243,10 +243,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:4:24-4:5:25", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -266,10 +267,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:8:28-4:13:33", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -289,10 +291,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:14:34-4:21:41", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } diff --git a/testdata/d2oracle/TestSet/scenario-child.exp.json b/testdata/d2oracle/TestSet/scenario-child.exp.json index e2c9e891e..c21d48e46 100644 --- a/testdata/d2oracle/TestSet/scenario-child.exp.json +++ b/testdata/d2oracle/TestSet/scenario-child.exp.json @@ -380,10 +380,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -402,10 +403,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -424,10 +426,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,4:4:32-4:6:34", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } @@ -491,10 +494,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:16:51-5:21:56", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -514,10 +518,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:22:57-5:34:69", "value": [ { - "string": "stroke-width" + "string": "stroke-width", + "raw_string": "stroke-width" } ] } diff --git a/testdata/d2oracle/TestSet/scenario-grandchild.exp.json b/testdata/d2oracle/TestSet/scenario-grandchild.exp.json index 0f8d74762..15a6f6ac7 100644 --- a/testdata/d2oracle/TestSet/scenario-grandchild.exp.json +++ b/testdata/d2oracle/TestSet/scenario-grandchild.exp.json @@ -498,10 +498,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -520,10 +521,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -542,10 +544,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,4:4:32-4:13:41", "value": [ { - "string": "scenarios" + "string": "scenarios", + "raw_string": "scenarios" } ] } @@ -565,10 +568,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,5:6:51-5:7:52", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -588,10 +592,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -610,10 +615,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -677,10 +683,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,6:20:76-6:25:81", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -700,10 +707,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,6:26:82-6:30:86", "value": [ { - "string": "bold" + "string": "bold", + "raw_string": "bold" } ] } @@ -727,10 +735,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,7:26:119-7:38:131", "value": [ { - "string": "stroke-width" + "string": "stroke-width", + "raw_string": "stroke-width" } ] } @@ -975,10 +984,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -997,10 +1007,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -1064,10 +1075,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,6:20:76-6:25:81", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -1087,10 +1099,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,6:26:82-6:30:86", "value": [ { - "string": "bold" + "string": "bold", + "raw_string": "bold" } ] } @@ -1114,10 +1127,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,7:26:119-7:38:131", "value": [ { - "string": "stroke-width" + "string": "stroke-width", + "raw_string": "stroke-width" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json index 6227312a5..f2cc29ee0 100644 --- a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json @@ -654,10 +654,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -676,10 +677,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -698,10 +700,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,3:0:47-3:1:48", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -720,10 +723,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,3:5:52-3:6:53", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -742,10 +746,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,10:4:142-10:5:143", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -764,10 +769,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,10:9:147-10:10:148", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -831,10 +837,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,1:2:12-1:18:28", "value": [ { - "string": "target-arrowhead" + "string": "target-arrowhead", + "raw_string": "target-arrowhead" } ] } @@ -854,10 +861,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,1:19:29-1:24:34", "value": [ { - "string": "shape" + "string": "shape", + "raw_string": "shape" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json b/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json index 681028ae3..656860ac7 100644 --- a/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json @@ -380,10 +380,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -402,10 +403,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -424,10 +426,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,4:4:32-4:5:33", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -491,10 +494,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,5:16:50-5:21:55", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -514,10 +518,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,5:22:56-5:29:63", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json b/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json index 5f85a1b48..82cae340c 100644 --- a/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json @@ -388,10 +388,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -410,10 +411,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -432,10 +434,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,5:4:65-5:5:66", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -543,10 +546,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,4:13:41-4:18:46", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -566,10 +570,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,4:19:47-4:26:54", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json index cef4033e3..2b40ff6a0 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json @@ -280,10 +280,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -313,10 +314,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,1:2:7-1:7:12", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -336,10 +338,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,1:8:13-1:15:20", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -374,10 +377,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:53-6:5:54", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json index 532add34b..aad9656af 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json @@ -303,10 +303,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -336,10 +337,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,1:2:7-1:7:12", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -359,10 +361,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,1:8:13-1:15:20", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-multiple.exp.json b/testdata/d2oracle/TestSet/scenarios-multiple.exp.json index f49af2dfc..695d324ce 100644 --- a/testdata/d2oracle/TestSet/scenarios-multiple.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-multiple.exp.json @@ -303,10 +303,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -326,10 +327,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,5:6:35-5:11:40", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -349,10 +351,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,5:12:41-5:16:45", "value": [ { - "string": "fill" + "string": "fill", + "raw_string": "fill" } ] } @@ -381,10 +384,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,6:12:63-6:19:70", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -419,10 +423,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json index b201b16cc..5fc07b8ca 100644 --- a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json @@ -366,10 +366,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -389,10 +390,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,1:2:7-1:3:8", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -422,10 +424,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:16:64-7:21:69", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -445,10 +448,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:22:70-7:29:77", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json index 8b8ef383c..d3f179e0b 100644 --- a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json @@ -248,10 +248,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -271,10 +272,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:6:35-5:11:40", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -294,10 +296,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:12:41-5:19:48", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -332,10 +335,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json index c99418180..ce99229ee 100644 --- a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json @@ -263,10 +263,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -296,10 +297,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:14:44-4:19:49", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -319,10 +321,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:20:50-4:27:57", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] }