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

fix revert

Browse source
This commit is contained in:
Alexander Wang 2025-03-03 20:33:37 -07:00
parent 091c7a4585
commit 27d60d9e7d
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
d2compiler/compile_test.go
View file

@ -5433,6 +5433,17 @@ b -> c
assert.Equal(t, "red", g.Edges[0].Style.Stroke.Value) assert.Equal(t, "red", g.Edges[0].Style.Stroke.Value)
}, },
}, },
{
name: "merge-glob-values",
run: func(t *testing.T) {
assertCompile(t, `
"a"
*.style.stroke-width: 2
*.style.font-size: 14
a.width: 339
`, ``)
},
},
{ {
name: "mixed-edge-quoting", name: "mixed-edge-quoting",
run: func(t *testing.T) { run: func(t *testing.T) {

18
testdata/d2compiler/TestCompile2/globs/merge-glob-values.exp.json generated vendored
View file

@ -3,7 +3,7 @@
"name": "", "name": "",
"isFolderOnly": false, "isFolderOnly": false,
"ast": { "ast": {
"range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,0:0:0-6:0:65", "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,0:0:0-5:0:64",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -138,13 +138,13 @@
}, },
{ {
"map_key": { "map_key": {
"range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,5:0:52-5:12:64", "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:0:51-4:12:63",
"key": { "key": {
"range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,5:0:52-5:7:59", "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:0:51-4:7:58",
"path": [ "path": [
{ {
"unquoted_string": { "unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,5:0:52-5:1:53", "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:0:51-4:1:52",
"value": [ "value": [
{ {
"string": "a", "string": "a",
@ -155,7 +155,7 @@
}, },
{ {
"unquoted_string": { "unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,5:2:54-5:7:59", "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:2:53-4:7:58",
"value": [ "value": [
{ {
"string": "width", "string": "width",
@ -169,7 +169,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"number": { "number": {
"range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,5:9:61-5:12:64", "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:9:60-4:12:63",
"raw": "339", "raw": "339",
"value": "339" "value": "339"
} }
@ -229,11 +229,11 @@
}, },
{ {
"key": { "key": {
"range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,5:0:52-5:7:59", "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:0:51-4:7:58",
"path": [ "path": [
{ {
"unquoted_string": { "unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,5:0:52-5:1:53", "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:0:51-4:1:52",
"value": [ "value": [
{ {
"string": "a", "string": "a",
@ -244,7 +244,7 @@
}, },
{ {
"unquoted_string": { "unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,5:2:54-5:7:59", "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:2:53-4:7:58",
"value": [ "value": [
{ {
"string": "width", "string": "width",