Strip newlines from go comments

actgardner · Mar 1, 2021 · 46bd444 · 46bd444
1 parent d3fd7f0
commit 46bd444
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/v7/schema/enum.go b/v7/schema/enum.go
@@ -30,7 +30,7 @@ func (e *EnumDefinition) Name() string {
 }
 
 func (e *EnumDefinition) Doc() string {
-	return e.doc
+	return strings.ReplaceAll(e.doc, "\n", " ")
 }
 
 func (e *EnumDefinition) AvroName() QualifiedName {

diff --git a/v7/schema/field.go b/v7/schema/field.go
@@ -3,6 +3,7 @@ package schema
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/actgardner/gogen-avro/v7/generator"
 )
@@ -66,7 +67,7 @@ func (f *Field) Index() int {
 }
 
 func (f *Field) Doc() string {
-	return f.doc
+	return strings.ReplaceAll(f.doc, "\n", " ")
 }
 
 // Tags returns a field go struct tags if defined.

diff --git a/v7/schema/record.go b/v7/schema/record.go
@@ -3,6 +3,7 @@ package schema
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
 
 	"github.com/actgardner/gogen-avro/v7/generator"
 )
@@ -146,7 +147,7 @@ func (s *RecordDefinition) WrapperType() string {
 }
 
 func (s *RecordDefinition) Doc() string {
-	return s.doc
+	return strings.ReplaceAll(s.doc, "\n", " ")
 }
 
 func (s *RecordDefinition) Schema() (string, error) {

diff --git a/v7/test/enum/enum.avsc b/v7/test/enum/enum.avsc
@@ -7,7 +7,7 @@
 			"type": {
 				"name": "TestEnumType",
 				"type": "enum",
-				"doc": "Test enum",
+				"doc": "Test \nenum",
 				"symbols": ["TestSymbol1", "testSymbol2", "testSymbol3"]
 			},
 			"default": "testSymbol3"

diff --git a/v7/test/enum/enum_test_record.go b/v7/test/enum/enum_test_record.go
diff --git a/v7/test/enum/test_enum_type.go b/v7/test/enum/test_enum_type.go
diff --git a/v7/test/primitive/primitive_test_record.go b/v7/test/primitive/primitive_test_record.go
diff --git a/v7/test/primitive/primitives.avsc b/v7/test/primitive/primitives.avsc
@@ -1,8 +1,9 @@
 {
 	"type": "record",
 	"name": "PrimitiveTestRecord",
+	"doc": "primitive\nrecord",
 	"fields": [
-		{"name": "IntField", "type": "int"},
+		{"name": "IntField", "type": "int", "doc": "int\nfield"},
 		{"name": "LongField", "type": "long"},
 		{"name": "FloatField", "type": "float"},
 		{"name": "DoubleField", "type": "double"},