Fix writeInline onSection bug

We were not writing intercepted sections that did not contain newlines.
smithy-lang · Oct 31, 2020 · 7512f16 · 7512f16
1 parent 14b004d
commit 7512f16
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 34 deletions.
diff --git a/...egen-core/src/test/java/software/amazon/smithy/codegen/core/writer/CodegenWriterTest.java b/...egen-core/src/test/java/software/amazon/smithy/codegen/core/writer/CodegenWriterTest.java
@@ -113,34 +113,4 @@ public void importsUseReferencesFromSymbols() {
         assertThat(writer.getImportContainer().imports, hasKey("MyString"));
         assertThat(writer.getImportContainer().imports.get("MyString"), equalTo("java.lang.String"));
     }
-
-    @Test
-    public void sectionWithWrite() {
-        String testSection = "TEST_SECTION";
-        MyWriter writer = new MyWriter("foo");
-
-        writer.onSection(testSection, text -> {
-            writer.write(text + "addition");
-        });
-
-        writer.pushState(testSection);
-        writer.popState();
-
-        assertThat(writer.toString(), equalTo("addition\n"));
-    }
-
-    @Test
-    public void sectionWithWriteInline() {
-        String testSection = "TEST_SECTION";
-        MyWriter writer = new MyWriter("foo");
-
-        writer.onSection(testSection, text -> {
-            writer.writeInline(text + "inline addition");
-        });
-
-        writer.pushState(testSection);
-        writer.popState();
-
-        assertThat(writer.toString(), equalTo("inline addition\n"));
-    }
 }
diff --git a/smithy-utils/src/main/java/software/amazon/smithy/utils/CodeWriter.java b/smithy-utils/src/main/java/software/amazon/smithy/utils/CodeWriter.java
@@ -667,10 +667,10 @@ private String getTrimmedPoppedStateContents(State state) {
 
         // Remove the trailing newline, if present, since it gets added in the
         // final call to writeOptional.
-        if (builder != null
-                && builder.length() > 0
-                && builder.charAt(builder.length() - 1) == currentState.newline) {
-            builder.delete(builder.length() - 1, builder.length());
+        if (builder != null && builder.length() > 0) {
+            if (builder.charAt(builder.length() - 1) == currentState.newline) {
+                builder.delete(builder.length() - 1, builder.length());
+            }
             result = builder.toString();
         }
 

diff --git a/smithy-utils/src/test/java/software/amazon/smithy/utils/CodeWriterTest.java b/smithy-utils/src/test/java/software/amazon/smithy/utils/CodeWriterTest.java
@@ -696,4 +696,33 @@ public void canComposeSetWithSection() {
 
         assertThat(writer.toString(), equalTo("[1, 2, 3]\n"));
     }
+
+    public void sectionWithWrite() {
+        String testSection = "TEST_SECTION";
+        CodeWriter writer = new CodeWriter();
+
+        writer.onSection(testSection, text -> {
+            writer.write(text + "addition");
+        });
+
+        writer.pushState(testSection);
+        writer.popState();
+
+        assertThat(writer.toString(), equalTo("addition\n"));
+    }
+
+    @Test
+    public void sectionWithWriteInline() {
+        String testSection = "TEST_SECTION";
+        CodeWriter writer = new CodeWriter();
+
+        writer.onSection(testSection, text -> {
+            writer.writeInline(text + "inline addition");
+        });
+
+        writer.pushState(testSection);
+        writer.popState();
+
+        assertThat(writer.toString(), equalTo("inline addition\n"));
+    }
 }