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

Merge pull request #1317 from alixander/underscore-fix-sadkfl

Browse source 
d2oracle: fix underscore
This commit is contained in:
Alexander Wang 2023-05-10 16:33:09 -07:00 committed by GitHub
commit 5ec98a361a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 289 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
d2oracle/edit.go
View file

@ -1543,7 +1543,14 @@ func move(g *d2graph.Graph, key, newKey string, includeDescendants bool) (*d2gra
continue continue
} }
firstNonUnderscoreIndex := 0
ida := d2graph.Key(ref.Key) ida := d2graph.Key(ref.Key)
for i, id := range ida {
if id != "_" {
firstNonUnderscoreIndex = i
break
}
}
resolvedObj, resolvedIDA, err := d2graph.ResolveUnderscoreKey(ida, ref.ScopeObj) resolvedObj, resolvedIDA, err := d2graph.ResolveUnderscoreKey(ida, ref.ScopeObj)
if err != nil { if err != nil {
return nil, err return nil, err
@ -1568,7 +1575,7 @@ func move(g *d2graph.Graph, key, newKey string, includeDescendants bool) (*d2gra
// 4. Slice. // 4. Slice.
// -- The key is moving from its current scope out to a less nested scope // -- The key is moving from its current scope out to a less nested scope
if isCrossScope { if isCrossScope {
if (!includeDescendants && len(ida) == 1) || (includeDescendants && ref.KeyPathIndex == 0) { if (!includeDescendants && len(ida) == 1) || (includeDescendants && ref.KeyPathIndex == firstNonUnderscoreIndex) {
// 1. Transplant // 1. Transplant
absKey, err := d2parser.ParseKey(ref.ScopeObj.AbsID()) absKey, err := d2parser.ParseKey(ref.ScopeObj.AbsID())
if err != nil { if err != nil {

15
d2oracle/edit_test.go
View file

@ -4342,6 +4342,21 @@ a
exp: `x: { exp: `x: {
a a
} }
`,
},
{
name: "include_descendants_underscore_regression_2",
text: `x: {
_.a.b
}
`,
key: `a`,
newKey: `x.a`,
includeDescendants: true,
exp: `x: {
a.b
}
`, `,
}, },
} }

266
testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json generated vendored Normal file
View file

@ -0,0 +1,266 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,0:0:0-3:0:13",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,0:0:0-2:1:12",
"key": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,0:0:0-0:1:1",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,0:3:3-2:0:11",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,1:2:7-1:5:10",
"key": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,1:2:7-1:5:10",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,1:2:7-1:3:8",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,1:4:9-1:5:10",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"primary": {},
"value": {}
}
}
]
}
}
}
}
]
},
"root": {
"id": "",
"id_val": "",
"attributes": {
"label": {
"value": ""
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": {
"value": ""
}
},
"zIndex": 0
},
"edges": null,
"objects": [
{
"id": "x",
"id_val": "x",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,0:0:0-0:1:1",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "x"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": {
"value": ""
}
},
"zIndex": 0
},
{
"id": "a",
"id_val": "a",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,1:2:7-1:5:10",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,1:2:7-1:3:8",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,1:4:9-1:5:10",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "a"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": {
"value": ""
}
},
"zIndex": 0
},
{
"id": "b",
"id_val": "b",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,1:2:7-1:5:10",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,1:2:7-1:3:8",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.d2,1:4:9-1:5:10",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"key_path_index": 1,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "b"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": {
"value": ""
}
},
"zIndex": 0
}
]
},
"err": "<nil>"
}