Merge pull request #2418 from alixander/unsuspend-label

`suspend` fixes

Author: alixander

d2compiler/compile_test.go

@@ -5617,6 +5617,44 @@ d -> d: "suspend"
 				assert.Equal(t, 1, len(g.Edges))
 			},
 		},
+		{
+			name: "unsuspend-edge-label",
+			run: func(t *testing.T) {
+				g, _ := assertCompile(t, `
+a -> b: hello
+c
+**: suspend
+(** -> **)[*]: suspend
+
+(* -> *)[*]: unsuspend
+`, ``)
+				assert.Equal(t, 2, len(g.Objects))
+				assert.Equal(t, 1, len(g.Edges))
+				assert.Equal(t, "hello", g.Edges[0].Label.Value)
+			},
+		},
+		{
+			name: "unsuspend-shape-label",
+			run: func(t *testing.T) {
+				g, _ := assertCompile(t, `
+a: hello
+*: suspend
+*: unsuspend
+`, ``)
+				assert.Equal(t, 1, len(g.Objects))
+				assert.Equal(t, "hello", g.Objects[0].Label.Value)
+			},
+		},
+		{
+			name: "suspend-shape",
+			run: func(t *testing.T) {
+				g, _ := assertCompile(t, `
+a: hello
+*: suspend
+`, ``)
+				assert.Equal(t, 0, len(g.Objects))
+			},
+		},
 		{
 			name: "edge-glob-ampersand-filter/1",
 			run: func(t *testing.T) {

d2ir/compile.go

@@ -1275,10 +1275,26 @@ func (c *compiler) _compileEdges(refctx *RefContext) {
 
 				if refctx.Key.Primary.Suspension != nil || refctx.Key.Value.Suspension != nil {
 					if !c.lazyGlobBeingApplied {
+						var suspensionValue bool
 						if refctx.Key.Primary.Suspension != nil {
-							e.suspended = refctx.Key.Primary.Suspension.Value
+							suspensionValue = refctx.Key.Primary.Suspension.Value
 						} else {
-							e.suspended = refctx.Key.Value.Suspension.Value
+							suspensionValue = refctx.Key.Value.Suspension.Value
+						}
+						e.suspended = suspensionValue
+
+						// If we're unsuspending an edge, we should also unsuspend its src and dst objects
+						if !suspensionValue {
+							srcPath, dstPath := e.ID.SrcPath, e.ID.DstPath
+							srcObj := refctx.ScopeMap.GetField(srcPath...)
+							dstObj := refctx.ScopeMap.GetField(dstPath...)
+
+							if srcObj != nil {
+								srcObj.suspended = false
+							}
+							if dstObj != nil {
+								dstObj.suspended = false
+							}
 						}
 					}
 				}
@@ -1309,7 +1325,7 @@ func (c *compiler) _compileEdges(refctx *RefContext) {
 				}
 				c.compileField(e.Map_, refctx.Key.EdgeKey, refctx)
 			} else {
-				if refctx.Key.Primary.Unbox() != nil {
+				if refctx.Key.Primary.Unbox() != nil && refctx.Key.Primary.Suspension == nil {
 					if c.ignoreLazyGlob(e) {
 						return
 					}
@@ -1330,7 +1346,7 @@ func (c *compiler) _compileEdges(refctx *RefContext) {
 					c.mapRefContextStack = append(c.mapRefContextStack, refctx)
 					c.compileMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST)
 					c.mapRefContextStack = c.mapRefContextStack[:len(c.mapRefContextStack)-1]
-				} else if refctx.Key.Value.ScalarBox().Unbox() != nil {
+				} else if refctx.Key.Value.ScalarBox().Unbox() != nil && refctx.Key.Value.Suspension == nil {
 					if c.ignoreLazyGlob(e) {
 						return
 					}

d2ir/d2ir.go

@@ -650,7 +650,41 @@ func (rc *RefContext) EdgeIndex() int {
 func (rc *RefContext) Equal(rc2 *RefContext) bool {
 	// We intentionally ignore edges here because the same glob can produce multiple RefContexts that should be treated  the same with only the edge as the difference.
 	// Same with ScopeMap.
-	return rc.Key.Equals(rc2.Key) && rc.Scope == rc2.Scope && rc.ScopeAST == rc2.ScopeAST
+	if !(rc.Key.Equals(rc2.Key) && rc.Scope == rc2.Scope && rc.ScopeAST == rc2.ScopeAST) {
+		return false
+	}
+
+	// Check if suspension values match for suspension operations
+	// We don't want these two to equal
+	// 1. *: suspend
+	// 2. *: unsuspend
+	hasSuspension1 := (rc.Key.Primary.Suspension != nil || rc.Key.Value.Suspension != nil)
+	hasSuspension2 := (rc2.Key.Primary.Suspension != nil || rc2.Key.Value.Suspension != nil)
+
+	if hasSuspension1 || hasSuspension2 {
+		var val1, val2 bool
+		if rc.Key.Primary.Suspension != nil {
+			val1 = rc.Key.Primary.Suspension.Value
+		} else if rc.Key.Value.Suspension != nil {
+			val1 = rc.Key.Value.Suspension.Value
+		}
+
+		if rc2.Key.Primary.Suspension != nil {
+			val2 = rc2.Key.Primary.Suspension.Value
+		} else if rc2.Key.Value.Suspension != nil {
+			val2 = rc2.Key.Value.Suspension.Value
+		}
+
+		if hasSuspension1 && hasSuspension2 && val1 != val2 {
+			return false
+		}
+
+		if hasSuspension1 != hasSuspension2 {
+			return false
+		}
+	}
+
+	return true
 }
 
 func (m *Map) FieldCountRecursive() int {