cosmetic changes

test/corpus/container.txt

@@ -0,0 +1,76 @@
+================================================================================
+Declare a shape inside a container
+================================================================================
+foo.baz
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (shape_key) (dot) (shape_key)
+)
+
+================================================================================
+Use quoted string as a shape key
+================================================================================
+'foo'.'baz'
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (shape_key (string)) (dot) (shape_key (string))
+)
+
+================================================================================
+Declare container inside a container using block
+================================================================================
+
+foo: {
+  bar: {
+    baz: {
+      biz
+    }
+  }
+}
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (shape_key)
+  (block
+    (shape_key)
+    (block
+      (shape_key)
+      (block
+        (shape_key)
+      )
+    )
+  )
+)
+
+================================================================================
+Declare labaled container inside a labeled container using block
+================================================================================
+
+foo: Foo {
+  bar: Bar {
+    baz: Baz {
+      biz: Biz
+    }
+  }
+}
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (shape_key) (label)
+  (block
+    (shape_key) (label)
+    (block
+      (shape_key) (label)
+      (block
+        (shape_key) (label)
+      )
+    )
+  )
+)
+

test/corpus/shape.txt

@@ -1,5 +1,5 @@
 ================================================================================
-Simple shape
+Simple shape key
 ================================================================================
 foo
 bar
@@ -12,7 +12,7 @@ bar
 )
 
 ================================================================================
-Complex identifier
+Complex shape key
 ================================================================================
  Foo bar 
 -Biz-baz-
@@ -24,26 +24,15 @@ Complex identifier
   (shape_key)
 )
 
-================================================================================
-Declare a shape inside a container
-================================================================================
-foo.baz
-
---------------------------------------------------------------------------------
-
-(source_file
-  (shape_key) (dot) (shape_key)
-)
-
 ================================================================================
 Use quoted string as a shape key
 ================================================================================
-'foo'.'baz'
+'foo'
 
 --------------------------------------------------------------------------------
 
 (source_file
-  (shape_key (string)) (dot) (shape_key (string))
+  (shape_key (string))
 )
 
 ================================================================================
@@ -60,7 +49,7 @@ a;b;c
 )
 
 ================================================================================
-Aliased shapes
+Labeled shapes
 ================================================================================
 a: Foo Bar
 a: Foo Bar; b: Biz Baz

test/highlight/shape.d2

@@ -1,7 +1,11 @@
-foo.baz.biz
+foo.'baz'.biz
 # <- variable
-#   ^ variable
+#   ^ string
-#       ^ variable
+#         ^ variable
+
+'biz': 'Baz'
+# <- string
+#      ^ string
 
 foo: Foo Bar
 # <- variable