From 2bbaf1223c5ca115d67ea3db441f5cd5c6cf7690 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 24 May 2023 16:17:31 -0700 Subject: [PATCH] simplify --- d2oracle/edit.go | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/d2oracle/edit.go b/d2oracle/edit.go index c2b8cccd9..a657a3d90 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -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 }