add server-side convertion

Author: silverwind

modules/util/string.go

@@ -3,7 +3,10 @@
 
 package util
 
-import "github.com/yuin/goldmark/util"
+import (
+	"strings"
+	"github.com/yuin/goldmark/util"
+)
 
 func isSnakeCaseUpper(c byte) bool {
 	return 'A' <= c && c <= 'Z'
@@ -85,3 +88,11 @@ func ToSnakeCase(input string) string {
 	}
 	return util.BytesToReadOnlyString(res)
 }
+
+func ConvertToLF(str string) string {
+	return strings.ReplaceAll(str, "\r", "")
+}
+
+func ConvertToCRLF(str string) string {
+	return strings.ReplaceAll(ConvertToLF(str), "\n", "\r\n")
+}

modules/util/string_test.go

@@ -45,3 +45,11 @@ func TestToSnakeCase(t *testing.T) {
 		assert.Equal(t, expected, ToSnakeCase(input))
 	}
 }
+
+func TestConvertToLF(t *testing.T) {
+	assert.Equal(t, "\na\nbc\n\n", ConvertToLF("\r\na\r\nb\rc\n\n"))
+}
+
+func TestConvertToCRLF(t *testing.T) {
+	assert.Equal(t, "\r\na\r\nbc\r\n\r\n", ConvertToCRLF("\r\na\r\nb\rc\n\n"))
+}

routers/web/repo/editor.go

@@ -277,6 +277,13 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b
 		operation = "create"
 	}
 
+	content := form.Content
+	if setting.UI.EditorEol == "CRLF" {
+		content = util.ConvertToCRLF(content)
+	} else {
+		content = utils.ConvertToLF(content)
+	}
+
 	if _, err := files_service.ChangeRepoFiles(ctx, ctx.Repo.Repository, ctx.Doer, &files_service.ChangeRepoFilesOptions{
 		LastCommitID: form.LastCommit,
 		OldBranch:    ctx.Repo.BranchName,
@@ -287,7 +294,7 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b
 				Operation:     operation,
 				FromTreePath:  ctx.Repo.TreePath,
 				TreePath:      form.TreePath,
-				ContentReader: strings.NewReader(form.Content),
+				ContentReader: strings.NewReader(content),
 			},
 		},
 		Signoff: form.Signoff,