From 344718dad309f3b21fdbef98f72944d89bb4b2ff Mon Sep 17 00:00:00 2001
From: OneRain2333 <onerain233@outlook.com>
Date: Sat, 31 Dec 2022 15:33:16 +0800
Subject: [PATCH] Remove double circle shape

---
 d2compiler/compile.go      |  2 +-
 d2graph/d2graph.go         |  4 ++--
 d2renderers/d2svg/d2svg.go | 14 --------------
 d2target/d2target.go       |  2 --
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/d2compiler/compile.go b/d2compiler/compile.go
index 5c370c204..73ad8bad1 100644
--- a/d2compiler/compile.go
+++ b/d2compiler/compile.go
@@ -806,7 +806,7 @@ func (c *compiler) validateKey(obj *d2graph.Object, m *d2ast.Map, mk *d2ast.Key)
 		if reserved == "" {
 			c.errorf(mk.Range.Start, mk.Range.End, "image shapes cannot have children.")
 		}
-	case d2target.ShapeCircle, d2target.ShapeSquare, d2target.ShapeDoubleCircle:
+	case d2target.ShapeCircle, d2target.ShapeSquare:
 		checkEqual := (reserved == "width" && obj.Attributes.Height != nil) ||
 			(reserved == "height" && obj.Attributes.Width != nil)
 
diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go
index 334d70595..800c7c43e 100644
--- a/d2graph/d2graph.go
+++ b/d2graph/d2graph.go
@@ -363,7 +363,7 @@ func (obj *Object) GetFill(theme *d2themes.Theme) string {
 
 	shape := obj.Attributes.Shape.Value
 
-	if shape == "" || strings.EqualFold(shape, d2target.ShapeSquare) || strings.EqualFold(shape, d2target.ShapeCircle) || strings.EqualFold(shape, d2target.ShapeDoubleCircle) || strings.EqualFold(shape, d2target.ShapeOval) || strings.EqualFold(shape, d2target.ShapeRectangle) {
+	if shape == "" || strings.EqualFold(shape, d2target.ShapeSquare) || strings.EqualFold(shape, d2target.ShapeCircle) || strings.EqualFold(shape, d2target.ShapeOval) || strings.EqualFold(shape, d2target.ShapeRectangle) {
 		if level == 1 {
 			if !obj.IsContainer() {
 				return theme.Colors.B6
@@ -1148,7 +1148,7 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
 		paddingX, paddingY := obj.GetPadding()
 
 		switch shapeType {
-		case d2target.ShapeSquare, d2target.ShapeCircle, d2target.ShapeDoubleCircle:
+		case d2target.ShapeSquare, d2target.ShapeCircle:
 			if desiredWidth != 0 || desiredHeight != 0 {
 				paddingX = 0.
 				paddingY = 0.
diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
index f2536fe84..ce16d6207 100644
--- a/d2renderers/d2svg/d2svg.go
+++ b/d2renderers/d2svg/d2svg.go
@@ -791,20 +791,6 @@ func drawShape(writer io.Writer, targetShape d2target.Shape, sketchRunner *d2ske
 				fmt.Fprint(writer, renderDoubleOval(tl, width, height, style))
 			}
 		}
-	// case d2target.ShapeDoubleCircle:
-	// 	if targetShape.Multiple {
-	// 		fmt.Fprint(writer, renderDoubleCircle(multipleTL, width, height, style))
-	// 	}
-	// 	if sketchRunner != nil {
-	// 		out, err := d2sketch.DoubleOval(sketchRunner, targetShape)
-	// 		if err != nil {
-	// 			return "", err
-	// 		}
-	// 		fmt.Fprintf(writer, out)
-	// 	} else {
-	// 		fmt.Fprint(writer, renderDoubleCircle(tl, width, height, style))
-	// 	}
-
 	case d2target.ShapeImage:
 		fmt.Fprintf(writer, `<image href="%s" x="%d" y="%d" width="%d" height="%d" style="%s" />`,
 			html.EscapeString(targetShape.Icon.String()),
diff --git a/d2target/d2target.go b/d2target/d2target.go
index 75113ec90..831a817dc 100644
--- a/d2target/d2target.go
+++ b/d2target/d2target.go
@@ -428,7 +428,6 @@ const (
 	ShapeSQLTable        = "sql_table"
 	ShapeImage           = "image"
 	ShapeSequenceDiagram = "sequence_diagram"
-	ShapeDoubleCircle    = "double_circle"
 )
 
 var Shapes = []string{
@@ -455,7 +454,6 @@ var Shapes = []string{
 	ShapeSQLTable,
 	ShapeImage,
 	ShapeSequenceDiagram,
-	ShapeDoubleCircle,
 }
 
 func IsShape(s string) bool {