Account for Windows

raphael · raphael · commit 0fa72290a42d · 2024-06-19T12:09:59.000-07:00
diff --git a/grpc/codegen/templates.go b/grpc/codegen/templates.go
@@ -3,6 +3,7 @@ package codegen
 import (
 	"embed"
 	"path"
+	"runtime"
 	"strings"
 )
 
@@ -19,7 +20,12 @@ func readTemplate(name string, partials ...string) string {
 				panic("failed to read partial template " + partial + ": " + err.Error()) // Should never happen, bug if it does
 			}
 			tmpl.Write(data)
-			tmpl.WriteByte('\n')
+			// Add a newline to separate the partials, OS specific
+			if runtime.GOOS == "windows" {
+				tmpl.WriteString("\r\n")
+			} else {
+				tmpl.WriteString("\n")
+			}
 		}
 	}
 	data, err := tmplFS.ReadFile(path.Join("templates", name) + ".go.tpl")

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package codegen`
`3`	`3`	`import (`
`4`	`4`	`"embed"`
`5`	`5`	`"path"`
	`6`	`+ "runtime"`
`6`	`7`	`"strings"`
`7`	`8`	`)`
`8`	`9`
`@@ -19,7 +20,12 @@ func readTemplate(name string, partials ...string) string {`
`19`	`20`	`panic("failed to read partial template " + partial + ": " + err.Error()) // Should never happen, bug if it does`
`20`	`21`	`}`
`21`	`22`	`tmpl.Write(data)`
`22`		`- tmpl.WriteByte('\n')`
	`23`	`+ // Add a newline to separate the partials, OS specific`
	`24`	`+ if runtime.GOOS == "windows" {`
	`25`	`+ tmpl.WriteString("\r\n")`
	`26`	`+ } else {`
	`27`	`+ tmpl.WriteString("\n")`
	`28`	`+ }`
`23`	`29`	`}`
`24`	`30`	`}`
`25`	`31`	`data, err := tmplFS.ReadFile(path.Join("templates", name) + ".go.tpl")`