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

simplify

Browse source
This commit is contained in:
Alexander Wang 2023-05-24 16:17:31 -07:00
parent 877ff5d9f2
commit 2bbaf1223c
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
d2oracle/edit.go
View file

@ -1629,12 +1629,7 @@ func move(g *d2graph.Graph, key, newKey string, includeDescendants bool) (*d2gra
return nil, err
}
resolvedObj, ok := resolvedParent.HasChild(resolvedScopeKey)
if !ok {
return nil, errors.New("underscore key does not exist")
}
newPath, err := pathFromScopeKey(g, &d2ast.Key{Key: d2ast.MakeKeyPath(resolvedObj.AbsIDArray())}, ak2)
newPath, err := pathFromScopeKey(g, &d2ast.Key{Key: d2ast.MakeKeyPath(append(resolvedParent.AbsIDArray(), resolvedScopeKey...))}, ak2)
if err != nil {
return nil, err
}
@ -1648,11 +1643,7 @@ func move(g *d2graph.Graph, key, newKey string, includeDescendants bool) (*d2gra
return nil, err
}
resolvedObj, ok := resolvedParent.HasChild(resolvedScopeKey)
if !ok {
return nil, errors.New("underscore key does not exist")
}
newPath, err := pathFromScopeKey(g, &d2ast.Key{Key: d2ast.MakeKeyPath(resolvedObj.AbsIDArray())}, ak2)
newPath, err := pathFromScopeKey(g, &d2ast.Key{Key: d2ast.MakeKeyPath(append(resolvedParent.AbsIDArray(), resolvedScopeKey...))}, ak2)
if err != nil {
return nil, err
}
@ -1664,11 +1655,7 @@ func move(g *d2graph.Graph, key, newKey string, includeDescendants bool) (*d2gra
return nil, err
}
resolvedObj, ok := resolvedParent.HasChild(resolvedScopeKey)
if !ok {
return nil, errors.New("underscore key does not exist")
}
newPath, err := pathFromScopeKey(g, &d2ast.Key{Key: d2ast.MakeKeyPath(resolvedObj.AbsIDArray())}, ak2)
newPath, err := pathFromScopeKey(g, &d2ast.Key{Key: d2ast.MakeKeyPath(append(resolvedParent.AbsIDArray(), resolvedScopeKey...))}, ak2)
if err != nil {
return nil, err
}