diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 87b6e616e..c3f44895d 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf differ diff --git a/testdata/d2ir/TestCompile/classes/basic.exp.json b/testdata/d2ir/TestCompile/classes/basic.exp.json index eed20a6c8..b53c72817 100644 --- a/testdata/d2ir/TestCompile/classes/basic.exp.json +++ b/testdata/d2ir/TestCompile/classes/basic.exp.json @@ -75,8 +75,7 @@ "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -156,8 +155,7 @@ "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -245,8 +243,7 @@ "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -347,8 +344,7 @@ "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -478,8 +474,7 @@ "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } diff --git a/testdata/d2ir/TestCompile/classes/inherited.exp.json b/testdata/d2ir/TestCompile/classes/inherited.exp.json index f88697361..48f9fe144 100644 --- a/testdata/d2ir/TestCompile/classes/inherited.exp.json +++ b/testdata/d2ir/TestCompile/classes/inherited.exp.json @@ -19,8 +19,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -100,8 +99,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -189,8 +187,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -291,8 +288,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -422,8 +418,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -470,8 +465,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -551,8 +545,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -640,8 +633,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -742,8 +734,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -873,8 +864,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -921,8 +911,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1002,8 +991,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1091,8 +1079,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1193,8 +1180,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1224,8 +1210,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1305,8 +1290,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1394,8 +1378,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1496,8 +1479,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1627,8 +1609,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1757,8 +1738,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1973,8 +1953,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -2045,8 +2024,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -2126,8 +2104,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -2215,8 +2192,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -2317,8 +2293,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -2348,8 +2323,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -2429,8 +2403,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -2518,8 +2491,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -2620,8 +2592,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -2751,8 +2722,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -2881,8 +2851,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -3123,8 +3092,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -3204,8 +3172,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -3293,8 +3260,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -3395,8 +3361,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -3426,8 +3391,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -3507,8 +3471,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -3590,8 +3553,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -3679,8 +3641,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -3762,8 +3723,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -3864,8 +3824,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -3965,8 +3924,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -4096,8 +4054,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -4226,8 +4183,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -4356,8 +4312,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -4679,8 +4634,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -4751,8 +4705,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -4832,8 +4785,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -4921,8 +4873,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -5023,8 +4974,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -5054,8 +5004,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -5135,8 +5084,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -5218,8 +5166,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -5307,8 +5254,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -5390,8 +5336,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -5492,8 +5437,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -5593,8 +5537,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -5724,8 +5667,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -5854,8 +5796,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -5984,8 +5925,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -6302,8 +6242,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -6383,8 +6322,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -6472,8 +6410,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -6574,8 +6511,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -6605,8 +6541,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -6686,8 +6621,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -6769,8 +6703,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -6858,8 +6791,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -6941,8 +6873,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -7043,8 +6974,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -7144,8 +7074,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -7275,8 +7204,7 @@ "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -7405,8 +7333,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -7535,8 +7462,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -8087,8 +8013,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -8293,8 +8218,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -8667,8 +8591,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -8873,8 +8796,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -9276,8 +9198,7 @@ "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -9482,8 +9403,7 @@ "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } diff --git a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json index 087bc4de2..07e31f3f8 100644 --- a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json +++ b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json @@ -19,8 +19,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -100,8 +99,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -189,8 +187,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -291,8 +288,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -422,8 +418,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -470,8 +465,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -551,8 +545,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -569,8 +562,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -694,8 +686,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -783,8 +774,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -910,8 +900,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1012,8 +1001,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -1144,8 +1132,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1270,8 +1257,7 @@ "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", "value": [ { - "string": "yellow", - "raw_string": "yellow" + "string": "yellow" } ] } @@ -1404,8 +1390,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -1557,8 +1542,7 @@ "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2ir/TestCompile/classes/merge.exp.json b/testdata/d2ir/TestCompile/classes/merge.exp.json index 1ad04233f..fc776823c 100644 --- a/testdata/d2ir/TestCompile/classes/merge.exp.json +++ b/testdata/d2ir/TestCompile/classes/merge.exp.json @@ -19,8 +19,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -100,8 +99,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -189,8 +187,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -360,8 +357,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -520,8 +516,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -597,8 +592,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -678,8 +672,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -767,8 +760,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -995,8 +987,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1241,8 +1232,7 @@ "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } diff --git a/testdata/d2ir/TestCompile/classes/nested.exp.json b/testdata/d2ir/TestCompile/classes/nested.exp.json index 9fec0c647..40fcad16d 100644 --- a/testdata/d2ir/TestCompile/classes/nested.exp.json +++ b/testdata/d2ir/TestCompile/classes/nested.exp.json @@ -19,8 +19,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -100,8 +99,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -189,8 +187,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -291,8 +288,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -422,8 +418,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -534,8 +529,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -615,8 +609,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -704,8 +697,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -806,8 +798,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -937,8 +928,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1178,8 +1168,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1259,8 +1248,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1348,8 +1336,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1450,8 +1437,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } @@ -1581,8 +1567,7 @@ "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } diff --git a/testdata/d2ir/TestCompile/fields/label.exp.json b/testdata/d2ir/TestCompile/fields/label.exp.json index 278d70857..be26669b0 100644 --- a/testdata/d2ir/TestCompile/fields/label.exp.json +++ b/testdata/d2ir/TestCompile/fields/label.exp.json @@ -7,8 +7,7 @@ "range": "TestCompile/fields/label.d2,0:3:3-0:6:6", "value": [ { - "string": "yes", - "raw_string": "yes" + "string": "yes" } ] } @@ -66,8 +65,7 @@ "range": "TestCompile/fields/label.d2,0:3:3-0:6:6", "value": [ { - "string": "yes", - "raw_string": "yes" + "string": "yes" } ] } diff --git a/testdata/d2ir/TestCompile/fields/nested.exp.json b/testdata/d2ir/TestCompile/fields/nested.exp.json index 042d9865f..48b7c3ec1 100644 --- a/testdata/d2ir/TestCompile/fields/nested.exp.json +++ b/testdata/d2ir/TestCompile/fields/nested.exp.json @@ -11,8 +11,7 @@ "range": "TestCompile/fields/nested.d2,0:5:5-0:8:8", "value": [ { - "string": "yes", - "raw_string": "yes" + "string": "yes" } ] } @@ -92,8 +91,7 @@ "range": "TestCompile/fields/nested.d2,0:5:5-0:8:8", "value": [ { - "string": "yes", - "raw_string": "yes" + "string": "yes" } ] } @@ -181,8 +179,7 @@ "range": "TestCompile/fields/nested.d2,0:5:5-0:8:8", "value": [ { - "string": "yes", - "raw_string": "yes" + "string": "yes" } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/map.exp.json b/testdata/d2ir/TestCompile/imports/nested/map.exp.json index b1dedaa35..e6f547dbd 100644 --- a/testdata/d2ir/TestCompile/imports/nested/map.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/map.exp.json @@ -11,8 +11,7 @@ "range": "x.d2,1:8:13-1:14:19", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -70,8 +69,7 @@ "range": "x.d2,1:8:13-1:14:19", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -88,8 +86,7 @@ "range": "x.d2,2:8:28-2:12:32", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } @@ -147,8 +144,7 @@ "range": "x.d2,2:8:28-2:12:32", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json index ed273c2c0..750095b9a 100644 --- a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json @@ -7,8 +7,7 @@ "range": "x.d2,0:3:3-0:7:7", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } diff --git a/testdata/d2ir/TestCompile/imports/spread.exp.json b/testdata/d2ir/TestCompile/imports/spread.exp.json index cc2a0a3e5..b43e59e20 100644 --- a/testdata/d2ir/TestCompile/imports/spread.exp.json +++ b/testdata/d2ir/TestCompile/imports/spread.exp.json @@ -7,8 +7,7 @@ "range": "x.d2,0:3:3-0:7:7", "value": [ { - "string": "wowa", - "raw_string": "wowa" + "string": "wowa" } ] } @@ -66,8 +65,7 @@ "range": "x.d2,0:3:3-0:7:7", "value": [ { - "string": "wowa", - "raw_string": "wowa" + "string": "wowa" } ] } diff --git a/testdata/d2ir/TestCompile/imports/value.exp.json b/testdata/d2ir/TestCompile/imports/value.exp.json index 8e5c0f021..7828f5ba2 100644 --- a/testdata/d2ir/TestCompile/imports/value.exp.json +++ b/testdata/d2ir/TestCompile/imports/value.exp.json @@ -11,8 +11,7 @@ "range": "x.d2,0:7:7-0:13:13", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -70,8 +69,7 @@ "range": "x.d2,0:7:7-0:13:13", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } @@ -88,8 +86,7 @@ "range": "x.d2,1:7:21-1:11:25", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } @@ -147,8 +144,7 @@ "range": "x.d2,1:7:21-1:11:25", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } diff --git a/testdata/d2ir/TestCompile/imports/vars/1.exp.json b/testdata/d2ir/TestCompile/imports/vars/1.exp.json index de94a458d..7da5d84d7 100644 --- a/testdata/d2ir/TestCompile/imports/vars/1.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/1.exp.json @@ -11,8 +11,7 @@ "range": "x.d2,0:6:6-0:18:18", "value": [ { - "string": "var replaced", - "raw_string": "var replaced" + "string": "var replaced" } ] } @@ -70,8 +69,7 @@ "range": "x.d2,0:6:6-0:18:18", "value": [ { - "string": "var replaced", - "raw_string": "var replaced" + "string": "var replaced" } ] } @@ -131,8 +129,7 @@ "range": "x.d2,0:6:6-0:18:18", "value": [ { - "string": "var replaced", - "raw_string": "var replaced" + "string": "var replaced" } ] } @@ -306,11 +303,10 @@ "name": "q", "primary": { "value": { - "range": "x.d2,0:6:6-0:18:18", + "range": "index.d2,0:20:20-0:21:21", "value": [ { - "string": "var replaced", - "raw_string": "var replaced" + "string": "var replaced" } ] } @@ -364,20 +360,11 @@ }, "primary": {}, "value": { - "substitution": { - "range": "index.d2,0:20:20-0:27:27", - "spread": false, - "path": [ + "unquoted_string": { + "range": "index.d2,0:20:20-0:21:21", + "value": [ { - "unquoted_string": { - "range": "index.d2,0:22:22-0:26:26", - "value": [ - { - "string": "meow", - "raw_string": "meow" - } - ] - } + "string": "var replaced" } ] } diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index 3b2eb0b98..379eb30af 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline.d2,1:9:17-1:15:23", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } 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 c5e68d3cb..021d825c5 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.d2,2:9:24-2:15:30", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } 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 b5616c220..4457a46e7 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.d2,3:9:25-3:15:31", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json index 0ca9c574f..408321427 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,1:26:36-1:33:43", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json index dc0352817..7cdb43a60 100644 --- a/testdata/d2oracle/TestDelete/chaos_1.exp.json +++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,0:12:12-0:20:20", "value": [ { - "string": "cylinder", - "raw_string": "cylinder" + "string": "cylinder" } ] } @@ -150,8 +149,7 @@ "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:36:58-1:51:73", "value": [ { - "string": "cf-one-required", - "raw_string": "cf-one-required" + "string": "cf-one-required" } ] } @@ -188,8 +186,7 @@ "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,2:4:79-2:5:80", "value": [ { - "string": "z", - "raw_string": "z" + "string": "z" } ] } diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 7759732a2..f995a64cc 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -99,8 +99,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,4:5:18-4:9:22", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index a11ffdd2c..ee7d331d5 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -159,8 +159,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,4:5:26-4:9:30", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } @@ -192,8 +191,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,5:5:36-5:9:40", "value": [ { - "string": "ey", - "raw_string": "ey" + "string": "ey" } ] } diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index fe212f64a..4b7ffd6ad 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -76,8 +76,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_flat_conflicts.d2,3:5:12-3:9:16", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index c1cf6e922..e6a9fe976 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -168,8 +168,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,7:5:30-7:9:34", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 489e99551..b4bef5253 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -87,8 +87,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.d2,4:5:15-4:9:19", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } @@ -131,8 +130,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.d2,5:7:27-5:12:32", "value": [ { - "string": "hey", - "raw_string": "hey" + "string": "hey" } ] } diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index 25088c478..e61acceb2 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -76,8 +76,7 @@ "range": "d2/testdata/d2oracle/TestDelete/children_referenced_conflicts.d2,4:5:13-4:9:17", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 5044d5f4b..f9a7d69e9 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,1:8:13-1:9:14", "value": [ { - "string": "z", - "raw_string": "z" + "string": "z" } ] } @@ -139,8 +138,7 @@ "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,5:8:32-5:9:33", "value": [ { - "string": "z", - "raw_string": "z" + "string": "z" } ] } diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json index 4c52363d8..5555f957e 100644 --- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,0:11:11-0:15:15", "value": [ { - "string": "down", - "raw_string": "down" + "string": "down" } ] } @@ -452,8 +451,7 @@ "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,9:19:236-9:37:254", "value": [ { - "string": "collision detected", - "raw_string": "collision detected" + "string": "collision detected" } ] } diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index 09b4bbab9..2c04083ce 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -65,8 +65,7 @@ "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:8:15-1:26:33", "value": [ { - "string": "https://google.com", - "raw_string": "https://google.com" + "string": "https://google.com" } ] } diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 13a576bb8..d9910b9db 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -242,8 +242,7 @@ "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:13:42-5:17:46", "value": [ { - "string": "zero", - "raw_string": "zero" + "string": "zero" } ] } @@ -303,8 +302,7 @@ "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:13:60-6:16:63", "value": [ { - "string": "one", - "raw_string": "one" + "string": "one" } ] } @@ -364,8 +362,7 @@ "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:13:78-8:18:83", "value": [ { - "string": "three", - "raw_string": "three" + "string": "three" } ] } @@ -425,8 +422,7 @@ "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:13:97-9:17:101", "value": [ { - "string": "four", - "raw_string": "four" + "string": "four" } ] } diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index f6c3e68b1..78ba7c9a8 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,2:8:24-2:11:27", "value": [ { - "string": "API", - "raw_string": "API" + "string": "API" } ] } @@ -139,8 +138,7 @@ "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,5:8:44-5:12:48", "value": [ { - "string": "Blah", - "raw_string": "Blah" + "string": "Blah" } ] } diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index b93c9f0c6..224894d55 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -65,8 +65,7 @@ "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,0:18:18-0:27:27", "value": [ { - "string": "#000e3d", - "raw_string": "#000e3d" + "string": "#000e3d" } ] } diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 35f4eac8b..6a06bf2ad 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -134,8 +134,7 @@ "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:23:27-2:32:36", "value": [ { - "string": "#2b50c2", - "raw_string": "#2b50c2" + "string": "#2b50c2" } ] } diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json index f9a437bd2..6050b7dec 100644 --- a/testdata/d2oracle/TestDelete/save_map.exp.json +++ b/testdata/d2oracle/TestDelete/save_map.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:9:14-1:15:20", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json index 9135e9999..7a09a0b95 100644 --- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json @@ -64,8 +64,7 @@ "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,1:9:20-1:15:26", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 279fee006..48896ea4c 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,2:11:31-2:20:40", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -145,8 +144,7 @@ "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,3:25:66-3:36:77", "value": [ { - "string": "primary_key", - "raw_string": "primary_key" + "string": "primary_key" } ] } diff --git a/testdata/d2oracle/TestDelete/table_refs.exp.json b/testdata/d2oracle/TestDelete/table_refs.exp.json index 8dddf30b2..903675ede 100644 --- a/testdata/d2oracle/TestDelete/table_refs.exp.json +++ b/testdata/d2oracle/TestDelete/table_refs.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestDelete/table_refs.d2,1:9:14-1:18:23", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index f35e81c9d..84fb3f5cc 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -189,8 +189,7 @@ "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,8:12:86-8:17:91", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json index 2bb20536a..53bcaad10 100644 --- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json +++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json @@ -28,7 +28,11 @@ "value": { "double_quoted_string": { "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,0:10:10-0:12:12", - "value": null + "value": [ + { + "string": "" + } + ] } } } @@ -56,7 +60,11 @@ "value": { "double_quoted_string": { "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,2:8:22-2:10:24", - "value": null + "value": [ + { + "string": "" + } + ] } } } @@ -108,7 +116,11 @@ "value": { "double_quoted_string": { "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,4:12:49-4:14:51", - "value": null + "value": [ + { + "string": "" + } + ] } } } diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 95d0a5982..a48adc76c 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2oracle/TestMove/container_near.d2,2:10:22-2:15:27", "value": [ { - "string": "x.a.z", - "raw_string": "x.a.z" + "string": "x.a.z" } ] } diff --git a/testdata/d2oracle/TestMove/duplicate.exp.json b/testdata/d2oracle/TestMove/duplicate.exp.json index 322268428..099aaf357 100644 --- a/testdata/d2oracle/TestMove/duplicate.exp.json +++ b/testdata/d2oracle/TestMove/duplicate.exp.json @@ -100,8 +100,7 @@ "range": "d2/testdata/d2oracle/TestMove/duplicate.d2,4:9:19-4:17:27", "value": [ { - "string": "cylinder", - "raw_string": "cylinder" + "string": "cylinder" } ] } diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 735394e90..21adc5115 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_merge.d2,2:5:12-2:9:16", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } diff --git a/testdata/d2oracle/TestMove/flat_near.exp.json b/testdata/d2oracle/TestMove/flat_near.exp.json index 88af9eb39..bcefc6a77 100644 --- a/testdata/d2oracle/TestMove/flat_near.exp.json +++ b/testdata/d2oracle/TestMove/flat_near.exp.json @@ -41,8 +41,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_near.d2,0:8:8-0:11:11", "value": [ { - "string": "a.y", - "raw_string": "a.y" + "string": "a.y" } ] } 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 28401eb18..0521ffd8b 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_map_value.d2,2:9:16-2:16:23", "value": [ { - "string": "hexagon", - "raw_string": "hexagon" + "string": "hexagon" } ] } 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 5ca987152..12ba9058d 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 @@ -118,8 +118,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,6:9:62-6:16:69", "value": [ { - "string": "hexagon", - "raw_string": "hexagon" + "string": "hexagon" } ] } diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index 936069718..369217c57 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -53,8 +53,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_value.d2,1:3:5-1:7:9", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index ac3ee7326..0fc9d191c 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -127,8 +127,7 @@ "range": "d2/testdata/d2oracle/TestMove/flat_style.d2,2:16:44-2:21:49", "value": [ { - "string": "black", - "raw_string": "black" + "string": "black" } ] } diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index d4fdf0016..20eecde9f 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -144,8 +144,7 @@ "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,2:5:25-2:9:29", "value": [ { - "string": "meow", - "raw_string": "meow" + "string": "meow" } ] } @@ -182,8 +181,7 @@ "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,4:3:35-4:8:40", "value": [ { - "string": "eyy", - "raw_string": "eyy" + "string": "eyy" } ] } diff --git a/testdata/d2oracle/TestMove/include_descendants_near.exp.json b/testdata/d2oracle/TestMove/include_descendants_near.exp.json index fe66e976f..d98ded6e2 100644 --- a/testdata/d2oracle/TestMove/include_descendants_near.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_near.exp.json @@ -104,8 +104,7 @@ "range": "d2/testdata/d2oracle/TestMove/include_descendants_near.d2,3:8:21-3:13:26", "value": [ { - "string": "z.x.y", - "raw_string": "z.x.y" + "string": "z.x.y" } ] } diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json index 16780889e..561c3dc9c 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json @@ -75,8 +75,7 @@ "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.d2,1:9:13-1:15:19", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json index 354853776..553161a8f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json @@ -75,8 +75,7 @@ "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.d2,1:11:13-1:17:19", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json index 990495062..61a5f3bc9 100644 --- a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json @@ -78,8 +78,7 @@ "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,2:11:23-2:20:32", "value": [ { - "string": "sql_table", - "raw_string": "sql_table" + "string": "sql_table" } ] } @@ -111,8 +110,7 @@ "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,3:7:40-3:8:41", "value": [ { - "string": "b", - "raw_string": "b" + "string": "b" } ] } 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 409433d81..0c07d2608 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -129,8 +129,7 @@ "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,3:16:51-3:25:60", "value": [ { - "string": "#FFFFFF", - "raw_string": "#FFFFFF" + "string": "#FFFFFF" } ] } @@ -173,8 +172,7 @@ "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,4:18:79-4:27:88", "value": [ { - "string": "#FFFFFF", - "raw_string": "#FFFFFF" + "string": "#FFFFFF" } ] } diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index e5eb38532..d9bdd3d73 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -182,8 +182,7 @@ "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,10:11:68-10:15:72", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index fd11c8959..5c5b35676 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestMove/map_with_label.d2,3:5:13-3:9:17", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 26d98f1c7..037f7fab4 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -99,8 +99,7 @@ "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,2:11:22-2:15:26", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } @@ -143,8 +142,7 @@ "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,3:11:38-3:15:42", "value": [ { - "string": "hi", - "raw_string": "hi" + "string": "hi" } ] } diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index bb04cafce..6d222608e 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestMove/near.d2,1:8:13-1:11:16", "value": [ { - "string": "a.y", - "raw_string": "a.y" + "string": "a.y" } ] } diff --git a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json index 178643bd1..df689ac77 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json @@ -75,8 +75,7 @@ "range": "d2/testdata/d2oracle/TestMove/nested_reserved_2.d2,1:9:13-1:15:19", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json index 6e727d799..f5e278e7e 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json @@ -134,8 +134,7 @@ "range": "d2/testdata/d2oracle/TestMove/nested_reserved_3.d2,3:13:31-3:19:37", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index 8550114db..a1359a9fa 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -85,7 +85,11 @@ "value": { "double_quoted_string": { "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,1:3:16-1:5:18", - "value": null + "value": [ + { + "string": "" + } + ] } } } diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index ab093f083..0e5d76161 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -110,8 +110,7 @@ "range": "d2/testdata/d2oracle/TestMove/slice_style.d2,3:8:14-3:63:69", "value": [ { - "string": "https://icons.terrastruct.com/essentials/142-target.svg", - "raw_string": "https://icons.terrastruct.com/essentials/142-target.svg" + "string": "https://icons.terrastruct.com/essentials/142-target.svg" } ] } diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index 914e4dc1b..3094f38ca 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,3:5:13-3:9:17", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } @@ -110,8 +109,7 @@ "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,4:5:23-4:11:29", "value": [ { - "string": "what", - "raw_string": "what" + "string": "what" } ] } diff --git a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json index 02ecdaa4f..cef57ffe1 100644 --- a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json @@ -177,8 +177,7 @@ "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:26:37-3:29:40", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json index aef393151..743197677 100644 --- a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json @@ -154,8 +154,7 @@ "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:26:35-2:29:38", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json index 5f52b761f..0d0d769c3 100644 --- a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,1:16:26-1:20:30", "value": [ { - "string": "blue", - "raw_string": "blue" + "string": "blue" } ] } @@ -184,8 +183,7 @@ "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,4:16:59-4:19:62", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 1d4593223..b467fb1be 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -437,8 +437,7 @@ "range": "d2/testdata/d2oracle/TestRename/container.d2,3:5:108-3:10:113", "value": [ { - "string": "label", - "raw_string": "label" + "string": "label" } ] } @@ -617,8 +616,7 @@ "range": "d2/testdata/d2oracle/TestRename/container.d2,10:30:181-10:45:196", "value": [ { - "string": "furbling, v.:", - "raw_string": "furbling, v.:" + "string": "furbling, v.:" } ] } @@ -722,8 +720,7 @@ "range": "d2/testdata/d2oracle/TestRename/container.d2,11:22:219-11:37:234", "value": [ { - "string": "furbling, v.:", - "raw_string": "furbling, v.:" + "string": "furbling, v.:" } ] } diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 6e5ab0650..21f125199 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -382,8 +382,7 @@ "range": "d2/testdata/d2oracle/TestRename/edges.d2,3:7:66-3:12:71", "value": [ { - "string": "label", - "raw_string": "label" + "string": "label" } ] } diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 7c7ddf563..e1cf9bfb6 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestRename/near.d2,1:8:13-1:9:14", "value": [ { - "string": "z", - "raw_string": "z" + "string": "z" } ] } diff --git a/testdata/d2oracle/TestSet/classes-style.exp.json b/testdata/d2oracle/TestSet/classes-style.exp.json index a99073d1f..a7a808ade 100644 --- a/testdata/d2oracle/TestSet/classes-style.exp.json +++ b/testdata/d2oracle/TestSet/classes-style.exp.json @@ -89,8 +89,7 @@ "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,2:16:34-2:19:37", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -143,8 +142,7 @@ "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,5:9:53-5:10:54", "value": [ { - "string": "a", - "raw_string": "a" + "string": "a" } ] } @@ -198,8 +196,7 @@ "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,6:14:69-6:19:74", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } diff --git a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json index 9c74249a8..ec26cc69e 100644 --- a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json @@ -89,8 +89,7 @@ "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,2:16:34-2:19:37", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -143,8 +142,7 @@ "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,5:9:53-5:10:54", "value": [ { - "string": "a", - "raw_string": "a" + "string": "a" } ] } @@ -198,8 +196,7 @@ "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,6:14:69-6:19:74", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index f9568af91..1da9d1df9 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -53,8 +53,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:8:8-0:11:11", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index e36df946d..88c2c9847 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -114,8 +114,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:15:23-1:19:27", "value": [ { - "string": "wsup", - "raw_string": "wsup" + "string": "wsup" } ] } @@ -175,8 +174,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:15:43-2:62:90", "value": [ { - "string": "QOTD:\n \"It's been Monday all week today.\"", - "raw_string": "QOTD:\\n \\\"It's been Monday all week today.\\\"" + "string": "QOTD:\n \"It's been Monday all week today.\"" } ] } diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 3bd0f42a8..f39d6e68e 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -114,8 +114,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:15:23-1:19:27", "value": [ { - "string": "wsup", - "raw_string": "wsup" + "string": "wsup" } ] } diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json index fe8208050..d6b04d13d 100644 --- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json @@ -168,8 +168,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:36:48-1:42:54", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index d1eb8f9c3..8ae066c10 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:22:32-1:25:35", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index 1abf22a57..a18a8da4d 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:10:18-1:14:22", "value": [ { - "string": "QOTD", - "raw_string": "QOTD" + "string": "QOTD" } ] } diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json index e647ebf85..f7ffe8821 100644 --- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json @@ -130,8 +130,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,3:11:56-3:18:63", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 64f975592..53237d909 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -77,8 +77,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:10:18-1:12:20", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json index 88538296c..c9064aac6 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:33:33-0:40:40", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json index 7b3b4168a..a852056d4 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json @@ -131,8 +131,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:36:43-1:43:50", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json index 4a3477968..f34c30d72 100644 --- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:33:33-0:40:40", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index ab79c0a72..08156af78 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/icon.d2,0:13:13-0:66:66", "value": [ { - "string": "https://icons.terrastruct.com/essentials/087-menu.svg", - "raw_string": "https://icons.terrastruct.com/essentials/087-menu.svg" + "string": "https://icons.terrastruct.com/essentials/087-menu.svg" } ] } diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index 032b0654e..f66fd2cda 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -105,8 +105,7 @@ "range": "d2/testdata/d2oracle/TestSet/inline_style.d2,2:14:45-2:17:48", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index b091d0d7e..601a69cfe 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2oracle/TestSet/label.d2,0:8:8-0:87:87", "value": [ { - "string": "Always try to do things in chronological order; it's less confusing that way.", - "raw_string": "Always try to do things in chronological order; it's less confusing that way." + "string": "Always try to do things in chronological order; it's less confusing that way." } ] } diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 976aa222f..57815ab6f 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2oracle/TestSet/label_replace.d2,0:8:8-0:87:87", "value": [ { - "string": "Always try to do things in chronological order; it's less confusing that way.", - "raw_string": "Always try to do things in chronological order; it's less confusing that way." + "string": "Always try to do things in chronological order; it's less confusing that way." } ] } diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index e26a74490..3fa422118 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -76,8 +76,7 @@ "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:11:11-0:82:82", "value": [ { - "string": "Never offend people with style when you can offend them with substance.", - "raw_string": "Never offend people with style when you can offend them with substance." + "string": "Never offend people with style when you can offend them with substance." } ] } diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index 97bb445e0..46c65b1e3 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,1:9:17-1:11:19", "value": [ { - "string": "do", - "raw_string": "do" + "string": "do" } ] } @@ -110,8 +109,7 @@ "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:16:36-2:20:40", "value": [ { - "string": "asdf", - "raw_string": "asdf" + "string": "asdf" } ] } @@ -143,8 +141,7 @@ "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,3:8:49-3:158:199", "value": [ { - "string": "How much of their influence on you is a result of your influence on them?\nA conference is a gathering of important people who singly can do nothing", - "raw_string": "How much of their influence on you is a result of your influence on them?\\nA conference is a gathering of important people who singly can do nothing" + "string": "How much of their influence on you is a result of your influence on them?\nA conference is a gathering of important people who singly can do nothing" } ] } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json index 9870e4e34..ae74ac3ba 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,1:26:36-1:32:42", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json index 2c26e580a..5b4e8547a 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json @@ -101,8 +101,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,2:11:43-2:17:49", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json index e85fb417b..ed61d736f 100644 --- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json @@ -65,8 +65,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_fill_pattern.d2,1:22:32-1:27:37", "value": [ { - "string": "grain", - "raw_string": "grain" + "string": "grain" } ] } diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json index e6ac31625..b8e5e01e0 100644 --- a/testdata/d2oracle/TestSet/replace_link.exp.json +++ b/testdata/d2oracle/TestSet/replace_link.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_link.d2,1:8:18-1:25:35", "value": [ { - "string": "https://apple.com", - "raw_string": "https://apple.com" + "string": "https://apple.com" } ] } diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index 9fa391b04..7d3024894 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -41,8 +41,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_shape.d2,0:14:14-0:20:20", "value": [ { - "string": "circle", - "raw_string": "circle" + "string": "circle" } ] } diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 197c9461b..66bbecebf 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -52,8 +52,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_style_edgecase.d2,0:19:19-0:25:25", "value": [ { - "string": "orange", - "raw_string": "orange" + "string": "orange" } ] } diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json index c1490dc89..18a8a85a6 100644 --- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/replace_tooltip.d2,1:11:21-1:12:22", "value": [ { - "string": "y", - "raw_string": "y" + "string": "y" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json index 168961d59..e25834dfd 100644 --- a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json @@ -88,8 +88,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,1:26:36-1:34:44", "value": [ { - "string": "triangle", - "raw_string": "triangle" + "string": "triangle" } ] } @@ -283,8 +282,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,8:30:124-8:37:131", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } @@ -869,8 +867,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,8:30:124-8:37:131", "value": [ { - "string": "diamond", - "raw_string": "diamond" + "string": "diamond" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json index 9dd6fd8f1..e6e289764 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json @@ -170,8 +170,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:7:62-7:8:63", "value": [ { - "string": "b", - "raw_string": "b" + "string": "b" } ] } @@ -295,8 +294,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:7:62-7:8:63", "value": [ { - "string": "b", - "raw_string": "b" + "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 10d0c34ab..b7d308ac2 100644 --- a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,1:5:10-1:10:15", "value": [ { - "string": "outer", - "raw_string": "outer" + "string": "outer" } ] } diff --git a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json index 446504d3b..d51f5db66 100644 --- a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json @@ -30,8 +30,7 @@ "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,0:3:3-0:8:8", "value": [ { - "string": "outer", - "raw_string": "outer" + "string": "outer" } ] } diff --git a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json index 476a81bc1..5552199b8 100644 --- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json @@ -65,8 +65,7 @@ "range": "d2/testdata/d2oracle/TestSet/set_fill_pattern.d2,0:29:29-0:34:34", "value": [ { - "string": "grain", - "raw_string": "grain" + "string": "grain" } ] } diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json index a832f994d..e08e95d17 100644 --- a/testdata/d2oracle/TestSet/set_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/set_tooltip.d2,0:18:18-0:19:19", "value": [ { - "string": "y", - "raw_string": "y" + "string": "y" } ] } diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index bd4bedb40..fc4a57469 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -54,8 +54,7 @@ "range": "d2/testdata/d2oracle/TestSet/shape.d2,0:16:16-0:22:22", "value": [ { - "string": "square", - "raw_string": "square" + "string": "square" } ] } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json index fce9058ea..ef7596fba 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json @@ -89,8 +89,7 @@ "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,2:16:34-2:19:37", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -167,8 +166,7 @@ "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,5:16:60-5:21:65", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json index b7ac7a166..971db84a9 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json @@ -89,8 +89,7 @@ "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,2:16:34-2:19:37", "value": [ { - "string": "red", - "raw_string": "red" + "string": "red" } ] } @@ -154,8 +153,7 @@ "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,5:14:58-5:19:63", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] }