Implement Feedback

aws · Jul 13, 2021 · a87ef15 · a87ef15
1 parent d432977
commit a87ef15
Show file tree

Hide file tree

Showing 24 changed files with 1,100 additions and 616 deletions.
diff --git a/...gen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/CodegenVisitor.java b/...gen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/CodegenVisitor.java
@@ -39,7 +39,6 @@
 import software.amazon.smithy.model.knowledge.ServiceIndex;
 import software.amazon.smithy.model.knowledge.TopDownIndex;
 import software.amazon.smithy.model.neighbor.Walker;
-import software.amazon.smithy.model.shapes.DocumentShape;
 import software.amazon.smithy.model.shapes.OperationShape;
 import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.model.shapes.Shape;
@@ -168,8 +167,8 @@ void execute() {
             shape.accept(this);
         }
 
-        // Generate standard DocumentShape interface
-        protocolDocumentGenerator.generateStandardTypes();
+        // Generate any required types and functions need to support protocol documents.
+        protocolDocumentGenerator.generateDocumentSupport();
 
         // Generate a struct to handle unknown tags in unions
         List<UnionShape> unions = serviceShapes.stream()
@@ -235,12 +234,6 @@ protected Void getDefault(Shape shape) {
         return null;
     }
 
-    @Override
-    public Void documentShape(DocumentShape shape) {
-        protocolDocumentGenerator.addDocumentShape(shape);
-        return null;
-    }
-
     @Override
     public Void structureShape(StructureShape shape) {
         if (shape.getId().getNamespace().equals(CodegenUtils.getSyntheticTypeNamespace())) {

diff --git a/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/GoWriter.java b/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/GoWriter.java
@@ -256,6 +256,20 @@ public GoWriter writePackageDocs(String docs) {
         return this;
     }
 
+    /**
+     * Writes the doc to the Go package docs that are written prior to the go package statement. This does not perform
+     * line wrapping and the provided formatting must be valid Go doc.
+     *
+     * @param docs documentation to write to package doc.
+     * @return writer
+     */
+    public GoWriter writeRawPackageDocs(String docs) {
+        writeDocs(packageDocs, () -> {
+            packageDocs.write(docs);
+        });
+        return this;
+    }
+
     /**
      * Writes shape documentation comments if docs are present.
      *