Merge pull request #194 from vektah/multiline-comments

Fix multiline comments
99designs · Jul 14, 2018 · 381b346 · 381b346
2 parents 112d68a + 4b3778e
commit 381b346
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 14 deletions.
diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/models.gotpl b/codegen/templates/models.gotpl
@@ -27,8 +27,9 @@ import (
 {{ range $enum := .Enums }}
 	type {{.GoType}} string
 	const (
-	{{ range $value := .Values }}
-		{{$enum.GoType}}{{ .Name|toCamel }} {{$enum.GoType}} = {{.Name|quote}} {{with .Description}} // {{.}} {{end}}
+	{{ range $value := .Values -}}
+		{{with .Description}} {{.|prefixLines "// "}} {{end}}
+		{{$enum.GoType}}{{ .Name|toCamel }} {{$enum.GoType}} = {{.Name|quote}}
 	{{- end }}
 	)
 

diff --git a/codegen/templates/templates.go b/codegen/templates/templates.go
@@ -14,12 +14,13 @@ import (
 
 func Run(name string, tpldata interface{}) (*bytes.Buffer, error) {
 	t := template.New("").Funcs(template.FuncMap{
-		"ucFirst":  ucFirst,
-		"lcFirst":  lcFirst,
-		"quote":    strconv.Quote,
-		"rawQuote": rawQuote,
-		"toCamel":  ToCamel,
-		"dump":     dump,
+		"ucFirst":     ucFirst,
+		"lcFirst":     lcFirst,
+		"quote":       strconv.Quote,
+		"rawQuote":    rawQuote,
+		"toCamel":     ToCamel,
+		"dump":        dump,
+		"prefixLines": prefixLines,
 	})
 
 	for filename, data := range data {
@@ -132,3 +133,7 @@ func dump(val interface{}) string {
 		panic(fmt.Errorf("unsupported type %T", val))
 	}
 }
+
+func prefixLines(prefix, s string) string {
+	return prefix + strings.Replace(s, "\n", "\n"+prefix, -1)
+}
diff --git a/example/starwars/models_gen.go b/example/starwars/models_gen.go
diff --git a/test/generated.go b/test/generated.go
diff --git a/test/models-go/generated.go b/test/models-go/generated.go
diff --git a/test/schema.graphql b/test/schema.graphql
@@ -5,6 +5,9 @@ type Element {
 }
 
 enum DATE_FILTER_OP {
+    # multi
+    # line
+    # comment
     EQ
     NEQ
     GT