diff options
| author | Giteabot <teabot@gitea.io> | 2023-09-25 06:10:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-24 22:10:38 +0000 |
| commit | a1029cb2cae973146759ff2d1458292e40a7a1fd (patch) | |
| tree | 7586d659451295d4538611d091cf2070a1919ef0 /routers/web/repo/editor.go | |
| parent | 134c7636effb57ede02438dadcd2cdcb3c03771e (diff) | |
| download | gitea-a1029cb2cae973146759ff2d1458292e40a7a1fd.tar.gz gitea-a1029cb2cae973146759ff2d1458292e40a7a1fd.zip | |
Fix EOL handling in web editor (#27141) (#27234)
Backport #27141 by @silverwind
Fixes https://github.com/go-gitea/gitea/issues/27136.
This does the following for Monaco's EOL setting:
1. Use editorconfig setting if present
2. Use the file's dominant line ending as detected by monaco, which uses
LF for empty file
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'routers/web/repo/editor.go')
| -rw-r--r-- | routers/web/repo/editor.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index 0a606582e5..9d9fee3a77 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -287,7 +287,7 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b Operation: operation, FromTreePath: ctx.Repo.TreePath, TreePath: form.TreePath, - ContentReader: strings.NewReader(strings.ReplaceAll(form.Content, "\r", "")), + ContentReader: strings.NewReader(form.Content), }, }, Signoff: form.Signoff, |