Put the KVPs of identifiers and properties fields of resource shapes …

…on their own lines
smithy-lang · Aug 23, 2024 · 0f64ac5 · 0f64ac5
1 parent 120849b
commit 0f64ac5
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 5 deletions.
diff --git a/smithy-syntax/src/main/java/software/amazon/smithy/syntax/FormatVisitor.java b/smithy-syntax/src/main/java/software/amazon/smithy/syntax/FormatVisitor.java
@@ -769,6 +769,8 @@ public Doc apply(TreeCursor c) {
                 case "collectionOperations":
                 case "errors":
                     return formatNodeObjectKvp(c, FormatVisitor.this::visit, hardLineList);
+                case "identifiers":
+                case "properties":
                 case "rename":
                     return formatNodeObjectKvp(c, FormatVisitor.this::visit, hardLineObject);
                 default:

diff --git a/...sources/software/amazon/smithy/syntax/formatter/entity-shapes-line-break.formatted.smithy b/...sources/software/amazon/smithy/syntax/formatter/entity-shapes-line-break.formatted.smithy
@@ -30,7 +30,16 @@ operation GetTime2 {
 
 @http(method: "X", uri: "/foo", code: 200)
 resource Sprocket2 {
-    identifiers: { username: String, id: String, otherId: String }
+    identifiers: {
+        username: String
+        id: String
+        otherId: String
+    }
+    properties: {
+        foo: String
+        bar: Integer
+        fizz: String
+    }
 }
 
 @error("client")

diff --git a/...rc/test/resources/software/amazon/smithy/syntax/formatter/entity-shapes-line-break.smithy b/...rc/test/resources/software/amazon/smithy/syntax/formatter/entity-shapes-line-break.smithy
@@ -24,7 +24,10 @@ operation GetTime2 {
 
 @http(method: "X", uri: "/foo", code: 200)
 resource Sprocket2 {
-    identifiers: {username: String, id: String, otherId: String}
+    identifiers: {username: String, id: String
+                  otherId: String}
+    properties: {foo: String,bar: Integer
+                 fizz: String }
 }
 
 @error("client")

diff --git a/...hy-syntax/src/test/resources/software/amazon/smithy/syntax/formatter/entity-shapes.smithy b/...hy-syntax/src/test/resources/software/amazon/smithy/syntax/formatter/entity-shapes.smithy
@@ -33,12 +33,22 @@ operation GetTime2 {
 }
 
 resource Sprocket1 {
-    identifiers: { username: String }
+    identifiers: {
+        username: String
+    }
+    properties: {
+        foo: String
+        bar: Integer
+    }
 }
 
 @http(method: "X", uri: "/foo", code: 200)
 resource Sprocket2 {
-    identifiers: { username: String, id: String, otherId: String }
+    identifiers: {
+        username: String
+        id: String
+        otherId: String
+    }
     collectionOperations: [
         SomeOperation
     ]
@@ -54,7 +64,13 @@ structure SomeOperationFoo {}
 
 @http(method: "X", uri: "/foo3", code: 200)
 resource Sprocket3 {
-    identifiers: { username: String, id: String, otherId: String }
+    identifiers: {
+        username: String
+        id: String
+        otherId: String
+    }
+    // It's empty, so on a single line.
+    properties: {}
     // It's empty, so on a single line.
     collectionOperations: []
 }